mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
remove Marble from packaging and build scripts
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> --- please note, that i have no way to test most of the scripts ATM.
This commit is contained in:
Lubomir I. Ivanov
Dirk Hohndel
parent
4bb180b117
commit
2b40e15713
10 changed files with 15 additions and 143 deletions
|
|
@ -84,7 +84,7 @@ Recommends: qt5-qttranslations
|
|||
BuildRoot: %{_tmppath}/subsurface%{version}-build
|
||||
|
||||
%description
|
||||
This is the official Subsurface build, including our own custom libdivecomputer and libssrfmarblewidget
|
||||
This is the official Subsurface build, including our own custom libdivecomputer
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
|
@ -103,27 +103,14 @@ mkdir -p install-root
|
|||
.. ; \
|
||||
make %{?_smp_mflags} ; \
|
||||
make install)
|
||||
(mkdir marble-build ; cd marble-build ; \
|
||||
cmake -DCMAKE_INSTALL_PREFIX=$RPM_BUILD_DIR/install-root \
|
||||
-DQTONLY=ON -DQT5BUILD=ON \
|
||||
-DBUILD_MARBLE_APPS=OFF -DBUILD_MARBLE_EXAMPLES=OFF \
|
||||
-DBUILD_MARBLE_TESTS=OFF -DBUILD_MARBLE_TOOLS=OFF \
|
||||
-DBUILD_TESTING=OFF -DWITH_DESIGNER_PLUGIN=OFF \
|
||||
-DBUILD_WITH_DBUS=OFF ../marble-source \
|
||||
-DCMAKE_C_FLAGS:STRING="%optflags" \
|
||||
-DCMAKE_CXX_FLAGS:STRING="%optflags" ; \
|
||||
make %{?_smp_mflags} ; \
|
||||
cd src/lib/marble ; make install ; )
|
||||
(mkdir subsurface-build ; cd subsurface-build ; \
|
||||
cmake -DCMAKE_BUILD_TYPE=Release \
|
||||
-DLRELEASE=lrelease-qt5 \
|
||||
-DCMAKE_INSTALL_PREFIX=%{buildroot}/usr \
|
||||
-DLIBDIVECOMPUTER_INCLUDE_DIR=$RPM_BUILD_DIR/install-root/include \
|
||||
-DLIBGIT2_INCLUDE_DIR=$RPM_BUILD_DIR/install-root/include \
|
||||
-DMARBLE_INCLUDE_DIR=$RPM_BUILD_DIR/install-root/include \
|
||||
-DLIBDIVECOMPUTER_LIBRARIES=$RPM_BUILD_DIR/install-root/lib/libdivecomputer.a \
|
||||
-DLIBGIT2_LIBRARIES=$RPM_BUILD_DIR/install-root/lib/libgit2.a \
|
||||
-DMARBLE_LIBRARIES=$RPM_BUILD_DIR/install-root/lib/libssrfmarblewidget.so \
|
||||
-DUSE_LIBGIT23_API=ON \
|
||||
-DCMAKE_C_FLAGS:STRING="%optflags" \
|
||||
-DCMAKE_CXX_FLAGS:STRING="%optflags" \
|
||||
|
|
@ -157,7 +144,6 @@ desktop-file-install --dir=%{buildroot}/%{_datadir}/applications subsurface.desk
|
|||
%{_datadir}/applications/subsurface.desktop
|
||||
%{_datadir}/icons/hicolor/*/apps/subsurface-icon.*
|
||||
%{_datadir}/subsurface/
|
||||
%{_libdir}/libssrfmarblewidget.so*
|
||||
|
||||
%changelog
|
||||
|
||||
|
|
|
|||
|
|
@ -384,7 +384,6 @@ cmake $MOBILE_CMAKE \
|
|||
-DFORCE_LIBSSH=OFF \
|
||||
-DLIBDC_FROM_PKGCONFIG=ON \
|
||||
-DLIBGIT2_FROM_PKGCONFIG=ON \
|
||||
-DNO_MARBLE=ON \
|
||||
-DNO_PRINTING=ON \
|
||||
-DNO_USERMANUAL=ON \
|
||||
-DFBSUPPORT=OFF \
|
||||
|
|
|
|||
|
|
@ -51,14 +51,6 @@ for i in ${RPATH}; do
|
|||
install_name_tool -change @rpath/$i @executable_path/../Frameworks/$i ${EXECUTABLE}
|
||||
done
|
||||
|
||||
# no more Marble
|
||||
# # and now replace @rpath references in libssrfmarblewidget
|
||||
# MARBLELIB=$(ls Subsurface.app/Contents/Frameworks/libssrfmarblewidget*dylib)
|
||||
# RPATH=$(otool -L ${MARBLELIB} | grep rpath | cut -d\ -f1 | tr -d "\t" | cut -b 8- )
|
||||
# for i in ${RPATH}; do
|
||||
# install_name_tool -change @rpath/$i @executable_path/../Frameworks/$i ${MARBLELIB}
|
||||
# done
|
||||
|
||||
# next deal with libGrantlee
|
||||
LIBG=$(ls Subsurface.app/Contents/Frameworks/libGrantlee_Templates*dylib)
|
||||
for i in QtScript.framework/Versions/5/QtScript QtCore.framework/Versions/5/QtCore ; do
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ override_dh_auto_clean:
|
|||
(cd libdivecomputer ; make clean || true)
|
||||
make clean || true
|
||||
rm -rf libgit2/build
|
||||
rm -rf marble-build
|
||||
rm -f ssrf-version.h
|
||||
rm -f subsurface
|
||||
rm -f Makefile
|
||||
|
|
@ -23,16 +22,6 @@ override_dh_auto_configure:
|
|||
(mkdir libgit2/build ; cd libgit2/build ; \
|
||||
cmake -DBUILD_SHARED_LIBS=OFF -DBUILD_CLAR=OFF -DBUILD_EXAMPLES=OFF .. ; \
|
||||
sed -i 's/.so$/.a/' CMakeCache.txt ; make -j8 )
|
||||
(mkdir marble-build ; cd marble-build ; \
|
||||
cmake -DQTONLY=ON -DQT5BUILD=ON \
|
||||
-DBUILD_MARBLE_APPS=OFF -DBUILD_MARBLE_EXAMPLES=OFF \
|
||||
-DBUILD_MARBLE_TESTS=OFF -DBUILD_MARBLE_TOOLS=OFF \
|
||||
-DBUILD_TESTING=OFF -DWITH_DESIGNER_PLUGIN=OFF \
|
||||
-DBUILD_WITH_DBUS=OFF ../marble-source ; \
|
||||
make -j8 ; \
|
||||
ln -s src/lib/marble lib ; \
|
||||
mkdir include ; cd include ; for i in `find ../../marble-source -name \*.h` ; do ln -s $$i . ; done ; \
|
||||
ln -s . marble )
|
||||
(mkdir subsurface-build ; cd subsurface-build ; \
|
||||
cmake -DCMAKE_BUILD_TYPE=Release \
|
||||
-DPREFER_GIT_FROMSOURCE=1 \
|
||||
|
|
@ -40,8 +29,6 @@ override_dh_auto_configure:
|
|||
-DLIBGIT2_LIBRARIES=$$(pwd)/../libgit2/build/libgit2.a \
|
||||
-DLIBDIVECOMPUTER_INCLUDE_DIR=$$(pwd)/../libdivecomputer/include \
|
||||
-DLIBDIVECOMPUTER_LIBRARIES=$$(pwd)/../libdivecomputer/src/.libs/libdivecomputer.a \
|
||||
-DMARBLE_INCLUDE_DIR=$$(pwd)/../marble-build/include \
|
||||
-DMARBLE_LIBRARIES=$$(pwd)/../marble-build/lib/libssrfmarblewidget.so \
|
||||
$$(pwd)/.. ; )
|
||||
|
||||
override_dh_installchangelogs:
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ if [[ ! -d subsurface_$VERSION ]]; then
|
|||
#
|
||||
(cd subsurface ; tar cf - . ) | (cd subsurface_$VERSION ; tar xf - )
|
||||
cd subsurface_$VERSION;
|
||||
rm -rf .git libdivecomputer/.git libgit2/.git marble-source/.git
|
||||
rm -rf .git libdivecomputer/.git libgit2/.git
|
||||
echo $GITVERSION > .gitversion
|
||||
echo $LIBDCREVISION > libdivecomputer/revision
|
||||
# dh_make --email dirk@hohndel.org -c gpl2 --createorig --single --yes -p subsurface_$VERSION
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@ if [[ $1 == "Qt5-64" ]] ; then
|
|||
QMAKE_MOC=/usr/x86_64-w64-mingw32/bin/qt5/moc \
|
||||
QMAKE_UIC=/usr/x86_64-w64-mingw32/bin/qt5/uic \
|
||||
QMAKE_RCC=/usr/x86_64-w64-mingw32/bin/qt5/rcc \
|
||||
LIBMARBLEDEVEL=../marble \
|
||||
LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \
|
||||
QMAKE_LIBDIR+=../openssl \
|
||||
CONFIG+=win64target \
|
||||
|
|
@ -47,7 +46,6 @@ elif [[ $1 == "Qt5" ]] ; then
|
|||
QMAKE_UIC=/usr/i686-w64-mingw32/bin/qt5/uic \
|
||||
QMAKE_RCC=/usr/i686-w64-mingw32/bin/qt5/rcc \
|
||||
LIBDCDEVEL=../libdivecomputer \
|
||||
LIBMARBLEDEVEL=../marble \
|
||||
LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \
|
||||
$BASEDIR/../../subsurface.pro
|
||||
|
||||
|
|
@ -62,7 +60,6 @@ elif [[ $1 == "Qt5debug" ]] ; then
|
|||
QMAKE_CFLAGS_RELEASE='$$QMAKE_CFLAGS_DEBUG -O0 -g' \
|
||||
QMAKE_CXXFLAGS_RELEASE='$$QMAKE_CXXFLAGS_DEBUG -O0 -g' \
|
||||
LIBDCDEVEL=../libdivecomputer \
|
||||
LIBMARBLEDEVEL=../marble \
|
||||
LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \
|
||||
V=1 \
|
||||
$BASEDIR/../../subsurface.pro
|
||||
|
|
@ -71,7 +68,6 @@ else
|
|||
|
||||
mingw32-qmake-qt4 \
|
||||
CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw \
|
||||
LIBMARBLEDEVEL=../marble \
|
||||
LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \
|
||||
$BASEDIR/../../subsurface.pro
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -331,7 +331,7 @@ i686-w64-mingw32.shared-cmake -DCMAKE_TOOLCHAIN_FILE="$BASEDIR"/"$MXEDIR"/usr/i6
|
|||
-DMAKENSIS=i686-w64-mingw32.shared-makensis \
|
||||
-DLIBDIVECOMPUTER_INCLUDE_DIR="$BASEDIR"/"$MXEDIR"/usr/i686-w64-mingw32.shared/include \
|
||||
-DLIBDIVECOMPUTER_LIBRARIES="$BASEDIR"/"$MXEDIR"/usr/i686-w64-mingw32.shared/lib/libdivecomputer.dll.a \
|
||||
-DNO_MARBLE=ON -DMAKE_TESTS=OFF \
|
||||
-DMAKE_TESTS=OFF \
|
||||
"$BASEDIR"/subsurface
|
||||
|
||||
make $JOBS "$@"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue