diff options
Diffstat (limited to 'media-libs/vigra')
| -rw-r--r-- | media-libs/vigra/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/vigra/files/vigra-1.11.2-python3.12-remove-imp.patch | 30 | ||||
| -rw-r--r-- | media-libs/vigra/vigra-1.11.1-r9.ebuild | 3 |
3 files changed, 34 insertions, 2 deletions
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest index e909a95cfdd1..a3c6c7517cb7 100644 --- a/media-libs/vigra/Manifest +++ b/media-libs/vigra/Manifest @@ -7,7 +7,8 @@ AUX vigra-1.11.1-openexr3.patch 1063 BLAKE2B 92a08dfdb56a006a6449ea8fa4def9d68aa AUX vigra-1.11.1-python-syntax.patch 2590 BLAKE2B 4465e2eecaddc0d8b74f62143fe9fcb15172a48b9c553f3ac6c6181aa3a0070b84624e27838f11c90ca9a87a2114c359cf81e83ce78570236ee53dd273766139 SHA512 73f9800a1af7b785f0f30b7bdaae6a03347d5b06070bf46ec8cf58ca12f546ab536d667e2b766ca293280f80e8999ea2e23dc5a8d75513f2ecd1493651542f0d AUX vigra-1.11.1-python3.7.patch 1254 BLAKE2B 24e23db29992efa86154edb402e250c782160ba5208fd7b2dd1c1eb0526b51633014cd488b5f8abd808bb2fc54b20866111281447fc45683d70a9a8bd93f0854 SHA512 9cbaacf2b6e3bd892b930c48d2371fe96b9cfecc69c8d0c982972c412f1157a73648672f42e73df1cd5ce0753c69907faaca38e35bdd54952a753af7054e17fe AUX vigra-1.11.1-sphinx.ext.pngmath.patch 1411 BLAKE2B 6ffdd2f40ac982d693a6e71a89754d453202ba70e6ae65b3b45d64add3d2cc7a9710773e94b0604cb67dadb53ea27912ccce7fe844e6264f7c989bb96149cbcc SHA512 4e0ade84985ecc9c7c45afd949671b9cbc041db486c29732b17c1b62eadfdf6e299396a18686c03c3ed4e2b3ac6d830a8e224c56e3b8d20361c2f5e5fcc14650 +AUX vigra-1.11.2-python3.12-remove-imp.patch 979 BLAKE2B 987cc4515ae9fefd75c242dbdb143da64bf7fea042b6c45ece621728171bed026df7db03696fb841789c8b306f5997405751e8d298bd37074c1390171b109429 SHA512 6cd347faa9d76b0cfd8e0854f8a229b86684af69a986e2502a6b5b3de879e09706073a38e1f47ff71276f886fcafa166bf6edb938d2f21551996ac29e2549ec5 DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3 -EBUILD vigra-1.11.1-r9.ebuild 3647 BLAKE2B c4d924f8fdb41ae4e252ccc993b554f6ad42e9425f3a68ef1d79d75b217ceb51b2919277682c8056fac2816dcd27fbe2082bb206ff9d3d4186a5f1b92e316b58 SHA512 e7bced7bdf187d6810e695e1326fe87ef5de9bcab0bc95938f40fc3f0377ddea9a1bf1c4fb7677cccba42010c8ee43d1d9500754c2525c81568c41fa4dda94fc +EBUILD vigra-1.11.1-r9.ebuild 3716 BLAKE2B 24a85c9e212dfdf590c5cfe159de4fd61fdcb8973f83db542335fe643e5c17753f0806961cff24b6346a5ab46e24409aab7268257ecf3c23812ed6fcdfa90ac6 SHA512 c8eb5f1dbaed07b6dbe633a05918829ffd3c295003c31eb7b3c1447d812b92d38c8f1fcfff837355d27c466b0c5de1e36e8a55c527b39aaa4dd882acae5df90f EBUILD vigra-9999.ebuild 3449 BLAKE2B 798a046caf7ab5519ce1bb3ade061b1e5195f8d4c2c85a9a5ea1e5de8eedeba9d328ee969f4c85741bdb0e6454d99afbb2f44dc8b84f276c0776885afcb840a5 SHA512 cc57cc547419a5a70c0c8fc8b7babb4b9366cd910b353aad7c80e22e163516699129ee6797797aab49ece85057393e7730d381b1eff09b3806fe50f00b5c8f9e MISC metadata.xml 338 BLAKE2B ce8cddf2fde724bf72d4e61054b4cbe18f40a34e02b34326d227a184d9eac1133bffc48a373f8d2bcc5c5d13de30263c3029a566db9fd6d4442f779be8e97ef7 SHA512 e4242661592f929fdba417b1fa4c176db354d82c7eeb9324a3a6102d3fb405267411e27313666fd9201af1da49de9c1319179c42017273932365113ddcd5a4a5 diff --git a/media-libs/vigra/files/vigra-1.11.2-python3.12-remove-imp.patch b/media-libs/vigra/files/vigra-1.11.2-python3.12-remove-imp.patch new file mode 100644 index 000000000000..a8094c6e7e7d --- /dev/null +++ b/media-libs/vigra/files/vigra-1.11.2-python3.12-remove-imp.patch @@ -0,0 +1,30 @@ +From 4f81ef7ed5128453c049958e496f9638d28bdf76 Mon Sep 17 00:00:00 2001 +From: David Runge <dave@sleepmap.de> +Date: Wed, 13 Mar 2024 16:24:02 +0100 +Subject: [PATCH] Use importlib.reload instead of imp.reload + +The imp module has been deprecated since Python 3.4 and is removed in +Python 3.12. +Replace its use with its replacement in the importlib module. + +Signed-off-by: David Runge <dave@sleepmap.de> +--- + vigranumpy/lib/axistags.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vigranumpy/lib/axistags.py b/vigranumpy/lib/axistags.py +index 5c564ea9..cb5dd193 100644 +--- a/vigranumpy/lib/axistags.py ++++ b/vigranumpy/lib/axistags.py +@@ -241,7 +241,7 @@ def benchmark(expression): + when getitem returns a value, the slowdown is about 3 (due to Python calls) + ''' + import timeit, axistags +- from imp import reload ++ from importlib import reload + reload(axistags) + repetitions = 100000 + t1 = timeit.Timer(expression, +-- +2.44.0 + diff --git a/media-libs/vigra/vigra-1.11.1-r9.ebuild b/media-libs/vigra/vigra-1.11.1-r9.ebuild index 1be44dbdba2c..24693904f4da 100644 --- a/media-libs/vigra/vigra-1.11.1-r9.ebuild +++ b/media-libs/vigra/vigra-1.11.1-r9.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="threads(+),xml(+)" inherit cmake flag-o-matic python-r1 @@ -58,6 +58,7 @@ PATCHES=( "${FILESDIR}/${P}-boost-python.patch" "${FILESDIR}/${P}-python3.7.patch" # bug 701208 "${FILESDIR}/${P}-gcc-10.patch" # bug 723302 + "${FILESDIR}/${PN}-1.11.2-python3.12-remove-imp.patch" # bug 929649 # TODO: upstream "${FILESDIR}/${P}-lib_suffix.patch" "${FILESDIR}/${P}-cmake-module-dir.patch" |