* [gentoo-commits] repo/gentoo:master commit in: games-util/nml/, games-util/nml/files/
@ 2019-04-18 21:36 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2019-04-18 21:36 UTC (permalink / raw
To: gentoo-commits
commit: 1969f40f80d6e01ece691d69403762d4a6de3963
Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Thu Apr 18 20:32:35 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 21:36:24 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1969f40f
games-util/nml: add patch for >=dev-python/pillow-6.0.0
Patch submitted upstream: https://github.com/OpenTTD/nml/pull/29
Package-Manager: Portage-2.3.63, Repoman-2.3.12
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/11734
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-util/nml/files/nml-0.4.5-pillow6.patch | 31 ++++++++++++++++++++++++++++
games-util/nml/nml-0.4.5-r1.ebuild | 30 +++++++++++++++++++++++++++
2 files changed, 61 insertions(+)
diff --git a/games-util/nml/files/nml-0.4.5-pillow6.patch b/games-util/nml/files/nml-0.4.5-pillow6.patch
new file mode 100644
index 00000000000..5b04aef0d95
--- /dev/null
+++ b/games-util/nml/files/nml-0.4.5-pillow6.patch
@@ -0,0 +1,31 @@
+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/nml-0.4.5-r1.ebuild b/games-util/nml/nml-0.4.5-r1.ebuild
new file mode 100644
index 00000000000..6f8e7f6ea8d
--- /dev/null
+++ b/games-util/nml/nml-0.4.5-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Compiler of NML files into grf/nfo files"
+HOMEPAGE="https://dev.openttdcoop.org/projects/nml"
+SRC_URI="http://bundles.openttdcoop.org/nml/releases/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="dev-python/pillow[zlib,${PYTHON_USEDEP}]
+ dev-python/ply[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( docs/{changelog,readme}.txt )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.4.4-pillow3.patch
+ "${FILESDIR}"/${PN}-0.4.5-pillow6.patch
+)
+
+src_install() {
+ distutils-r1_src_install
+ doman docs/nmlc.1
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-util/nml/, games-util/nml/files/
@ 2020-01-14 18:48 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2020-01-14 18:48 UTC (permalink / raw
To: gentoo-commits
commit: 8019d4039a201fc897f9c6938a4e0bae78fee8fd
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 14 18:45:11 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 18:46:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8019d403
games-util/nml: add support for >=dev-python/pillow-7.0.0
Also added support for python3.8 and changed SRC_URI to https.
Closes: https://bugs.gentoo.org/705428
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
games-util/nml/files/nml-0.4.5-pillow7.patch | 41 ++++++++++++++++++++++++++++
games-util/nml/nml-0.4.5-r2.ebuild | 40 +++++++++++++++++++++++++++
2 files changed, 81 insertions(+)
diff --git a/games-util/nml/files/nml-0.4.5-pillow7.patch b/games-util/nml/files/nml-0.4.5-pillow7.patch
new file mode 100644
index 00000000000..a69e40ae3e1
--- /dev/null
+++ b/games-util/nml/files/nml-0.4.5-pillow7.patch
@@ -0,0 +1,41 @@
+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/nml-0.4.5-r2.ebuild b/games-util/nml/nml-0.4.5-r2.ebuild
new file mode 100644
index 00000000000..7627ddc1e89
--- /dev/null
+++ b/games-util/nml/nml-0.4.5-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Compiler of NML files into GRF/NFO files"
+HOMEPAGE="https://dev.openttdcoop.org/projects/nml"
+SRC_URI="https://bundles.openttdcoop.org/nml/releases/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+ dev-python/pillow[zlib,${PYTHON_USEDEP}]
+ dev-python/ply[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+ ${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+DOCS=( docs/{changelog,readme}.txt )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.4.4-pillow3.patch
+ "${FILESDIR}"/${PN}-0.4.5-pillow6.patch
+ "${FILESDIR}"/${PN}-0.4.5-pillow7.patch
+)
+
+src_install() {
+ distutils-r1_src_install
+
+ doman docs/nmlc.1
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-util/nml/, games-util/nml/files/
@ 2020-08-19 15:15 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2020-08-19 15:15 UTC (permalink / raw
To: gentoo-commits
commit: 51fc11f34550b7a4002669bfca90c52aa9541249
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 15:11:28 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 15:14:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51fc11f3
games-util/nml: fix python3.8 support
Bug: https://bugs.gentoo.org/737952
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
games-util/nml/files/nml-0.4.5-python38.patch | 37 +++++++++++++++++++++++++++
games-util/nml/nml-0.4.5-r2.ebuild | 1 +
2 files changed, 38 insertions(+)
diff --git a/games-util/nml/files/nml-0.4.5-python38.patch b/games-util/nml/files/nml-0.4.5-python38.patch
new file mode 100644
index 00000000000..526a2e19f26
--- /dev/null
+++ b/games-util/nml/files/nml-0.4.5-python38.patch
@@ -0,0 +1,37 @@
+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)
+
diff --git a/games-util/nml/nml-0.4.5-r2.ebuild b/games-util/nml/nml-0.4.5-r2.ebuild
index 7627ddc1e89..3588cfc60e8 100644
--- a/games-util/nml/nml-0.4.5-r2.ebuild
+++ b/games-util/nml/nml-0.4.5-r2.ebuild
@@ -31,6 +31,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.4.4-pillow3.patch
"${FILESDIR}"/${PN}-0.4.5-pillow6.patch
"${FILESDIR}"/${PN}-0.4.5-pillow7.patch
+ "${FILESDIR}"/${PN}-0.4.5-python38.patch
)
src_install() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-19 15:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-14 18:48 [gentoo-commits] repo/gentoo:master commit in: games-util/nml/, games-util/nml/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2020-08-19 15:15 Conrad Kostecki
2019-04-18 21:36 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox