diff --git a/common/shlibs b/common/shlibs index 64dc6f0f237..37dd9c3e590 100644 --- a/common/shlibs +++ b/common/shlibs @@ -82,7 +82,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.22 gpsd-3.15_1 +libgps.so.23 gpsd-3.17_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 @@ -413,7 +413,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.22 gpsd-qt-3.15_1 +libQgpsmm.so.23 gpsd-qt-3.17_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/ncurses-pkgconfig.patch b/srcpkgs/gpsd/patches/ncurses-pkgconfig.patch deleted file mode 100644 index 88fba4ebaf1..00000000000 --- a/srcpkgs/gpsd/patches/ncurses-pkgconfig.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN gpsd-3.15-old/SConstruct gpsd-3.15-new/SConstruct ---- gpsd-3.15-old/SConstruct 2015-06-03 14:09:31.000000000 +0000 -+++ gpsd-3.15-new/SConstruct 2015-09-17 18:17:49.140818485 +0000 -@@ -539,8 +539,8 @@ - # are like FreeBSD. - ncurseslibs= [] - if env['ncurses']: -- if config.CheckPKG('ncurses'): -- ncurseslibs = pkg_config('ncurses') -+ if config.CheckPKG('ncursesw'): -+ ncurseslibs = pkg_config('ncursesw') - if config.CheckPKG('tinfo'): - ncurseslibs += pkg_config('tinfo') - elif WhereIs('ncurses5-config'): diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template index 659cddcefc8..313e31c455f 100644 --- a/srcpkgs/gpsd/template +++ b/srcpkgs/gpsd/template @@ -1,6 +1,6 @@ # Template file for 'gpsd' pkgname=gpsd -version=3.16 +version=3.17 revision=1 build_style=scons patch_args=-p1 @@ -12,7 +12,7 @@ maintainer="uriahheep " license="BSD" homepage="http://www.catb.org/gpsd/" distfiles="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-${version}.tar.gz" -checksum="03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029" +checksum=68e0dbecfb5831997f8b3d6ba48aed812eb465d8c0089420ab68f9ce4d85e77a system_accounts="gpsd" hostmakedepends="scons pkg-config bc python libxslt xmlto asciidoc ncurses" @@ -59,7 +59,7 @@ gpsd-python_package() { gpsd-xgps_package() { short_desc+=" - PyGTK based clients" - depends="pygtk ${sourcepkg}-python>=${version}_${revision}" + depends="pygtk ${sourcepkg}-python>=${version}_${revision} python-gobject" pkg_install() { vmove usr/bin/xgps vmove usr/bin/xgpsspeed