From cc95ae5ca2f96f908e9cee42426b968a3c7646dc Mon Sep 17 00:00:00 2001 From: Miika Turkia <miika.tur...@gmail.com> Date: Mon, 16 Oct 2017 06:34:29 -0400 Subject: [PATCH] Grab Qt private headers for Ubuntu packaging
Signed-off-by: Miika Turkia <miika.tur...@gmail.com> --- packaging/ubuntu/make-package.sh | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/packaging/ubuntu/make-package.sh b/packaging/ubuntu/make-package.sh index 02ec041..8a16d11 100644 --- a/packaging/ubuntu/make-package.sh +++ b/packaging/ubuntu/make-package.sh @@ -17,6 +17,7 @@ GITVERSION=$(cd subsurface ; git describe | sed -e 's/-g.*$// ; s/^v//') GITREVISION=$(echo $GITVERSION | sed -e 's/.*-// ; s/.*\..*//') VERSION=$(echo $GITVERSION | sed -e 's/-/./') LIBDCREVISION=$(cd subsurface/libdivecomputer ; git rev-parse --verify HEAD) +GOOGLEMAPSREVISION=$(cd googlemaps ; git rev-parse --verify HEAD --short) # # @@ -37,10 +38,27 @@ if [[ ! -d subsurface_$VERSION ]]; then echo "copying sources" # (cd subsurface ; tar cf - . ) | (cd subsurface_$VERSION ; tar xf - ) + mkdir subsurface_$VERSION/googlemaps + (cd googlemaps ; tar cf - . ) | (cd subsurface_$VERSION/googlemaps ; tar xf - + QT_HEADERS_PATH=`qmake -query QT_INSTALL_HEADERS` + QT_VERSION=`qmake -v | grep "Qt" | cut -d" " -f4` + QTLOC_GIT=./qtlocation_git + git clone --branch v$QT_VERSION git://code.qt.io/qt/qtlocation.git --depth=1 qtlocation_git + mkdir -p qtlocation_h/location + mkdir -p qtlocation_h/positioning + cd qtlocation_git/src/location + find -name '*_p.h' | xargs cp -t ../../../qtlocation_h/location + cd - + cd qtlocation_git/src/positioning + find -name '*_p.h' | xargs cp -t ../../../qtlocation_h/positioning + cd - + rm -rf qtlocation_git + ) cd subsurface_$VERSION; - rm -rf .git libdivecomputer/.git libgit2/.git + rm -rf .git libdivecomputer/.git libgit2/.git googlemaps/.git echo $GITVERSION > .gitversion echo $LIBDCREVISION > libdivecomputer/revision + echo $GOOGLEMAPSREVISION > googlemaps/revision # dh_make --email d...@hohndel.org -c gpl2 --createorig --single --yes -p subsurface_$VERSION # rm debian/*.ex debian/*.EX debian/README.* # -- 2.7.4
_______________________________________________ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
