* [gentoo-commits] repo/gentoo:master commit in: games-util/nml/files/, games-util/nml/
@ 2015-10-21 2:41 Michael Sterrett
0 siblings, 0 replies; 4+ messages in thread
From: Michael Sterrett @ 2015-10-21 2:41 UTC (permalink / raw
To: gentoo-commits
commit: ad9c41ce7cbecfd1ae76c7e316f3125860a01f56
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 17:14:14 2015 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 02:41:25 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad9c41ce
add patch from Lars Wendler via bug #563560 to work correctly with the latest version of pillow
Package-Manager: portage-2.2.20.1
games-util/nml/files/nml-0.4.2-pillow3.patch | 31 ++++++++++++++++++++++++++++
games-util/nml/nml-0.4.2.ebuild | 1 +
2 files changed, 32 insertions(+)
diff --git a/games-util/nml/files/nml-0.4.2-pillow3.patch b/games-util/nml/files/nml-0.4.2-pillow3.patch
new file mode 100644
index 0000000..914cef2
--- /dev/null
+++ b/games-util/nml/files/nml-0.4.2-pillow3.patch
@@ -0,0 +1,31 @@
+--- nml-0.4.2/nml/lz77.py
++++ nml-0.4.2/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')
+--- nml-0.4.2/nml/spriteencoder.py
++++ nml-0.4.2/nml/spriteencoder.py
+@@ -276,7 +276,7 @@
+ pos = generic.build_position(sprite_info.poslist)
+ raise generic.ScriptError("Read beyond bounds of image file '{}'".format(filename_32bpp.value), pos)
+ sprite = im.crop((x, y, x + size_x, y + size_y))
+- rgb_sprite_data = sprite.tostring()
++ rgb_sprite_data = sprite.tobytes()
+
+ if (info_byte & INFO_ALPHA) != 0:
+ # Check for half-transparent pixels (not valid for ground sprites)
+@@ -296,7 +296,7 @@
+ raise generic.ScriptError("Read beyond bounds of image file '{}'".format(filename_8bpp.value), pos)
+ mask_sprite = mask_im.crop((mask_x, mask_y, mask_x + size_x, mask_y + size_y))
+
+- mask_sprite_data = self.palconvert(mask_sprite.tostring(), im_mask_pal)
++ mask_sprite_data = self.palconvert(mask_sprite.tobytes(), im_mask_pal)
+
+ # Check for white pixels; those that cause "artefacts" when shading
+ pixel_stats['white'] = sum(p == 255 for p in mask_sprite_data)
diff --git a/games-util/nml/nml-0.4.2.ebuild b/games-util/nml/nml-0.4.2.ebuild
index c98bdab..8ccbac2 100644
--- a/games-util/nml/nml-0.4.2.ebuild
+++ b/games-util/nml/nml-0.4.2.ebuild
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
DOCS=( docs/{changelog,readme}.txt )
+PATCHES=( "${FILESDIR}"/${P}-pillow3.patch )
src_install() {
distutils-r1_src_install
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-util/nml/files/, games-util/nml/
@ 2016-04-05 1:21 Michael Sterrett
0 siblings, 0 replies; 4+ messages in thread
From: Michael Sterrett @ 2016-04-05 1:21 UTC (permalink / raw
To: gentoo-commits
commit: 591c73185e078aeff56c0ad0c906421ede665e1c
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 5 01:21:52 2016 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Tue Apr 5 01:21:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=591c7318
games-util/nml: version bump
Package-Manager: portage-2.2.26
games-util/nml/Manifest | 1 +
games-util/nml/files/nml-0.4.4-pillow3.patch | 11 +++++++++++
games-util/nml/nml-0.4.4.ebuild | 28 ++++++++++++++++++++++++++++
3 files changed, 40 insertions(+)
diff --git a/games-util/nml/Manifest b/games-util/nml/Manifest
index d546ef6..d099670 100644
--- a/games-util/nml/Manifest
+++ b/games-util/nml/Manifest
@@ -1 +1,2 @@
DIST nml-0.4.2.tar.gz 377834 SHA256 eb4c2107682f14c58c5fbffc5f26c206fd3c8fc6972a3e28478e3e7f2bb773d7 SHA512 0d9c9f1de91cd91962aeacc0e5c59b351a2e4729f97d7fc2eb49f6d6487c1e1a7a98fb8f793689520c6e828fd6cdf39e952f13d0dc2f198234e3e6ad47fe6d8b WHIRLPOOL d4d994125c04c53528ae4cf9e3ca4643d2ef1e71636453404196b200a275649b2846683406bbae6f76e98573ea92962c23e295adeba3f6086026c0b8fd676c75
+DIST nml-0.4.4.tar.gz 377998 SHA256 af66146b5cf7e0a06a80ae2882d6899faf4ed27b41ce4c8aca934b8f8ba66972 SHA512 fd7b8d7abfc8b5ea694eedf00bbc4069a82de942178a58ec05e9d3efe7c8663103ffb6b98f7614ce165eb7cba42cb4c7589f77fb67dd95eb6293f62b3179c7b0 WHIRLPOOL cb1175430e97ba56b5dff85447c7be8dde9e25e92f10d98f0a79f34c5fd55e83209d6ff4e82d646f644f5ad5ef1ecbeef7196d3f89a6e1dc001d04b284cb38f6
diff --git a/games-util/nml/files/nml-0.4.4-pillow3.patch b/games-util/nml/files/nml-0.4.4-pillow3.patch
new file mode 100644
index 0000000..e55d989
--- /dev/null
+++ b/games-util/nml/files/nml-0.4.4-pillow3.patch
@@ -0,0 +1,11 @@
+--- 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/nml-0.4.4.ebuild b/games-util/nml/nml-0.4.4.ebuild
new file mode 100644
index 0000000..56979b7
--- /dev/null
+++ b/games-util/nml/nml-0.4.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{3_3,3_4} )
+inherit distutils-r1
+
+DESCRIPTION="Compiler of NML files into grf/nfo files"
+HOMEPAGE="http://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 ~ppc ~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}"/${P}-pillow3.patch )
+
+src_install() {
+ distutils-r1_src_install
+ doman docs/nmlc.1
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-util/nml/files/, games-util/nml/
@ 2020-11-26 21:16 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2020-11-26 21:16 UTC (permalink / raw
To: gentoo-commits
commit: 78febd1302d1fb8d6d71f409ba20d96c2b5678f3
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 26 20:03:44 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 21:16:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78febd13
games-util/nml: drop old version
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
games-util/nml/Manifest | 2 --
games-util/nml/files/nml-0.4.4-pillow3.patch | 11 -------
games-util/nml/files/nml-0.4.5-pillow6.patch | 31 --------------------
games-util/nml/files/nml-0.4.5-pillow7.patch | 41 ---------------------------
games-util/nml/files/nml-0.4.5-python38.patch | 37 ------------------------
games-util/nml/nml-0.4.5-r3.ebuild | 41 ---------------------------
games-util/nml/nml-0.5.2.ebuild | 32 ---------------------
7 files changed, 195 deletions(-)
diff --git a/games-util/nml/Manifest b/games-util/nml/Manifest
index 71706ec650e..ceca6269053 100644
--- a/games-util/nml/Manifest
+++ b/games-util/nml/Manifest
@@ -1,3 +1 @@
-DIST nml-0.4.5.tar.gz 378578 BLAKE2B 1283cdcabd4cbaf12dda926b89c88a3942e9e4469879812abe372facd2c41ff20af0df792bbdadf71d9d3ad8d72e98e293fd903c880e77d3e4ee8a1b73e36ca9 SHA512 64b2f46a1c2e37fce8f51231094e30334f368b0db39c6a3977a144a798d8034d1abbe7c14af3921eb81f4b7caa193e7e53ccb9e27acd113e0407926b109ca952
-DIST nml-0.5.2.tar.gz 531460 BLAKE2B 02f4e4a190bca0e46380c9075b769ea1925f3eaf655a2f09b8367890d4b9d0494dda9246f144bb735ef27906fcf22a198530fecc5c92e77f1b72f8a73832625e SHA512 edcada26ad011533065f3096b708b343ed6af742968606d187f01298e09f945904e2eba96fc8b37d88e243e7fd4bc6efdc8be614acbec199b06778ee32b5fc3b
DIST nml-0.5.3.tar.gz 532842 BLAKE2B dbd775ca8b066fd60cd8fa1a377c95d337a61ba353fa527bb45f929d13b89a41c65156cff22f8ded6526444fdc74c82987da045e6355b411a30c0593a3a39edb SHA512 518be737273af6bfff23f223d07328312c4b7e070a334d4b0ecffc303aab8257ad8b26ff3b74e992db263d446fedc3e0080573b6670f0061ca78bb933c959c6a
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 e55d989fbc1..00000000000
--- 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 5b04aef0d95..00000000000
--- 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 a69e40ae3e1..00000000000
--- 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 526a2e19f26..00000000000
--- 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)
-
diff --git a/games-util/nml/nml-0.4.5-r3.ebuild b/games-util/nml/nml-0.4.5-r3.ebuild
deleted file mode 100644
index 3588cfc60e8..00000000000
--- a/games-util/nml/nml-0.4.5-r3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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
- "${FILESDIR}"/${PN}-0.4.5-python38.patch
-)
-
-src_install() {
- distutils-r1_src_install
-
- doman docs/nmlc.1
-}
diff --git a/games-util/nml/nml-0.5.2.ebuild b/games-util/nml/nml-0.5.2.ebuild
deleted file mode 100644
index e7fcb7a0ff9..00000000000
--- a/games-util/nml/nml-0.5.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Compiler of NML files into GRF/NFO files"
-HOMEPAGE="https://github.com/OpenTTD/nml"
-SRC_URI="https://github.com/OpenTTD/${PN}/releases/download/${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}"
-
-DOCS=( "README.md" "docs/changelog.txt" )
-
-src_install() {
- distutils-r1_src_install
-
- doman docs/nmlc.1
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-util/nml/files/, games-util/nml/
@ 2024-10-05 0:54 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-10-05 0:54 UTC (permalink / raw
To: gentoo-commits
commit: fa85237976edd9714cd6758bcedb124d9c700241
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 5 00:53:32 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 5 00:53:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa852379
games-util/nml: enable py3.13
Backport an upstream patch to fix py3.13 compat & enable it.
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-util/nml/files/nml-0.7.5-regex-py313.patch | 20 ++++++++++++++++++++
games-util/nml/nml-0.7.5.ebuild | 7 +++++--
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/games-util/nml/files/nml-0.7.5-regex-py313.patch b/games-util/nml/files/nml-0.7.5-regex-py313.patch
new file mode 100644
index 000000000000..bef0c1002e21
--- /dev/null
+++ b/games-util/nml/files/nml-0.7.5-regex-py313.patch
@@ -0,0 +1,20 @@
+https://github.com/OpenTTD/nml/issues/340
+https://github.com/OpenTTD/nml/pull/341
+
+From 0bebfe612d489a20fa5a71b06963ea3ee80379d0 Mon Sep 17 00:00:00 2001
+From: glx22 <glx@openttd.org>
+Date: Sat, 5 Oct 2024 01:00:32 +0200
+Subject: [PATCH] Fix #340: Always use raw strings for token regex
+
+--- a/nml/tokens.py
++++ b/nml/tokens.py
+@@ -195,7 +195,7 @@ def t_ignore_comment(self, t):
+ self.increment_lines(t.value.count("\n"))
+
+ def t_ignore_whitespace(self, t):
+- "[ \t\r]+"
++ r"[ \t\r]+"
+ pass
+
+ def t_line_directive1(self, t):
+
diff --git a/games-util/nml/nml-0.7.5.ebuild b/games-util/nml/nml-0.7.5.ebuild
index 26d49964053c..6754dea0b4c2 100644
--- a/games-util/nml/nml-0.7.5.ebuild
+++ b/games-util/nml/nml-0.7.5.ebuild
@@ -6,8 +6,7 @@ EAPI=8
DISTUTILS_EXT=1
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_PEP517=setuptools
-# py3.13: https://github.com/OpenTTD/nml/issues/340
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit distutils-r1
DESCRIPTION="Compiler of NML files into GRF/NFO files"
@@ -25,6 +24,10 @@ RDEPEND="
')
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.7.5-regex-py313.patch
+)
+
src_prepare() {
default
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-10-05 0:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-21 2:41 [gentoo-commits] repo/gentoo:master commit in: games-util/nml/files/, games-util/nml/ Michael Sterrett
-- strict thread matches above, loose matches on Subject: below --
2016-04-05 1:21 Michael Sterrett
2020-11-26 21:16 Conrad Kostecki
2024-10-05 0:54 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox