diff --git a/common/shlibs b/common/shlibs index 6a390f115d1..aa1123c414b 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.23 gpsd-3.17_1 +libgps.so.24 gpsd-3.18.1_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 @@ -426,7 +426,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.23 gpsd-qt-3.17_1 +libQgpsmm.so.24 gpsd-qt-3.18.1_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/SContruct-python-manpages.patch b/srcpkgs/gpsd/patches/SContruct-python-manpages.patch new file mode 100644 index 00000000000..c831ce605f8 --- /dev/null +++ b/srcpkgs/gpsd/patches/SContruct-python-manpages.patch @@ -0,0 +1,56 @@ +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/patches/musl-sockaddr.patch b/srcpkgs/gpsd/patches/musl-sockaddr.patch deleted file mode 100644 index 9caf0e1f6f6..00000000000 --- a/srcpkgs/gpsd/patches/musl-sockaddr.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN gpsd-3.15-old/SConstruct gpsd-3.15-new/SConstruct ---- gpsd-3.15-old/SConstruct 2015-09-17 01:33:26.227445589 -0400 -+++ gpsd-3.15-new/SConstruct 2015-09-17 01:34:11.761522374 -0400 -@@ -613,7 +613,7 @@ - confdefs.append("#define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) + strlen((ptr)->sun_path))\n") - confdefs.append("#endif /* SUN_LEN */\n") - -- if config.CheckHeader(["bits/sockaddr.h", "linux/can.h"]): -+ if config.CheckHeader(["linux/can.h"]): - confdefs.append("#define HAVE_LINUX_CAN_H 1\n") - announce("You have kernel CANbus available.") - else: diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template index 05896d66c8e..1976ab56d5c 100644 --- a/srcpkgs/gpsd/template +++ b/srcpkgs/gpsd/template @@ -1,9 +1,8 @@ # Template file for 'gpsd' pkgname=gpsd -version=3.17 -revision=4 +version=3.18.1 +revision=1 build_style=scons -patch_args="-p1" 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" @@ -11,18 +10,18 @@ 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" -short_desc="A GPS/AIS receiver monitoring daemon" +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=68e0dbecfb5831997f8b3d6ba48aed812eb465d8c0089420ab68f9ce4d85e77a +checksum=5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e system_accounts="gpsd" subpackages="gpsd-devel" if [ -z "$CROSS_BUILD" ]; then subpackages+=" gpsd-python gpsd-xgps gpsd-qt gpsd-qt-devel" - makedepends+=" qt5-devel python-devel" + makedepends+=" qt5-devel python-devel python-gobject-devel" else make_build_args+=" python=0" fi @@ -40,6 +39,9 @@ post_install() { vsv gpsd vlicense COPYING vlicense AUTHORS + if [ -z "$CROSS_BUILD" ]; then + mv ${DESTDIR}/usr/local/lib/python* "${DESTDIR}/usr/lib" + fi } gpsd-python_package() { @@ -65,7 +67,7 @@ gpsd-xgps_package() { pkg_install() { vmove usr/bin/xgps vmove usr/bin/xgpsspeed - vmove usr/share/man/man1/xgps* + vmove "usr/share/man/man1/xgps*" } } @@ -73,7 +75,7 @@ gpsd-qt_package() { short_desc+=" - Qt5 bindings" depends="${sourcepkg}>=${version}_${revision}" pkg_install() { - vmove usr/lib/libQgpsmm.so.* + vmove "usr/lib/libQgpsmm.so.*" } } @@ -93,7 +95,8 @@ gpsd-devel_package() { depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/pkgconfig/libgps*.pc + vmove "usr/lib/pkgconfig/libgps*.pc" vmove usr/lib/libgps.so + vmove "usr/share/man/man3/libgps*" } }