From 286c9ed063a1930b36209c4f257235c7b3a27ac3 Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Sat, 23 Oct 2021 00:28:12 +0300 Subject: [PATCH] gpsd !24.10.21. --- science/gis/gpsd/actions.py | 9 +-------- ...o_prefix_replace.patch => pylibdir_path.patch} | 12 ++++++------ science/gis/gpsd/files/use_os_environ.patch | 11 +++++++++++ ...ondontwritebytecode_environment_variable.patch | 10 ---------- science/gis/gpsd/pspec.xml | 15 +++++++++++---- 5 files changed, 29 insertions(+), 28 deletions(-) rename science/gis/gpsd/files/{pylibdir_no_prefix_replace.patch => pylibdir_path.patch} (55%) create mode 100644 science/gis/gpsd/files/use_os_environ.patch delete mode 100644 science/gis/gpsd/files/use_pythondontwritebytecode_environment_variable.patch diff --git a/science/gis/gpsd/actions.py b/science/gis/gpsd/actions.py index 5150cabc22..458aebdf30 100644 --- a/science/gis/gpsd/actions.py +++ b/science/gis/gpsd/actions.py @@ -4,10 +4,7 @@ # Licensed under the GNU General Public License, version 3. # See the file https://www.gnu.org/licenses/gpl-3.0.txt -from pisi.actionsapi import shelltools -from pisi.actionsapi import autotools -from pisi.actionsapi import pisitools -from pisi.actionsapi import get +from pisi.actionsapi import shelltools, get shelltools.export("PYTHONDONTWRITEBYTECODE", "1") i = "/usr/bin/env python3 $(which scons)" @@ -24,7 +21,3 @@ def install(): # fix shebang shelltools.system("find %s/usr/bin -type f -exec sed -i 's|env\ python$|env python3|g' {} \;" % get.installDIR()) - # Install UDEV files -# pisitools.insinto("/lib/udev/rules.d", "gpsd.rules", "99-gpsd.rules") -# pisitools.dobin("gpsd.hotplug", "/lib/udev") - diff --git a/science/gis/gpsd/files/pylibdir_no_prefix_replace.patch b/science/gis/gpsd/files/pylibdir_path.patch similarity index 55% rename from science/gis/gpsd/files/pylibdir_no_prefix_replace.patch rename to science/gis/gpsd/files/pylibdir_path.patch index 5783e91549..d7a1c9fb16 100644 --- a/science/gis/gpsd/files/pylibdir_no_prefix_replace.patch +++ b/science/gis/gpsd/files/pylibdir_path.patch @@ -1,13 +1,13 @@ ---- a/SConstruct 2020-08-04 18:40:06.000000000 +0000 -+++ b/SConstruct 2020-12-12 18:29:38.378386573 +0000 -@@ -1460,8 +1460,8 @@ +--- a/SConscript 2021-09-22 00:53:44.000000000 +0300 ++++ b/SConscript 2021-09-25 06:56:40.449906438 +0300 +@@ -1492,8 +1492,8 @@ # follow FHS, put in /usr/local/libXX, not /usr/libXX # may be lib, lib32 or lib64 python_libdir = polystr(python_libdir) - python_libdir = python_libdir.replace("/usr/lib", - "/usr/local/lib") -+# python_libdir = python_libdir.replace("/usr/lib", -+# "/usr/local/lib") ++ # python_libdir = python_libdir.replace("/usr/lib", ++ # "/usr/local/lib") python_module_dir = str(python_libdir) + os.sep # Many systems can have a problem with the Python path - announce("Ensure your PYTHONPATH includes %s" % python_module_dir) + if 'PYTHONPATH' in os.environ: diff --git a/science/gis/gpsd/files/use_os_environ.patch b/science/gis/gpsd/files/use_os_environ.patch new file mode 100644 index 0000000000..e9d0a49b2c --- /dev/null +++ b/science/gis/gpsd/files/use_os_environ.patch @@ -0,0 +1,11 @@ +--- a/SConscript 2021-09-22 00:53:44.000000000 +0300 ++++ b/SConscript 2021-09-25 06:55:30.514907375 +0300 +@@ -464,7 +464,7 @@ + 'WRITE_PAD', # So we can test WRITE_PAD values on the fly. + ) + +-envs = {} ++envs = os.environ + for var in import_env: + if var in os.environ: + envs[var] = os.environ[var] diff --git a/science/gis/gpsd/files/use_pythondontwritebytecode_environment_variable.patch b/science/gis/gpsd/files/use_pythondontwritebytecode_environment_variable.patch deleted file mode 100644 index 6fc35d8f96..0000000000 --- a/science/gis/gpsd/files/use_pythondontwritebytecode_environment_variable.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/SConstruct 2020-08-04 18:40:06.000000000 +0000 -+++ b/SConstruct 2020-12-27 05:47:40.748197656 +0000 -@@ -516,6 +516,7 @@ - 'CWRAPPERS_CONFIG_DIR', # pkgsrc - # Variables used in testing - 'WRITE_PAD', # So we can test WRITE_PAD values on the fly. -+ 'PYTHONDONTWRITEBYTECODE', - ) - - envs = {} diff --git a/science/gis/gpsd/pspec.xml b/science/gis/gpsd/pspec.xml index c5a377ea9d..fa752f995a 100644 --- a/science/gis/gpsd/pspec.xml +++ b/science/gis/gpsd/pspec.xml @@ -16,8 +16,8 @@ gpsd is a service daemon that monitor one or more GPSes attached to a host computer through serial or USB ports, making all data of the sensors available to be queried on TCP port 2947 of the host computer. - - http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-3.21.tar.xz + + http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-3.23.1.tar.xz scons @@ -32,8 +32,8 @@ python3-pyserial - pylibdir_no_prefix_replace.patch - use_pythondontwritebytecode_environment_variable.patch + pylibdir_path.patch + use_os_environ.patch @@ -124,6 +124,13 @@ + + 2021-10-22 + 3.23.1 + Version bump. + fury + uglyside@yandex.ru + 2020-12-27 3.21