* [PR PATCH] gpsd: update to 3.20
@ 2020-05-17 18:09 lonwillett
2020-05-18 17:03 ` [PR PATCH] [Updated] " lonwillett
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: lonwillett @ 2020-05-17 18:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 315 bytes --]
There is a new pull request by lonwillett against master on the void-packages repository
https://github.com/lonwillett/void-packages update-gpsd
https://github.com/void-linux/void-packages/pull/22054
gpsd: update to 3.20
A patch file from https://github.com/void-linux/void-packages/pull/22054.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-gpsd-22054.patch --]
[-- Type: text/x-diff, Size: 7102 bytes --]
From 92f21938964c592941c0ccbfc35cdf370a5b57c8 Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
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" <gem@rellim.com>
-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 <uriahheep@gmail.com>"
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
}
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] gpsd: update to 3.20
2020-05-17 18:09 [PR PATCH] gpsd: update to 3.20 lonwillett
@ 2020-05-18 17:03 ` lonwillett
2020-05-18 18:16 ` lonwillett
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: lonwillett @ 2020-05-18 17:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 320 bytes --]
There is an updated pull request by lonwillett against master on the void-packages repository
https://github.com/lonwillett/void-packages update-gpsd
https://github.com/void-linux/void-packages/pull/22054
gpsd: update to 3.20
A patch file from https://github.com/void-linux/void-packages/pull/22054.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-gpsd-22054.patch --]
[-- Type: text/x-diff, Size: 7996 bytes --]
From 2b38634c1ce8877fe1d13ded925fbe1e178dc7aa Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
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 +++++++-----
srcpkgs/marble5/template | 2 +-
srcpkgs/navit/template | 2 +-
6 files changed, 39 insertions(+), 74 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" <gem@rellim.com>
-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 <uriahheep@gmail.com>"
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
}
}
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index fdf059e09d2..0e6f08a9cd9 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,7 +1,7 @@
# Template file for 'marble5'
pkgname=marble5
version=20.04.0
-revision=1
+revision=2
wrksrc="marble-${version}"
build_style=cmake
configure_args="-DBUILD_MARBLE_TESTS=NO -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 34821105642..3635c66ec49 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: gpsd: update to 3.20
2020-05-17 18:09 [PR PATCH] gpsd: update to 3.20 lonwillett
2020-05-18 17:03 ` [PR PATCH] [Updated] " lonwillett
@ 2020-05-18 18:16 ` lonwillett
2020-05-19 11:58 ` [PR PATCH] [Updated] " lonwillett
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: lonwillett @ 2020-05-18 18:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 186 bytes --]
New comment by lonwillett on void-packages repository
https://github.com/void-linux/void-packages/pull/22054#issuecomment-630353301
Comment:
Is that how it's supposed to be done then?
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] gpsd: update to 3.20
2020-05-17 18:09 [PR PATCH] gpsd: update to 3.20 lonwillett
2020-05-18 17:03 ` [PR PATCH] [Updated] " lonwillett
2020-05-18 18:16 ` lonwillett
@ 2020-05-19 11:58 ` lonwillett
2020-05-19 11:58 ` lonwillett
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: lonwillett @ 2020-05-19 11:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 320 bytes --]
There is an updated pull request by lonwillett against master on the void-packages repository
https://github.com/lonwillett/void-packages update-gpsd
https://github.com/void-linux/void-packages/pull/22054
gpsd: update to 3.20
A patch file from https://github.com/void-linux/void-packages/pull/22054.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-gpsd-22054.patch --]
[-- Type: text/x-diff, Size: 7116 bytes --]
From 22aa005d6976b9709f43fc615617ead6abdb5b1a Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Sun, 17 May 2020 14:20:00 +0200
Subject: [PATCH] gpsd: update to 3.20 (soname bump)
---
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" <gem@rellim.com>
-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 <uriahheep@gmail.com>"
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
}
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] gpsd: update to 3.20
2020-05-17 18:09 [PR PATCH] gpsd: update to 3.20 lonwillett
` (2 preceding siblings ...)
2020-05-19 11:58 ` [PR PATCH] [Updated] " lonwillett
@ 2020-05-19 11:58 ` lonwillett
2020-05-19 12:17 ` lonwillett
2020-05-19 13:43 ` [PR PATCH] [Merged]: " Piraty
5 siblings, 0 replies; 7+ messages in thread
From: lonwillett @ 2020-05-19 11:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 320 bytes --]
There is an updated pull request by lonwillett against master on the void-packages repository
https://github.com/lonwillett/void-packages update-gpsd
https://github.com/void-linux/void-packages/pull/22054
gpsd: update to 3.20
A patch file from https://github.com/void-linux/void-packages/pull/22054.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-gpsd-22054.patch --]
[-- Type: text/x-diff, Size: 8464 bytes --]
From 22aa005d6976b9709f43fc615617ead6abdb5b1a Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Sun, 17 May 2020 14:20:00 +0200
Subject: [PATCH 1/3] gpsd: update to 3.20 (soname bump)
---
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" <gem@rellim.com>
-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 <uriahheep@gmail.com>"
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
}
}
From d75d00fafbaff2727bace8c4d06d17826b77b14c Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 19 May 2020 13:58:44 +0200
Subject: [PATCH 2/3] navit: rebuild for gpsd-3.20
---
srcpkgs/navit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 34821105642..3635c66ec49 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From 815534b217c44fb6a1c5f03b53ab7450f74d886e Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 19 May 2020 13:58:44 +0200
Subject: [PATCH 3/3] marble5: rebuild for gpsd-3.20
---
srcpkgs/marble5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index fdf059e09d2..0e6f08a9cd9 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,7 +1,7 @@
# Template file for 'marble5'
pkgname=marble5
version=20.04.0
-revision=1
+revision=2
wrksrc="marble-${version}"
build_style=cmake
configure_args="-DBUILD_MARBLE_TESTS=NO -DKF5_HOST_TOOLING=/usr/lib/cmake"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: gpsd: update to 3.20
2020-05-17 18:09 [PR PATCH] gpsd: update to 3.20 lonwillett
` (3 preceding siblings ...)
2020-05-19 11:58 ` lonwillett
@ 2020-05-19 12:17 ` lonwillett
2020-05-19 13:43 ` [PR PATCH] [Merged]: " Piraty
5 siblings, 0 replies; 7+ messages in thread
From: lonwillett @ 2020-05-19 12:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 155 bytes --]
New comment by lonwillett on void-packages repository
https://github.com/void-linux/void-packages/pull/22054#issuecomment-630780310
Comment:
Better now?
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Merged]: gpsd: update to 3.20
2020-05-17 18:09 [PR PATCH] gpsd: update to 3.20 lonwillett
` (4 preceding siblings ...)
2020-05-19 12:17 ` lonwillett
@ 2020-05-19 13:43 ` Piraty
5 siblings, 0 replies; 7+ messages in thread
From: Piraty @ 2020-05-19 13:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 154 bytes --]
There's a merged pull request on the void-packages repository
gpsd: update to 3.20
https://github.com/void-linux/void-packages/pull/22054
Description:
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-05-19 13:43 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-17 18:09 [PR PATCH] gpsd: update to 3.20 lonwillett
2020-05-18 17:03 ` [PR PATCH] [Updated] " lonwillett
2020-05-18 18:16 ` lonwillett
2020-05-19 11:58 ` [PR PATCH] [Updated] " lonwillett
2020-05-19 11:58 ` lonwillett
2020-05-19 12:17 ` lonwillett
2020-05-19 13:43 ` [PR PATCH] [Merged]: " Piraty
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).