mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

build-system: switch submodule protocol

Browse source 
As of today, GitHub no longer allows the 'git://' protocol, so we need to
switch the submodule and our other references to cloning git repos to
'https://' instead.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2022-03-15 13:49:10 -07:00
parent af88d34227
commit c94e2b5d3f
11 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/build.sh
View file

@ -264,7 +264,7 @@ if [ "$PLATFORM" = Linux ] && [[ $QT_VERSION == 5* ]] ; then
rm -rf "$INSTALL_ROOT"/include/QtLocation > /dev/null 2>&1
rm -rf "$INSTALL_ROOT"/include/QtPositioning > /dev/null 2>&1
git clone --branch "v$QT_VERSION" git://code.qt.io/qt/qtlocation.git --depth=1 $QTLOC_GIT
git clone --branch "v$QT_VERSION" https://code.qt.io/qt/qtlocation.git --depth=1 $QTLOC_GIT
mkdir -p "$QTLOC_PRIVATE"
cd $QTLOC_GIT/src/location

2
scripts/docker/mxe-build-container/Dockerfile
View file

@ -51,7 +51,7 @@ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
# checkout MXE at the right version
RUN mkdir -p /win
RUN cd /win ; git clone git://github.com/mxe/mxe ; \
RUN cd /win ; git clone https://github.com/mxe/mxe ; \
cd mxe ; \
git checkout ${_ver} ;

4
scripts/docker/trusty-qt512/Dockerfile
View file

@ -52,7 +52,7 @@ ENV QT_ROOT /usr/local/Qt/5.12.10/gcc_64
ENV PATH="/usr/local/Qt/5.12.10/gcc_64/bin/:${PATH}"
# now build and install QtWebKit
RUN git clone -b 5.212 git://github.com/qt/qtwebkit
RUN git clone -b 5.212 https://github.com/qt/qtwebkit
RUN mkdir -p qtwebkit/WebKitBuild/Release
RUN cd qtwebkit/WebKitBuild/Release && cmake -DPORT=Qt -DCMAKE_BUILD_TYPE=Release -DQt5_DIR=/usr/local/Qt/5.12.10/gcc_64/lib/cmake/Qt5 ../..
RUN cd qtwebkit/WebKitBuild/Release && make -j4 && make install
@ -78,7 +78,7 @@ RUN apt-get remove -y libqt5core5a libqt5dbus5 libqt5gui5 ruby openssh-client
# now build Subsurface once to populate the dependencies we don't get from
# Ubuntu but that aren't really part of Subsurface (libgit, googlemaps)
RUN git clone git://github.com/Subsurface/subsurface
RUN git clone https://github.com/Subsurface/subsurface
RUN bash -e -x ./subsurface/scripts/build.sh -desktop -create-appdir -build-with-webkit
# remove the source, but keep the install-root