summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'games-util/nml/files')
-rw-r--r--games-util/nml/files/nml-0.4.4-pillow3.patch11
-rw-r--r--games-util/nml/files/nml-0.4.5-pillow6.patch31
-rw-r--r--games-util/nml/files/nml-0.4.5-pillow7.patch41
-rw-r--r--games-util/nml/files/nml-0.4.5-python38.patch37
4 files changed, 0 insertions, 120 deletions
diff --git a/games-util/nml/files/nml-0.4.4-pillow3.patch b/games-util/nml/files/nml-0.4.4-pillow3.patch
deleted file mode 100644
index e55d989fbc1b..000000000000
--- a/games-util/nml/files/nml-0.4.4-pillow3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nml-0.4.4.orig/nml/lz77.py
-+++ nml-0.4.4/nml/lz77.py
-@@ -25,7 +25,7 @@
- @return: Compressed data.
- @rtype: C{bytearray}
- """
-- stream = data.tostring()
-+ stream = data.tobytes()
- position = 0
- output = array.array('B')
- literal_bytes = array.array('B')
diff --git a/games-util/nml/files/nml-0.4.5-pillow6.patch b/games-util/nml/files/nml-0.4.5-pillow6.patch
deleted file mode 100644
index 5b04aef0d95a..000000000000
--- a/games-util/nml/files/nml-0.4.5-pillow6.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From fc7517a66fa6c0424d176a8a1d44659273a04a1d Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conrad@kostecki.com>
-Date: Thu, 18 Apr 2019 22:14:49 +0200
-Subject: [PATCH] Add compatibility with >=pillow-6.0.0
-
-Changed VERSION to PILLOW_VERSION,
-as it got removed with >=pillow-6.0.0.
-
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- nml/version_info.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/nml/version_info.py b/nml/version_info.py
-index d7faec0..32aa3b1 100644
---- a/nml/version_info.py
-+++ b/nml/version_info.py
-@@ -139,11 +139,11 @@ def get_lib_versions():
- #PIL
- try:
- from PIL import Image
-- versions["PIL"] = Image.VERSION
-+ versions["PIL"] = Image.PILLOW_VERSION
- except ImportError:
- try:
- import Image
-- versions["PIL"] = Image.VERSION
-+ versions["PIL"] = Image.PILLOW_VERSION
- except ImportError:
- versions["PIL"] = "Not found!"
-
diff --git a/games-util/nml/files/nml-0.4.5-pillow7.patch b/games-util/nml/files/nml-0.4.5-pillow7.patch
deleted file mode 100644
index a69e40ae3e17..000000000000
--- a/games-util/nml/files/nml-0.4.5-pillow7.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 70c0b3110509dc7da2cfa688e0717e6c966e21df Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conrad@kostecki.com>
-Date: Wed, 23 Oct 2019 12:52:15 +0200
-Subject: [PATCH] Fix #39: Add compatibility with >=pillow-7.0.0
-
-Changed PILLOW_VERSION to PIL.__version__,
-as it got removed with >=pillow-7.0.0.
-
-In order not to break compatibility with older versions,
-PILLOW_VERSION will be used as a fallback.
-
-Closes: https://github.com/OpenTTD/nml/issues/39
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- nml/version_info.py | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/nml/version_info.py b/nml/version_info.py
-index 32aa3b13..da60328e 100644
---- a/nml/version_info.py
-+++ b/nml/version_info.py
-@@ -139,11 +139,17 @@ def get_lib_versions():
- #PIL
- try:
- from PIL import Image
-- versions["PIL"] = Image.PILLOW_VERSION
-+ try:
-+ versions["PIL"] = Image.__version__
-+ except AttributeError:
-+ versions["PIL"] = Image.PILLOW_VERSION
- except ImportError:
- try:
- import Image
-- versions["PIL"] = Image.PILLOW_VERSION
-+ try:
-+ versions["PIL"] = Image.__version__
-+ except AttributeError:
-+ versions["PIL"] = Image.PILLOW_VERSION
- except ImportError:
- versions["PIL"] = "Not found!"
-
diff --git a/games-util/nml/files/nml-0.4.5-python38.patch b/games-util/nml/files/nml-0.4.5-python38.patch
deleted file mode 100644
index 526a2e19f262..000000000000
--- a/games-util/nml/files/nml-0.4.5-python38.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5b8764c3c4079941fab7be8d9086c38a88ae09ba Mon Sep 17 00:00:00 2001
-From: glx22 <glx22@users.noreply.github.com>
-Date: Sun, 20 Oct 2019 11:05:25 +0200
-Subject: [PATCH] Fix #52: time.clock() has been removed in python 3.8 (#53)
-
----
- nml/generic.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/nml/generic.py b/nml/generic.py
-index ce064b6c..8ee602f1 100644
---- a/nml/generic.py
-+++ b/nml/generic.py
-@@ -295,7 +295,7 @@ def clear_progress():
- hide_progress()
-
- if (progress_message is not None) and (verbosity_level >= VERBOSITY_TIMING):
-- print("{} {:.1f} s".format(progress_message, time.clock() - progress_start_time))
-+ print("{} {:.1f} s".format(progress_message, time.process_time() - progress_start_time))
-
- progress_message = None
- progress_start_time = None
-@@ -324,12 +324,12 @@ def print_progress(msg, incremental = False):
- progress_message = msg
-
- if incremental:
-- t = time.clock()
-+ t = time.process_time()
- if (progress_update_time is not None) and (t - progress_update_time < 1):
- return
- progress_update_time = t
- else:
-- progress_start_time = time.clock()
-+ progress_start_time = time.process_time()
-
- print_eol(msg)
-