Merge pull request #9821 from 4fury-c3440d8/no

gpsd update and rebuild a few apps with new scons.
2021-10-23 12:16:23 +03:00
parent dca9295a8e fa9ebaafcc
commit 58e9ad2353
13 changed files with 101 additions and 42 deletions
@@ -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")
-
@@ -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:
@@ -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]
@@ -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 = {}
@@ -16,8 +16,8 @@
 		<Description>
 			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.
 		</Description>
-		<Archive sha1sum="6d5d232b2a6580390268d27fe67b527df224a646" type="tarxz">
-			http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-3.21.tar.xz
+		<Archive sha1sum="2ca76a2fbb5a14b3913b5fb0df50f494356f2e8d" type="tarxz">
+			http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-3.23.1.tar.xz
 		</Archive>
 		<BuildDependencies>
 			<Dependency>scons</Dependency>
@@ -32,8 +32,8 @@
 			<Dependency>python3-pyserial</Dependency>
 		</BuildDependencies>
 		<Patches>
-			<Patch level="1">pylibdir_no_prefix_replace.patch</Patch>
-			<Patch level="1">use_pythondontwritebytecode_environment_variable.patch</Patch>
+			<Patch level="1">pylibdir_path.patch</Patch>
+			<Patch level="1">use_os_environ.patch</Patch>
 		</Patches>
 	</Source>

@@ -124,6 +124,13 @@
 	</Package>

 	<History>
+		<Update release="2">
+			<Date>2021-10-22</Date>
+			<Version>3.23.1</Version>
+			<Comment>Version bump.</Comment>
+			<Name>fury</Name>
+			<Email>uglyside@yandex.ru</Email>
+		</Update>
 		<Update release="1">
 			<Date>2020-12-27</Date>
 			<Version>3.21</Version>