From: leahneukirchen <leahneukirchen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] gpsd: update to 3.23.
Date: Mon, 09 Aug 2021 20:33:24 +0200 [thread overview]
Message-ID: <20210809183324.-zrq36Tqg5ghpNqWodqu60zliO7HNJD60kGlEZJCXvY@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32429@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 368 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages gpsd323
https://github.com/void-linux/void-packages/pull/32429
gpsd: update to 3.23.
Only build tested, I don't have hardware.
A patch file from https://github.com/void-linux/void-packages/pull/32429.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gpsd323-32429.patch --]
[-- Type: text/x-diff, Size: 5932 bytes --]
From 160781d363b0c1179ad003b0620365e2b261b5d8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 Aug 2021 18:18:45 +0200
Subject: [PATCH 1/3] gpsd: update to 3.23.
---
common/shlibs | 4 ++--
srcpkgs/gpsd/patches/SConstruct-cross.patch | 13 -------------
srcpkgs/gpsd/patches/hotplug.patch | 11 +++++++++++
srcpkgs/gpsd/template | 6 +++---
4 files changed, 16 insertions(+), 18 deletions(-)
delete mode 100644 srcpkgs/gpsd/patches/SConstruct-cross.patch
create mode 100644 srcpkgs/gpsd/patches/hotplug.patch
diff --git a/common/shlibs b/common/shlibs
index 278d2456072f..cdd1befe7b31 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -74,7 +74,7 @@ libpanelw.so.6 ncurses-libs-5.8_1 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.25 gpsd-3.20_1
+libgps.so.29 gpsd-3.23_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
@@ -424,7 +424,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.25 gpsd-qt-3.20_1
+libQgpsmm.so.29 gpsd-qt-3.23_1
libsysfs.so.2 libsysfs-2.1.0_1
libsensors.so.5 libsensors-3.5.0_1
libcap-ng.so.0 libcap-ng-0.6.2_1
diff --git a/srcpkgs/gpsd/patches/SConstruct-cross.patch b/srcpkgs/gpsd/patches/SConstruct-cross.patch
deleted file mode 100644
index 9d64d2a3fa5e..000000000000
--- a/srcpkgs/gpsd/patches/SConstruct-cross.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/SConstruct~ 2020-01-01 02:31:27.000000000 +0100
-+++ b/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/hotplug.patch b/srcpkgs/gpsd/patches/hotplug.patch
new file mode 100644
index 000000000000..0d78f34b7618
--- /dev/null
+++ b/srcpkgs/gpsd/patches/hotplug.patch
@@ -0,0 +1,11 @@
+--- a/SConscript
++++ b/SConscript
+@@ -3060,7 +3060,7 @@
+ hotplug_wrapper_install = []
+ else:
+ hotplug_wrapper_install = [
+- 'cp $SRCDIR/gpsd.hotplug ' + DESTDIR + env['udevdir'],
++ 'cp $SRCDIR/../gpsd.hotplug ' + DESTDIR + env['udevdir'],
+ 'chmod a+x ' + DESTDIR + env['udevdir'] + '/gpsd.hotplug'
+ ]
+
diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template
index 4198bf214936..1238d196df4a 100644
--- a/srcpkgs/gpsd/template
+++ b/srcpkgs/gpsd/template
@@ -1,7 +1,7 @@
# Template file for 'gpsd'
pkgname=gpsd
-version=3.20
-revision=2
+version=3.23
+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"
@@ -15,7 +15,7 @@ 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.xz"
-checksum=3998a5cbb728e97f896f46c3c83301b1e6c5d859393e58c2fad8c5426774d571
+checksum=e36429b9f6fc42004894dff3dc4453f5b43f95af8533b96d3d135987418da9df
python_version=3 # Must be same version as scons
system_accounts="gpsd"
From bd49cf1bf1a5d88bd5d10bc691648e903f22953c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 Aug 2021 18:11:28 +0200
Subject: [PATCH 2/3] marble5: rebuild for gpsd-2.32_1.
---
srcpkgs/marble5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index efa8b676d395..1cae0e387e5d 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,7 +1,7 @@
# Template file for 'marble5'
pkgname=marble5
version=21.04.3
-revision=1
+revision=2
wrksrc="marble-${version}"
build_style=cmake
configure_args="-DBUILD_MARBLE_TESTS=NO -DKF5_HOST_TOOLING=/usr/lib/cmake"
From bc5e79cc0cbcc670504b75edb1410d72326ece3b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 Aug 2021 18:11:28 +0200
Subject: [PATCH 3/3] navit: update to 0.5.6.
---
srcpkgs/navit/patches/QPainterPath.patch | 10 ----------
srcpkgs/navit/template | 6 +++---
2 files changed, 3 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/navit/patches/QPainterPath.patch
diff --git a/srcpkgs/navit/patches/QPainterPath.patch b/srcpkgs/navit/patches/QPainterPath.patch
deleted file mode 100644
index 5e3b5be7022d..000000000000
--- a/srcpkgs/navit/patches/QPainterPath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/navit/graphics/qt5/graphics_qt5.cpp 2020-01-19 00:36:55.000000000 +0100
-+++ b/navit/graphics/qt5/graphics_qt5.cpp 2020-09-02 14:53:01.762542347 +0200
-@@ -45,6 +45,7 @@
- #include <QFont>
- #include <QGuiApplication>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QScreen>
- #include <QSvgRenderer>
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 449ef1ca16d3..96e17b3b3689 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
-version=0.5.4
-revision=3
+version=0.5.6
+revision=1
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.0-only"
homepage="http://www.navit-project.org/"
distfiles="https://github.com/navit-gps/navit/archive/v${version}.tar.gz"
-checksum=728d9dcad00e97769f6cd85bfad5518b0edf62ef75d60543fa4c48c1c3ab1243
+checksum=043688e0b34504ca4ee80fb6a80895b938eae41e4031d0977dd30c20c20f1714
pre_configure() {
sed -i -e 's/\(GET_FILENAME_COMPONENT (LIB_DIR ${LIBDIR}\) NAME/\1 DIRECTORY/' CMakeLists.txt
next prev parent reply other threads:[~2021-08-09 18:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-09 16:27 [PR PATCH] " leahneukirchen
2021-08-09 17:09 ` [PR REVIEW] " ericonr
2021-08-09 17:29 ` ericonr
2021-08-09 18:33 ` leahneukirchen [this message]
2021-08-18 11:54 ` leahneukirchen
2021-08-18 11:54 ` [PR PATCH] [Closed]: " leahneukirchen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210809183324.-zrq36Tqg5ghpNqWodqu60zliO7HNJD60kGlEZJCXvY@z \
--to=leahneukirchen@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).