Thanks, applied as 9844afd003ed1bd0ef9940907d69a6e122436960. Michael
[sent from post-receive hook] On Wed, 20 Oct 2021 11:39:17 +0200, Roland Hieber <[email protected]> wrote: > Signed-off-by: Ladislav Michl <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/gpsd-3.21/0003-SConstruct-don-t-make-python-files-without-shebang-e.patch > > b/patches/gpsd-3.21/0003-SConstruct-don-t-make-python-files-without-shebang-e.patch > deleted file mode 100644 > index 809d98a6d9b4..000000000000 > --- > a/patches/gpsd-3.21/0003-SConstruct-don-t-make-python-files-without-shebang-e.patch > +++ /dev/null > @@ -1,23 +0,0 @@ > -From: Michael Olbrich <[email protected]> > -Date: Fri, 14 Aug 2020 09:44:34 +0200 > -Subject: [PATCH] SConstruct: don't make python files without shebang > - executable > - > -Signed-off-by: Michael Olbrich <[email protected]> > ---- > - SConstruct | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/SConstruct b/SConstruct > -index 434141f3e46b..d303c3aa6d20 100644 > ---- a/SConstruct > -+++ b/SConstruct > -@@ -2116,7 +2116,7 @@ for fn in templated: > - env.Default(builder) > - # set read-only to alert people trying to edit the files. > - env.AddPostAction(builder, 'chmod -w $TARGET') > -- if ((fn.endswith(".py.in") or > -+ if ((fn[:-3] in ['contrib/skyview2svg.py', 'gps/gps.py'] or > - fn[:-3] in python_progs or > - fn[:-3] in ['contrib/ntpshmviz', 'contrib/webgps'])): > - # set python files to executable > diff --git a/patches/gpsd-3.21/series b/patches/gpsd-3.21/series > deleted file mode 100644 > index bbfb1be7d4ef..000000000000 > --- a/patches/gpsd-3.21/series > +++ /dev/null > @@ -1,7 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-Search-for-ncursesw-pkgconfig.patch > -0002-SConstruct-Use-target-option-to-decide-whenewer-to-r.patch > -0003-SConstruct-don-t-make-python-files-without-shebang-e.patch > -0004-SConstruct-don-t-use-lnsl.patch > -# a4f439aa9ecaa21523935c6cada0b0dc - git-ptx-patches magic > diff --git a/patches/gpsd-3.21/0001-Search-for-ncursesw-pkgconfig.patch > b/patches/gpsd-3.23.1/0001-SConscript-Search-for-ncursesw-pkgconfig.patch > similarity index 70% > rename from patches/gpsd-3.21/0001-Search-for-ncursesw-pkgconfig.patch > rename to > patches/gpsd-3.23.1/0001-SConscript-Search-for-ncursesw-pkgconfig.patch > index c7b874c832ed..7f662bf2df11 100644 > --- a/patches/gpsd-3.21/0001-Search-for-ncursesw-pkgconfig.patch > +++ b/patches/gpsd-3.23.1/0001-SConscript-Search-for-ncursesw-pkgconfig.patch > @@ -1,20 +1,20 @@ > From: Ladislav Michl <[email protected]> > Date: Fri, 25 Oct 2019 14:18:30 +0200 > -Subject: [PATCH] Search for ncursesw pkgconfig > +Subject: [PATCH] SConscript: Search for ncursesw pkgconfig > > PTXDist can be configured to build wide char version of ncurses > -which SConstruct is unaware of. > +which SConscript is unaware of. > > Signed-off-by: Ladislav Michl <[email protected]> > --- > - SConstruct | 2 ++ > + SConscript | 2 ++ > 1 file changed, 2 insertions(+) > > -diff --git a/SConstruct b/SConstruct > -index e15d63f6ede0..71643c428f26 100644 > ---- a/SConstruct > -+++ b/SConstruct > -@@ -1067,6 +1067,8 @@ else: > +diff --git a/SConscript b/SConscript > +index 8c6136d9d623..dc7a5c997357 100644 > +--- a/SConscript > ++++ b/SConscript > +@@ -1036,6 +1036,8 @@ if not cleaning and not helping: > ncurseslibs = pkg_config('ncurses', rpath_hack=True) > if config.CheckPKG('tinfo'): > ncurseslibs += pkg_config('tinfo', rpath_hack=True) > diff --git > a/patches/gpsd-3.21/0002-SConstruct-Use-target-option-to-decide-whenewer-to-r.patch > > b/patches/gpsd-3.23.1/0002-SConscript-Use-target-option-to-decide-whenewer-to-r.patch > similarity index 61% > rename from > patches/gpsd-3.21/0002-SConstruct-Use-target-option-to-decide-whenewer-to-r.patch > rename to > patches/gpsd-3.23.1/0002-SConscript-Use-target-option-to-decide-whenewer-to-r.patch > index d7c6945ae32d..ef8974979243 100644 > --- > a/patches/gpsd-3.21/0002-SConstruct-Use-target-option-to-decide-whenewer-to-r.patch > +++ > b/patches/gpsd-3.23.1/0002-SConscript-Use-target-option-to-decide-whenewer-to-r.patch > @@ -1,17 +1,18 @@ > From: Ladislav Michl <[email protected]> > Date: Sun, 2 Feb 2020 09:45:04 +0100 > -Subject: [PATCH] SConstruct: Use 'target' option to decide whenewer to > restart > +Subject: [PATCH] SConscript: Use 'target' option to decide whenewer to > restart > systemd > > +Signed-off-by: Ladislav Michl <[email protected]> > --- > - SConstruct | 2 +- > + SConscript | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > -diff --git a/SConstruct b/SConstruct > -index 71643c428f26..434141f3e46b 100644 > ---- a/SConstruct > -+++ b/SConstruct > -@@ -2853,7 +2853,7 @@ udev_install = Utility('udev-install', 'install', [ > +diff --git a/SConscript b/SConscript > +index dc7a5c997357..e090a3a22e24 100644 > +--- a/SConscript > ++++ b/SConscript > +@@ -3102,7 +3102,7 @@ udev_install = Utility('udev-install', 'install', [ > > if env['systemd']: > env.Requires(udev_install, systemd_install) > diff --git > a/patches/gpsd-3.23.1/0003-SConscript-don-t-make-python-files-without-shebang-e.patch > > b/patches/gpsd-3.23.1/0003-SConscript-don-t-make-python-files-without-shebang-e.patch > new file mode 100644 > index 000000000000..1c4caef05e07 > --- /dev/null > +++ > b/patches/gpsd-3.23.1/0003-SConscript-don-t-make-python-files-without-shebang-e.patch > @@ -0,0 +1,23 @@ > +From: Michael Olbrich <[email protected]> > +Date: Fri, 14 Aug 2020 09:44:34 +0200 > +Subject: [PATCH] SConscript: don't make python files without shebang > + executable > + > +Signed-off-by: Michael Olbrich <[email protected]> > +--- > + SConscript | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/SConscript b/SConscript > +index e090a3a22e24..400af2c1fdb3 100644 > +--- a/SConscript > ++++ b/SConscript > +@@ -2263,7 +2263,7 @@ for (tgt, src) in templated.items(): > + env.Default(builder) > + # set read-only to alert people trying to edit the files. > + env.AddPostAction(builder, 'chmod -w $TARGET') > +- if ((src.endswith(".py.in") or > ++ if (((src.endswith(".py.in") and src not in ['gps/__init__.py.in', > 'gps/packet.py.in']) or > + tgt in python_progs or > + tgt in ['contrib/ntpshmviz', 'contrib/webgps'])): > + # set python files to executable > diff --git a/patches/gpsd-3.21/0004-SConstruct-don-t-use-lnsl.patch > b/patches/gpsd-3.23.1/0004-SConscript-don-t-use-lnsl.patch > similarity index 75% > rename from patches/gpsd-3.21/0004-SConstruct-don-t-use-lnsl.patch > rename to patches/gpsd-3.23.1/0004-SConscript-don-t-use-lnsl.patch > index e857f8faa5d9..f5fd260e9432 100644 > --- a/patches/gpsd-3.21/0004-SConstruct-don-t-use-lnsl.patch > +++ b/patches/gpsd-3.23.1/0004-SConscript-don-t-use-lnsl.patch > @@ -1,19 +1,19 @@ > From: Michael Olbrich <[email protected]> > Date: Fri, 13 Nov 2020 11:55:47 +0100 > -Subject: [PATCH] SConstruct: don't use -lnsl > +Subject: [PATCH] SConscript: don't use -lnsl > > It may be found on Linux but is not actually needed. > > Signed-off-by: Michael Olbrich <[email protected]> > --- > - SConstruct | 8 +------- > + SConscript | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > -diff --git a/SConstruct b/SConstruct > -index d303c3aa6d20..ce627e93f65e 100644 > ---- a/SConstruct > -+++ b/SConstruct > -@@ -1113,13 +1113,7 @@ else: > +diff --git a/SConscript b/SConscript > +index 400af2c1fdb3..d6678ba9bd13 100644 > +--- a/SConscript > ++++ b/SConscript > +@@ -1082,13 +1082,7 @@ if not cleaning and not helping: > else: > confdefs.append("/* #undef HAVE_LIBRT */\n") > > diff --git a/patches/gpsd-3.23.1/series b/patches/gpsd-3.23.1/series > new file mode 100644 > index 000000000000..931e45a04ebf > --- /dev/null > +++ b/patches/gpsd-3.23.1/series > @@ -0,0 +1,7 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-SConscript-Search-for-ncursesw-pkgconfig.patch > +0002-SConscript-Use-target-option-to-decide-whenewer-to-r.patch > +0003-SConscript-don-t-make-python-files-without-shebang-e.patch > +0004-SConscript-don-t-use-lnsl.patch > +# 22a1bb00c3298707123a09b397fd475a - git-ptx-patches magic > diff --git a/rules/gpsd.make b/rules/gpsd.make > index 4389356d2b20..75c497e632f7 100644 > --- a/rules/gpsd.make > +++ b/rules/gpsd.make > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GPSD) += gpsd > # > # Paths and names > # > -GPSD_VERSION := 3.21 > -GPSD_MD5 := 782e4b10193f225cc95c65528636d4f5 > +GPSD_VERSION := 3.23.1 > +GPSD_MD5 := 7984a35e7104b46c2cb570fb30c4be03 > GPSD := gpsd-$(GPSD_VERSION) > GPSD_SUFFIX := tar.xz > GPSD_URL := > http://download.savannah.gnu.org/releases/gpsd/$(GPSD).$(GPSD_SUFFIX) > @@ -101,6 +101,7 @@ GPSD_CONF_OPT = \ > profiling=$(call ptx/yesno, PTXCONF_GPSD_PROFILING) \ > python=$(call ptx/yesno, PTXCONF_GPSD_PYTHON) \ > python_libdir=/usr/lib/python$(PYTHON3_MAJORMINOR) \ > + python_shebang=/usr/bin/python$(PYTHON3_MAJORMINOR) \ > qt=no \ > rtcm104v2=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_RTCM104V2) \ > rtcm104v3=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_RTCM104V3) \ _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
