From 92f21938964c592941c0ccbfc35cdf370a5b57c8 Mon Sep 17 00:00:00 2001 From: Lon Willett Date: Sun, 17 May 2020 14:20:00 +0200 Subject: [PATCH] gpsd: update to 3.20 --- common/shlibs | 4 +- srcpkgs/gpsd/patches/SConstruct-cross.patch | 13 +++++ .../patches/SContruct-python-manpages.patch | 56 ------------------- srcpkgs/gpsd/template | 36 +++++++----- 4 files changed, 37 insertions(+), 72 deletions(-) create mode 100644 srcpkgs/gpsd/patches/SConstruct-cross.patch delete mode 100644 srcpkgs/gpsd/patches/SContruct-python-manpages.patch diff --git a/common/shlibs b/common/shlibs index 22e35e26882..50cfaf7ce50 100644 --- a/common/shlibs +++ b/common/shlibs @@ -81,7 +81,7 @@ libmenuw.so.5 ncurses-libs-5.9_13 ignore libmenuw.so.6 ncurses-libs-5.8_1 ignore libobjc.so.4 libobjc-4.7.3_12 libgomp.so.1 libgomp-4.4.0_1 -libgps.so.24 gpsd-3.18.1_1 +libgps.so.25 gpsd-3.20_1 libmagic.so.1 libmagic-5.12_1 libbluetooth.so.3 libbluetooth-4.58_1 libwmf-0.2.so.7 libwmf-0.2.8.4_1 @@ -442,7 +442,7 @@ libdca.so.0 libdca-0.0.5_1 libmpeg2.so.0 libmpeg2-0.5.1_1 libmpeg2convert.so.0 libmpeg2-0.5.1_1 libmng.so.2 libmng-2.0.2_1 -libQgpsmm.so.24 gpsd-qt-3.18.1_1 +libQgpsmm.so.25 gpsd-qt-3.20_1 libQtAssistantClient.so qt-4.5.3_1 libQtXmlPatterns.so.4 qt-4.5.3_1 libQtScriptTools.so.4 qt-4.5.3_1 diff --git a/srcpkgs/gpsd/patches/SConstruct-cross.patch b/srcpkgs/gpsd/patches/SConstruct-cross.patch new file mode 100644 index 00000000000..42b0748209e --- /dev/null +++ b/srcpkgs/gpsd/patches/SConstruct-cross.patch @@ -0,0 +1,13 @@ +--- SConstruct~ 2020-01-01 02:31:27.000000000 +0100 ++++ SConstruct 2020-05-17 11:20:07.334411693 +0200 +@@ -629,6 +629,10 @@ + + # run it + ret = context.TryRun(program, '.c') ++ if not ret[1]: ++ # Assume 8 ++ context.Result("unchecked") ++ return '8' + context.Result(ret[0]) + return ret[1] + diff --git a/srcpkgs/gpsd/patches/SContruct-python-manpages.patch b/srcpkgs/gpsd/patches/SContruct-python-manpages.patch deleted file mode 100644 index c831ce605f8..00000000000 --- a/srcpkgs/gpsd/patches/SContruct-python-manpages.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 02d21faebec245e1526449fb54e7078914d75db7 Mon Sep 17 00:00:00 2001 -From: "Gary E. Miller" -Date: Thu, 1 Nov 2018 15:49:01 -0700 -Subject: SConstruct: Do not crash when not building python man pages. - ---- - SConstruct | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/SConstruct b/SConstruct -index 0fc3614..0226cd2 100644 ---- SConstruct -+++ SConstruct -@@ -1751,14 +1751,19 @@ if tiocmiwait: - "ppscheck.8": "ppscheck.xml", - }) - --all_manpages = list(base_manpages.keys()) + list(python_manpages.keys()) -+all_manpages = list(base_manpages.keys()) -+if python_manpages: -+ all_manpages += list(python_manpages.keys()) - - man_env = env.Clone() - if man_env.GetOption('silent'): - man_env['SPAWN'] = filtered_spawn # Suppress stderr chatter - manpage_targets = [] - if manbuilder: -- items = list(base_manpages.items()) + list(python_manpages.items()) -+ items = list(base_manpages.items()) -+ if python_manpages: -+ items += list(python_manpages.items()) -+ - for (man, xml) in items: - manpage_targets.append(man_env.Man(source=xml, target=man)) - -@@ -1907,7 +1912,7 @@ if qt_env: - - - maninstall = [] --for manpage in list(base_manpages.keys()) + list(python_manpages.keys()): -+for manpage in all_manpages: - if not manbuilder and not os.path.exists(manpage): - continue - section = manpage.split(".")[1] -@@ -2517,7 +2522,7 @@ if os.path.exists("gpsd.c") and os.path.exists(".gitignore"): - if ".gitignore" in distfiles: - distfiles.remove(".gitignore") - distfiles += generated_sources -- distfiles += list(base_manpages.keys()) + list(python_manpages.keys()) -+ distfiles += all_manpages - if "packaging/rpm/gpsd.spec" not in distfiles: - distfiles.append("packaging/rpm/gpsd.spec") - --- -cgit v1.0-41-gc330 - diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template index bf1364a9554..a5f3628ea42 100644 --- a/srcpkgs/gpsd/template +++ b/srcpkgs/gpsd/template @@ -1,37 +1,40 @@ # Template file for 'gpsd' pkgname=gpsd -version=3.18.1 +version=3.20 revision=1 build_style=scons make_build_args="dbus_export=0 gpsd_user=gpsd gpsd_group=gpsd sbindir=/usr/bin udevdir=/usr/lib/udev CC=${CC} qt_versioned=5" make_install_args="$make_build_args" make_install_target=udev-install -hostmakedepends="pkg-config bc python libxslt xmlto asciidoc ncurses" -makedepends="eudev-libudev-devel ntp libusb-devel ncurses-devel - pps-tools-devel libcap-devel libbluetooth-devel" +hostmakedepends="pkg-config bc python-pyserial libxslt xmlto asciidoc ncurses" +makedepends="eudev-libudev-devel ntp libusb-devel ncurses-devel gtk+3-devel + pps-tools-devel libcap-devel libbluetooth-devel qt5-devel" short_desc="GPS/AIS receiver monitoring daemon" maintainer="uriahheep " license="BSD-3-Clause" homepage="http://www.catb.org/gpsd/" -distfiles="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-${version}.tar.gz" -checksum=5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e -python_version=2 #unverified +distfiles="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-${version}.tar.xz" +checksum=3998a5cbb728e97f896f46c3c83301b1e6c5d859393e58c2fad8c5426774d571 +python_version=2 # Must be same version as scons system_accounts="gpsd" -subpackages="gpsd-devel" +subpackages="gpsd-devel gpsd-qt gpsd-qt-devel" if [ -z "$CROSS_BUILD" ]; then - subpackages+=" gpsd-python gpsd-xgps gpsd-qt gpsd-qt-devel" - makedepends+=" qt5-devel python-devel python-gobject-devel" + subpackages+=" gpsd-python gpsd-xgps" + makedepends+=" python-devel python-gobject-devel" else + # xxx scons uses its environment to build python stuff; so arch + # and python version must match. This should be fixed. make_build_args+=" python=0" fi pre_build() { - unset CPPFLAGS + unset LD } pre_install() { + unset LD export DESTDIR=${DESTDIR} makejobs="-j1" } @@ -40,24 +43,29 @@ post_install() { vsv gpsd vlicense COPYING vlicense AUTHORS + vbin gpsinit if [ -z "$CROSS_BUILD" ]; then mv ${DESTDIR}/usr/local/lib/python* "${DESTDIR}/usr/lib" fi } gpsd-python_package() { - short_desc+=" - Python2 tools/bindings" - depends="python gnuplot ${sourcepkg}>=${version}_${revision}" + short_desc+=" - Python tools/bindings" + depends="python python-pyserial gnuplot ${sourcepkg}>=${version}_${revision}" pkg_install() { - vmove usr/lib/python2.7 + vmove "usr/lib/python*" vmove usr/bin/gegps vmove usr/bin/gpscat vmove usr/bin/gpsfake vmove usr/bin/gpsprof + vmove usr/bin/ubxtool + vmove usr/bin/zerk vmove usr/share/man/man1/gegps.1 vmove usr/share/man/man1/gpscat.1 vmove usr/share/man/man1/gpsfake.1 vmove usr/share/man/man1/gpsprof.1 + vmove usr/share/man/man1/ubxtool.1 + vmove usr/share/man/man1/zerk.1 } }