[Git][debian-gis-team/mapnik][master] Mark Stop-using-custom-OrderedDict.patch as Applied-Upstream.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / mapnik


Commits:
e617c779 by Bas Couwenberg at 2022-02-08T15:30:42+01:00
Mark Stop-using-custom-OrderedDict.patch as Applied-Upstream.

- - - - -


1 changed file:

- debian/patches/Stop-using-custom-OrderedDict.patch


Changes:

=====================================
debian/patches/Stop-using-custom-OrderedDict.patch
=====================================
@@ -1,29 +1,19 @@
-From: Mats Wichmann <mats at linux.com>
-Date: Sun, 26 Aug 2018 22:54:00 -0600
-Subject: Stop using custom OrderedDict
+Description: Stop using custom OrderedDict
+ OrdredDict is in the standard library for all supported Python versions
+ (2.7 and 3.5+) and has improvements over the ActiveState recipe version
+ of OrderedDict we have been using. Switch to importing from collections
+ instead of getting it from SCons.Util (tests already did this).
+ .
+ At the same time, reorganize the Util.py imports - import Iterable
+ from collections.abc if possible (it is deprecated to import
+ it from collections, will stop working in 3.8); try getting the
+ User{Dict,List,String} from collections if possible - that is, try the
+ 3.x way first.
+Author: Mats Wichmann <mats at linux.com>
+Origin: https://github.com/SCons/scons/commit/3fa7141ec7b39
+Forwarded: https://github.com/mapnik/mapnik/pull/4294
+Applied-Upstream: https://github.com/mapnik/mapnik/commit/7da9009e7ffffb0b9429890f6f13fee837ac320f
 
-OrdredDict is in the standard library for all supported Python versions
-(2.7 and 3.5+) and has improvements over the ActiveState recipe version
-of OrderedDict we have been using. Switch to importing from collections
-instead of getting it from SCons.Util (tests already did this).
-
-At the same time, reorganize the Util.py imports - import Iterable
-from collections.abc if possible (it is deprecated to import
-it from collections, will stop working in 3.8); try getting the
-User{Dict,List,String} from collections if possible - that is, try the
-3.x way first.
-
-Signed-off-by: Mats Wichmann <mats at linux.com>
-
-https://github.com/SCons/scons/commit/3fa7141ec7b39
----
- scons/scons-local-3.0.1/SCons/Action.py     |  3 +-
- scons/scons-local-3.0.1/SCons/Tool/javac.py |  3 +-
- scons/scons-local-3.0.1/SCons/Util.py       | 75 ++++-------------------------
- 3 files changed, 13 insertions(+), 68 deletions(-)
-
-diff --git a/scons/scons-local-3.0.1/SCons/Action.py b/scons/scons-local-3.0.1/SCons/Action.py
-index ce5471d..c8a85f8 100644
 --- a/scons/scons-local-3.0.1/SCons/Action.py
 +++ b/scons/scons-local-3.0.1/SCons/Action.py
 @@ -107,6 +107,7 @@ import sys
@@ -43,11 +33,9 @@ index ce5471d..c8a85f8 100644
          for act in self.list:
              for var in act.get_varlist(target, source, env, executor):
                  result[var] = True
-diff --git a/scons/scons-local-3.0.1/SCons/Tool/javac.py b/scons/scons-local-3.0.1/SCons/Tool/javac.py
-index ded1a3e..0c5056b 100644
 --- a/scons/scons-local-3.0.1/SCons/Tool/javac.py
 +++ b/scons/scons-local-3.0.1/SCons/Tool/javac.py
-@@ -34,6 +34,7 @@ __revision__ = "src/engine/SCons/Tool/javac.py 74b2c53bc42290e911b334a6b44f187da
+@@ -34,6 +34,7 @@ __revision__ = "src/engine/SCons/Tool/ja
  
  import os
  import os.path
@@ -55,7 +43,7 @@ index ded1a3e..0c5056b 100644
  
  import SCons.Action
  import SCons.Builder
-@@ -70,7 +71,7 @@ def emit_java_classes(target, source, env):
+@@ -70,7 +71,7 @@ def emit_java_classes(target, source, en
          if isinstance(entry, SCons.Node.FS.File):
              slist.append(entry)
          elif isinstance(entry, SCons.Node.FS.Dir):
@@ -64,8 +52,6 @@ index ded1a3e..0c5056b 100644
              dirnode = entry.rdir()
              def find_java_files(arg, dirpath, filenames):
                  java_files = sorted([n for n in filenames
-diff --git a/scons/scons-local-3.0.1/SCons/Util.py b/scons/scons-local-3.0.1/SCons/Util.py
-index c9aa2b5..8f19f51 100644
 --- a/scons/scons-local-3.0.1/SCons/Util.py
 +++ b/scons/scons-local-3.0.1/SCons/Util.py
 @@ -37,21 +37,18 @@ import pprint



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/-/commit/e617c779c006f2f9699afba26feaf38cd6904600

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/-/commit/e617c779c006f2f9699afba26feaf38cd6904600
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20220208/36b4aa8b/attachment-0001.htm>