From f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 30 Sep 2020 17:27:54 +0100 Subject: gentoo resync : 30.09.2020 --- .../gpsd/files/gpsd-3.17-do_not_rm_library.patch | 12 -- .../gpsd/files/gpsd-3.17-scons-print.patch | 73 ----------- .../gpsd/files/gpsd-3.17-scons-py3.patch | 143 --------------------- .../gpsd/files/gpsd-3.18.1-do_not_rm_library.patch | 11 -- .../gpsd/files/gpsd-3.19-do_not_rm_library.patch | 11 -- 5 files changed, 250 deletions(-) delete mode 100644 sci-geosciences/gpsd/files/gpsd-3.17-do_not_rm_library.patch delete mode 100644 sci-geosciences/gpsd/files/gpsd-3.17-scons-print.patch delete mode 100644 sci-geosciences/gpsd/files/gpsd-3.17-scons-py3.patch delete mode 100644 sci-geosciences/gpsd/files/gpsd-3.18.1-do_not_rm_library.patch delete mode 100644 sci-geosciences/gpsd/files/gpsd-3.19-do_not_rm_library.patch (limited to 'sci-geosciences/gpsd/files') diff --git a/sci-geosciences/gpsd/files/gpsd-3.17-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-3.17-do_not_rm_library.patch deleted file mode 100644 index 83e2907fca5b..000000000000 --- a/sci-geosciences/gpsd/files/gpsd-3.17-do_not_rm_library.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/SConstruct b/SConstruct -index c0f083a..4a98580 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -1646,7 +1646,6 @@ binaryinstall.append(env.Install(installdir('sbindir'), sbin_binaries)) - binaryinstall.append(env.Install(installdir('bindir'), bin_binaries)) - binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib, libgps_version)) - # Work around a minor bug in InstallSharedLib() link handling --env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), )) - - if qt_env: - binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib, libgps_version)) diff --git a/sci-geosciences/gpsd/files/gpsd-3.17-scons-print.patch b/sci-geosciences/gpsd/files/gpsd-3.17-scons-print.patch deleted file mode 100644 index 4d94d05f4284..000000000000 --- a/sci-geosciences/gpsd/files/gpsd-3.17-scons-print.patch +++ /dev/null @@ -1,73 +0,0 @@ -From ed205512dd05a7dd4b0dab8af760d13e9efbbb25 Mon Sep 17 00:00:00 2001 -From: Fred Wright -Date: Sat, 7 Oct 2017 19:54:55 -0700 -Subject: [PATCH] Fixes SConstruct for SCons 3.0.0. - -SCons 3.0.0 introduced a bug where the print_funtion future import is -inflicted on the SConstruct script, making 'print' as a statement -illegal. This is expected to be fixed in SCons 3.0.1, but in the -meantime it's necessary to switch to the print_function mode for -compatibility. Fortunately, there were only three print statements in -the whole file. - -This is not a complete Python 3 fix; it simply restores correct -operation when running SCons under Python 2. - -TESTED: -Arraged to test all three print() instances under OSX. -Tested "scons build-all check" under OSX, Ubuntu, CentOS, Fedora, -FreeBSD, OpenBSD, and NetBSD. ---- - SConstruct | 15 +++++++++++---- - 1 file changed, 11 insertions(+), 4 deletions(-) - -diff --git a/SConstruct b/SConstruct -index 4923ad8cdae3..040103cff387 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -23,6 +23,13 @@ - # * Out-of-directory builds: see http://www.scons.org/wiki/UsingBuildDir - # * Coveraging mode: gcc "-coverage" flag requires a hack - # for building the python bindings -+# * Python 3 compatibility in this recipe -+ -+# Since SCons 3.0.0 forces print_function on us, it needs to be unconditional. -+# This is recognized to be a bug in SCons, but we need to live with it for now, -+# and we'll need this for eventual Python 3 compatibility, anyway. -+# Python requires this to precede any non-comment code. -+from __future__ import print_function - - # Release identification begins here - gpsd_version = "3.18~dev" -@@ -375,7 +382,7 @@ if env.GetOption("silent"): - - def announce(msg): - if not env.GetOption("silent"): -- print msg -+ print(msg) - - # DESTDIR environment variable means user prefix the installation root. - DESTDIR = os.environ.get('DESTDIR', '') -@@ -1546,8 +1553,8 @@ def substituter(target, source, env): - content = content.replace(s, t) - m = re.search("@[A-Z]+@", content) - if m and m.group(0) not in map(lambda x: x[0], substmap): -- print >>sys.stderr, "Unknown subst token %s in %s." \ -- % (m.group(0), sfp.name) -+ print("Unknown subst token %s in %s." % (m.group(0), sfp.name), -+ file=sys.stderr) - tfp = open(str(target[0]), "w") - tfp.write(content) - tfp.close() -@@ -2191,7 +2198,7 @@ def validation_list(target, source, env): - if '-head' not in page: - fp = open(page) - if "Valid HTML" in fp.read(): -- print os.path.join(website, os.path.basename(page)) -+ print(os.path.join(website, os.path.basename(page))) - fp.close() - Utility("validation-list", [www], validation_list) - --- -2.19.1 - diff --git a/sci-geosciences/gpsd/files/gpsd-3.17-scons-py3.patch b/sci-geosciences/gpsd/files/gpsd-3.17-scons-py3.patch deleted file mode 100644 index d6154c47687b..000000000000 --- a/sci-geosciences/gpsd/files/gpsd-3.17-scons-py3.patch +++ /dev/null @@ -1,143 +0,0 @@ -From b2ba8d5ade0f9d55c2b51ca41d9c9604662452ad Mon Sep 17 00:00:00 2001 -From: Robert Norris -Date: Mon, 12 Feb 2018 14:16:17 -0800 -Subject: [PATCH] SConstruct: Allow building for Python 3 - -Still usable with Python 2 - -Tested: -scons build-all check - -Debian Unstable with python 2.7.14 -OpenSUSE Tumbleweed with python 3.6.4 ---- - SConstruct | 30 ++++++++++++++++-------------- - 1 file changed, 16 insertions(+), 14 deletions(-) - -diff --git a/SConstruct b/SConstruct -index c6a309ec3c30..17b47e21342f 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -370,7 +370,7 @@ for flag in ["LDFLAGS", "SHLINKFLAGS", "CPPFLAGS"]: - - - # Keep scan-build options in the environment --for key, value in os.environ.iteritems(): -+for key, value in os.environ.items(): - if key.startswith('CCC_'): - env.Append(ENV={key: value}) - -@@ -476,6 +476,8 @@ if env['sysroot']: - env.MergeFlags({"LINKFLAGS": ["--sysroot=%s" % env['sysroot']]}) - - # Build help -+def cmp(a, b): -+ return (a > b) - (a < b) - - Help("""Arguments may be a mixture of switches and targets in any order. - Switches apply to the entire build regardless of where they are in the order. -@@ -859,9 +861,9 @@ else: - "dbus_export": ["libdbus-1"], - } - -- keys = map(lambda x: (x[0], x[2]), boolopts) \ -- + map(lambda x: (x[0], x[2]), nonboolopts) \ -- + map(lambda x: (x[0], x[2]), pathopts) -+ keys = list(map(lambda x: (x[0], x[2]), boolopts)) \ -+ + list(map(lambda x: (x[0], x[2]), nonboolopts)) \ -+ + list(map(lambda x: (x[0], x[2]), pathopts)) - keys.sort() - for (key, help) in keys: - value = env[key] -@@ -998,7 +1000,7 @@ else: - if env['python']: # May have been turned off by error - env['PYTHON'] = target_python_path - env['ENV']['PYTHON'] = target_python_path # For regress-driver -- py_config_vars = ast.literal_eval(py_config_text) -+ py_config_vars = ast.literal_eval(py_config_text.decode()) - py_config_vars = [[] if x is None else x for x in py_config_vars] - python_config = dict(zip(PYTHON_CONFIG_NAMES, py_config_vars)) - -@@ -1387,7 +1389,7 @@ else: - - python_objects = {} - python_compiled_libs = {} -- for ext, sources in python_extensions.iteritems(): -+ for ext, sources in python_extensions.items(): - python_objects[ext] = [] - for src in sources: - python_objects[ext].append( -@@ -1417,7 +1419,7 @@ Platform: UNKNOWN - python_egg_info = python_env.Textfile(target="gps-%s.egg-info" - % (gpsd_version, ), - source=python_egg_info_source) -- python_built_extensions = python_compiled_libs.values() -+ python_built_extensions = list(python_compiled_libs.values()) - python_targets = python_built_extensions + [python_egg_info] - - env.Command(target="packet_names.h", source="packet_states.h", action=""" -@@ -1624,14 +1626,14 @@ if env['xgps']: - "xgpsspeed.1": "gps.xml", - "xgps.1": "gps.xml", - }) --all_manpages = base_manpages.keys() + python_manpages.keys() -+all_manpages = list(base_manpages.keys()) + 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: -- for (man, xml) in base_manpages.items() + python_manpages.items(): -+ for (man, xml) in list(base_manpages.items()) + list(python_manpages.items()): - manpage_targets.append(man_env.Man(source=xml, target=man)) - - # Where it all comes together -@@ -1682,7 +1684,7 @@ if ((not env['debug'] and not env['profiling'] and not env['nostrip'] - if not env['python']: - python_install = [] - else: -- python_module_dir = python_libdir + os.sep + 'gps' -+ python_module_dir = str(python_libdir) + os.sep + 'gps' - python_extensions_install = python_env.Install(DESTDIR + python_module_dir, - python_built_extensions) - if ((not env['debug'] and not env['profiling'] -@@ -1695,7 +1697,7 @@ else: - python_progs_install = python_env.Install(installdir('bindir'), - python_progs) - -- python_egg_info_install = python_env.Install(DESTDIR + python_libdir, -+ python_egg_info_install = python_env.Install(DESTDIR + str(python_libdir), - python_egg_info) - python_install = [python_extensions_install, - python_modules_install, -@@ -1712,7 +1714,7 @@ if qt_env: - - - maninstall = [] --for manpage in base_manpages.keys() + python_manpages.keys(): -+for manpage in list(base_manpages.keys()) + list(python_manpages.keys()): - if not manbuilder and not os.path.exists(manpage): - continue - section = manpage.split(".")[1] -@@ -2198,7 +2200,7 @@ htmlpages = Split(''' - www/writing-a-driver.html - ''') - --webpages = htmlpages + asciidocs + map(lambda f: f[:-3], glob.glob("www/*.in")) -+webpages = htmlpages + asciidocs + list(map(lambda f: f[:-3], glob.glob("www/*.in"))) - - www = env.Alias('www', webpages) - -@@ -2376,7 +2378,7 @@ if os.path.exists("gpsd.c") and os.path.exists(".gitignore"): - if ".gitignore" in distfiles: - distfiles.remove(".gitignore") - distfiles += generated_sources -- distfiles += base_manpages.keys() + python_manpages.keys() -+ distfiles += list(base_manpages.keys()) + list(python_manpages.keys()) - if "packaging/rpm/gpsd.spec" not in distfiles: - distfiles.append("packaging/rpm/gpsd.spec") - --- -2.19.1 - diff --git a/sci-geosciences/gpsd/files/gpsd-3.18.1-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-3.18.1-do_not_rm_library.patch deleted file mode 100644 index 0500f385d79d..000000000000 --- a/sci-geosciences/gpsd/files/gpsd-3.18.1-do_not_rm_library.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gpsd-3.18.1/SConstruct.orig 2018-10-19 12:45:40.000000000 -0700 -+++ gpsd-3.18.1/SConstruct 2019-10-02 11:49:00.848685223 -0700 -@@ -1796,8 +1796,6 @@ # third-party client programs should not - binaryinstall.append(env.Install(installdir('bindir'), bin_binaries)) - binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib, - libgps_version)) --# Work around a minor bug in InstallSharedLib() link handling --env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), )) - - if qt_env: - binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), diff --git a/sci-geosciences/gpsd/files/gpsd-3.19-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-3.19-do_not_rm_library.patch deleted file mode 100644 index 8008dd54fe9c..000000000000 --- a/sci-geosciences/gpsd/files/gpsd-3.19-do_not_rm_library.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gpsd-3.19/SConstruct.orig 2019-07-01 19:00:17.000000000 -0700 -+++ gpsd-3.19/SConstruct 2019-10-02 11:49:06.080655901 -0700 -@@ -1980,8 +1980,6 @@ # third-party client programs should not - binaryinstall.append(env.Install(installdir('bindir'), bin_binaries)) - binaryinstall.append(LibraryInstall(env, installdir('libdir'), libgps_shared, - libgps_version)) --# Work around a minor bug in InstallSharedLib() link handling --env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), )) - - if qt_env: - binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), -- cgit v1.2.3