diff options
Diffstat (limited to 'games-util')
| -rw-r--r-- | games-util/Manifest.gz | bin | 7891 -> 7897 bytes | |||
| -rw-r--r-- | games-util/nml/Manifest | 3 | ||||
| -rw-r--r-- | games-util/nml/files/nml-0.7.5-regex-py313.patch | 20 | ||||
| -rw-r--r-- | games-util/nml/nml-0.7.5.ebuild | 6 |
4 files changed, 27 insertions, 2 deletions
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz Binary files differindex 73c03aa167fe..31545e6e4b26 100644 --- a/games-util/Manifest.gz +++ b/games-util/Manifest.gz diff --git a/games-util/nml/Manifest b/games-util/nml/Manifest index f3c860ceb153..e2c0342066ad 100644 --- a/games-util/nml/Manifest +++ b/games-util/nml/Manifest @@ -1,7 +1,8 @@ +AUX nml-0.7.5-regex-py313.patch 566 BLAKE2B fa515bd2ac16b10ed10b61453fd1ee1e38f741314c4c3db82adc7656fbf57da9d5a01624313c12a016026ab9153d27e5b1beabbd185473e94f4db8e5374f0d3e SHA512 64a2b0bc7e4a057f896b41474a34d3f6df8d36abca6eaf20458cd46a14a0e48ef20d20881236fd358c618fbefeca1932d530f6229265b0e379d0c3238cee29d3 DIST nml-0.7.1.tar.gz 562101 BLAKE2B 3c29bde63048ea276d868df8aa3e13c4f1d3949c1e2c4a973e6f5f5bff7a6e57ce5c56d6605f44d91602209967cbe732f7f9031b471de3104d6c04a41582541f SHA512 a123680f89243f29ad88f2c0bc50fe7c801bd70d7cd49d71d3e5d199b1f4042e4143b71340aea3c47d938f838647016cebc0b56e39ede627497139755c9b829e DIST nml-0.7.4.tar.gz 569348 BLAKE2B 620f6100627d7c1cd67bbf481c96abb8be4574e0ec70cf529502980c9d8aca3660f1469fbdce99d5736d21287053b6c199a5a390f56f3704d7ceb16e6ba6582e SHA512 78a0961db3a56684fbc999f69bc5e02b9f002ba7b7a2afd39c7d4c9695b3306339ee55c4b9d711d85ca7c4c0e4d53abc71c9e0720904d44a0c388a793a28fc4b DIST nml-0.7.5.tar.gz 578976 BLAKE2B 630afc4b532a76ff7dea84b231636cbf8fa50197e43c11eaa1fdaa80b2acadb61d35dc07119f57417d7cdae88d39d516f52bac49aa56fa3177e287ab11bd07b2 SHA512 6c92ce5124e2c4bc641ff8c14a2e88e2576ef06dccce8fb5ffee1b1dbcee2b9640fa51410bfb7aa6b800b00274020b38161617aa41712d4d358612493ea8fe26 EBUILD nml-0.7.1.ebuild 729 BLAKE2B 37347f335b5e23c6be93eab68aba73b23f2c97615f14e1660af38818fa96f335edf232058e9a3b0d8e60fea853f9911738daff4015f294b8d7bbf2081ba178d4 SHA512 806b43f83de1c0623baf34031dcb76956f874e4e3f3a9d700e566dba484251640c51ff6c3cf952607c9e5daf6365f3874dd2487badcd37040e4d3206ca670f70 EBUILD nml-0.7.4.ebuild 921 BLAKE2B d2203e5c78bf8d31fa16bea92aab496a4dfbbaed7401a57371e624fc63646720f422423325ca027390974a11fdb819b5a792de39d3e7bf2937f848bd04db185d SHA512 b4a678194f78f0de4fe95a2da36c6c7a16cb542ea805baacb8f4b96cd9ec4250d137dd8ba6609794b83428c3b2dfbaa6ccedd4ab32c8e42efd2fd261e5774a12 -EBUILD nml-0.7.5.ebuild 921 BLAKE2B ee38069e5bf48954f5a8716285ce49df04200636844df9205f13a0206176577f6526c5cbe06bcb1766b52fad0a50eca74f2f07914c7870c870d1ac6443a84d53 SHA512 06db057a95fba444538d896a16bc229bbc83cd1a9b510fae3c7a9a41047f5700913920ec9ec00d104e3d7bb14e19477c28efca41be5f3f9755cb1bc00ce32f7b +EBUILD nml-0.7.5.ebuild 980 BLAKE2B e411af31055111c4583273997857bb12f14da298cc1904ca5116dad471dea83228835eed0c2eededd2a567dc21962451faa2498fd4a7b601a4cc58d2e9cf1397 SHA512 3850e277e8ef62e2b8291182b3665b2a8f5ccdf4d89da32e4c6cd3298363119611a0deb09a0edf11a358c225aa652f41bcfc294bee74a6188720137221f71615 MISC metadata.xml 330 BLAKE2B 81477cebc8e9113ac32bce37688a891827538b302fc8ffd29f551440d488b8b55e7ec0f0e45a2476f3e156ebb02a80f44c413a44a9a03de82c0ab994831cb57e SHA512 bc2460a21cc905ebbec7ad13f803bb239616b4da8100c0c1bd939f7be3d1efe9560010af271e382d08caa632382547220aa249f40212c2966ffce5dc7713d632 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 44f64b61cec4..6754dea0b4c2 100644 --- a/games-util/nml/nml-0.7.5.ebuild +++ b/games-util/nml/nml-0.7.5.ebuild @@ -6,7 +6,7 @@ EAPI=8 DISTUTILS_EXT=1 DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit distutils-r1 DESCRIPTION="Compiler of NML files into GRF/NFO files" @@ -24,6 +24,10 @@ RDEPEND=" ') " +PATCHES=( + "${FILESDIR}"/${PN}-0.7.5-regex-py313.patch +) + src_prepare() { default } |