summaryrefslogtreecommitdiff
path: root/media-gfx/gimp
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-10-19 04:04:36 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-10-19 04:04:36 +0100
commitd895362f98ae63a6ed12cd16d3b3df95d6967f25 (patch)
treee6c8a50e31dc122b10c6dc3d9eee5d6ec6f002c0 /media-gfx/gimp
parent483d7c056fba15727fe24545f93627a1d1e1e2eb (diff)
gentoo auto-resync : 19:10:2024 - 04:04:35
Diffstat (limited to 'media-gfx/gimp')
-rw-r--r--media-gfx/gimp/Manifest9
-rw-r--r--media-gfx/gimp/files/gimp-2.10_libheif-1.18_unconditional_compat.patch23
-rw-r--r--media-gfx/gimp/gimp-2.10.34-r3.ebuild (renamed from media-gfx/gimp/gimp-2.10.34-r2.ebuild)6
-rw-r--r--media-gfx/gimp/gimp-2.10.36-r3.ebuild (renamed from media-gfx/gimp/gimp-2.10.36.ebuild)6
-rw-r--r--media-gfx/gimp/gimp-2.10.36-r4.ebuild (renamed from media-gfx/gimp/gimp-2.10.36-r2.ebuild)6
-rw-r--r--media-gfx/gimp/gimp-2.10.38-r1.ebuild (renamed from media-gfx/gimp/gimp-2.10.38.ebuild)4
6 files changed, 47 insertions, 7 deletions
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index e02dd8616d94..2ae292fac28c 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -4,14 +4,15 @@ AUX gimp-2.10.36_fix_strict-aliasing.patch 1077 BLAKE2B 02bfb2b0836a4c8e31caac44
AUX gimp-2.10_fix_configure_GCC13_implicit_function_declarations.patch 583 BLAKE2B 5c7feb3e666b496ea718d63cd3e8d415604397d0e78c95e4449812b48d7548c3b81d194c955555d7ad516c46012826475191786486140e0516c91bac56df027c SHA512 d90e6bc41bc91114ee8068e2d2cdd8c83e707b30eba876aa7b369c44d0ee125953b387a8f041dd5cb521d0eb16824bb8496a9751595c75c5a76b4cc0b3251cc3
AUX gimp-2.10_fix_musl_backtrace_backend_switch.patch 535 BLAKE2B 374433568330a4b5167e6f32bd9ecbe44e9ceb4004cce9504586b73dc31c7613d2766ae5615d74b2a51a05ff3592add2e7585b7d63eb43b219ebe6b37193edca SHA512 df0b9b357d085463ac3b791b6131dabfdd33d12e7b77f45f496379d08da1b0e8ae787b9b4b260ec221c22e3302d54b17493175db55514ec3e705782fdb80ec18
AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067
+AUX gimp-2.10_libheif-1.18_unconditional_compat.patch 820 BLAKE2B 4e75ebc639bc6f985776861de119b85dd7bde2be3a2e385cb6c61bd6e44b29d80c9ff84736a7e518b76f092c72295c1bb7e2ed58eccbd52a54b7bc4c769b12e6 SHA512 4233e2d8c50222b4700e9f7c6b2e5a41e1d5b685899f4cb0db61aa96b9eba4a0538fcc74fe9fe77265932062ea4dc94e13036d381a96338a470bf00b5a53b437
DIST gimp-2.10.34.tar.bz2 31405329 BLAKE2B 0b2d3a81abf89684bb90e2101896db3479a25c5da76738543dba8d0378e64608eee9aeb24888e15f5e347f72fa1df3e9b82aa27e503ee61d1c4d45d44fa7bddc SHA512 4802ce3758daba868570f1ac97a3f1cb41e1130fcc6376f9bf4c999441f8fd25937aa71b6f726d82d7c780f4153b11d2595bb76bc2356a42266909fbcc0bd34a
DIST gimp-2.10.36.tar.bz2 31532334 BLAKE2B d033cd1407df3399b5968b7e3f7838d288143080b516476a5dd46599b6a84ac2efca591521368cef7a1c3d9935b45ed3262fb469e1ae36ccf60a1199f5cfa44d SHA512 dbe6152ea6ff99cca59bbf2c88a64fb4ff6b529d98ace7723eadf5dfb0e10d9cbaf2de1e0d5251e9ecf9abca73da9ae1a501f229997802fd4077fb9594f4ba66
DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 58c29e3e00d873e69a5e5f4e9c3ff4d868ccfb11914570306ef12c54ca7d3ef89a62d8c71fac1f2d1f426ac615dc4caf7a7260351c00301dce2b1aa4193bab6d SHA512 343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa
DIST gimp-2.99.18.tar.xz 25418968 BLAKE2B ccb76bb5c375925d4d71505f3e1546f05ba0e20533859b1b6250a4d9054efb6bec4927a5e0c525272fa24d5a6bdf4fb7881d60a1d34b1210ee38b90e661ef707 SHA512 151ccd0322601e76ed0198b40832ab0b6c138428f2e75806dd558e29c9b3437d9226a243142bf4a86113fa5ea4f5965b99cf7cd0ab0ecb7bdfc48036de35a9c6
-EBUILD gimp-2.10.34-r2.ebuild 5876 BLAKE2B 3d72df6dac5721ac74fd47c157e13f5c399c3224ddf1fe085f0bc1fc8acd846562741a177c16f3bd43ba5260f6157ff7b3631a6002553a4f85c8943f9f2a1912 SHA512 f192aa55d07a28c496da08f12dec087d03274aa80074d8f9b31c3ee0f0f63ad63741d1a3616f57369946acf03af4cd4c53cb5650ea3fde48e2b0f1b3767a8518
-EBUILD gimp-2.10.36-r2.ebuild 5995 BLAKE2B 1f77030a4f8343470e6d4dd16fb360ca6a0ab1507d997ada0b7b972a35624f1519e61fa858a7b48e01a5b397f938005f56bde7413fe06d6d35ce01daa2c36278 SHA512 c35df760d577fe49f19acaa8de13cc8b895b2f296bf0ef1d29bbb140e1bedab026ce7c9af5770956d77fed019a58b62cad6c92ea9587134e4312db04af9d0a0a
-EBUILD gimp-2.10.36.ebuild 5848 BLAKE2B 7207523c8dc66bc891df7d655292651eb29d4103236a714cf7bc0f53562ba93cfb8fb0ac2d1f3c217f6a3e41317c20adf15750aa88b4a7f4a1ed0c09d3298823 SHA512 4a2945618f52513da641605f07cde9400d50b0b03542140a76642ccdefc9bb1c6c01318f53f611f4f562e70f106b417759f4c0d0d7b50178a0b8c4545e09186c
-EBUILD gimp-2.10.38.ebuild 6107 BLAKE2B f21eca08193517dbf24da83dbd6a36357a6dd4f38c5fe9cd3e75a3cacbbee32fea477ee2bc967b426f0e0f0dd4f01dd65f679b2554a3132943b26b10535aa154 SHA512 f6f81ad5a2bc57465a0dd926da708c0067a309bd1dd600965d73253808ddae0e38a371845757f9251914b9c32c3bbc88d6f8dc28c16957d4b887f8a4de5a5802
+EBUILD gimp-2.10.34-r3.ebuild 6033 BLAKE2B 1a0c57ea0892099726875dfcdeb8b75d56e6101ccc63cf6006a8d56acc55f9d8bf4edf93f6a4c1e5de3c89b0951fecb2c06cc72ea14fcbf25ccef438df7bb901 SHA512 bdc9794b0d82172436b3b164e27d2de8697f33b9bbb8ae907dc9034bc8c6550075093d515cef82d900302745eaae856d22ead356ff1a55c49f7a2b758c6250c0
+EBUILD gimp-2.10.36-r3.ebuild 6005 BLAKE2B 2df114a4355ef257bd4b88b34b578883b044327c78282aa6239d082f382128cd35adea29af326e2288cd9110100b0e2fccf8c4d3f581e4bb2166dfb4fc188ca6 SHA512 487f909ee8c34a12d662b673b40551b8c80e0a340ce663c8937b216b61c3536ff3b85337b99ca85b33b238c3cece26f875e7195f381941f1f0a472a9c61c32f2
+EBUILD gimp-2.10.36-r4.ebuild 6152 BLAKE2B b0013afb683f05ea7b5dfd1e9ced41bafb6f394a7330b51932dd9021e53bf173ebdc1000062c6d2f8cd256877819805cf70e302b3741f9ec960286ad193c3821 SHA512 ed75fb99737b0e239ba569985cde4981e82a87b6e16286886f50dbe136293a084c872dfef99d086a29df6d940e3154cf9f6d108d60565ae767d3a2ec1e745bff
+EBUILD gimp-2.10.38-r1.ebuild 6263 BLAKE2B 33b03f460723be7296b458ca7fe6c93d4c3fba91c30453ab67dec74415306c91ba248207c255a39459c06b042f423460a2689af76967c5d69680caa0817a78ca SHA512 1b76ead707da38695b9c34885ab464508cb91d20ddf4fa85cbd95458f8ca3fbad89dbf7fdf65adc032dfe519df04e49759b8c4dc6a5c045355f5e6020d771e5d
EBUILD gimp-2.99.18-r1.ebuild 7253 BLAKE2B 0c95a252589be3d821a73b7651e866207928cee724d16e934f585bd9080869620d1b20546672ddf229ef59bd21f54d5906da19bf2bafab76d479b05b3adfc403 SHA512 042f9a4d904d2be0bedbb6dde123a7d12f8c43b7502990e2a0c6884c287522db8e0bfeebc0fa621a54992739482db4a8b8f3675ba7f5af33999ea4c390f6bf37
EBUILD gimp-9999.ebuild 7257 BLAKE2B 8dc6eaded83b8ac8bca1fe6c2115e4dfc2cdb5aa3edb308211eb2e6a7df65caaa4120f4ac2cec9253c76cecbc292991b47dc33f1c617941e9b1035cf6e8f594f SHA512 9e53ec59a222f36c3d2a4992921c3ad28982c5d7a32e9a9ab054f7a4846cac02a47157c605d83b74dc96bfdb13bfa17363744a0bae89b2829502085f6e1e2c71
MISC metadata.xml 655 BLAKE2B f6628a2c5edb90b16db0f59af05446a3f31316f5558ece238d30c9350632713cf2db3d315c90b31229596659ec20859c17fde6b051f9ab8f8fe34d64902dad57 SHA512 712a259ae41d9052bde0761087928685b9b66a132db3f3b49121241d87728f51bf31a00541aa385bd03b57a2e2a03a0176356045dd4752485a8dca2bd61c5886
diff --git a/media-gfx/gimp/files/gimp-2.10_libheif-1.18_unconditional_compat.patch b/media-gfx/gimp/files/gimp-2.10_libheif-1.18_unconditional_compat.patch
new file mode 100644
index 000000000000..cc1e565b6c6d
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.10_libheif-1.18_unconditional_compat.patch
@@ -0,0 +1,23 @@
+Gentoo issue: https://bugs.gentoo.org/940915
+
+diff '--color=auto' -Naur a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -1843,13 +1843,13 @@
+ can_import_avif=no
+ can_export_avif=no
+ if test "x$have_libheif" = xyes; then
+- can_import_heic=`$PKG_CONFIG --variable=builtin_h265_decoder libheif`
+- can_export_heic=`$PKG_CONFIG --variable=builtin_h265_encoder libheif`
++ can_import_heic=yes
++ can_export_heic=yes
+ if test "x$can_import_heic" = xyes; then
+ MIME_TYPES="$MIME_TYPES;image/heif;image/heic"
+ fi
+- can_import_avif=`$PKG_CONFIG --variable=builtin_avif_decoder libheif`
+- can_export_avif=`$PKG_CONFIG --variable=builtin_avif_encoder libheif`
++ can_import_avif=yes
++ can_export_avif=yes
+ if test "x$can_import_avif" = xyes; then
+ MIME_TYPES="$MIME_TYPES;image/avif"
+ fi
diff --git a/media-gfx/gimp/gimp-2.10.34-r2.ebuild b/media-gfx/gimp/gimp-2.10.34-r3.ebuild
index 697f118424cd..d1af397feaf9 100644
--- a/media-gfx/gimp/gimp-2.10.34-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.10.34-r3.ebuild
@@ -94,6 +94,10 @@ src_prepare() {
sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
sed 's/-DGIMP_DISABLE_DEPRECATED/-DGIMP_protect_DISABLE_DEPRECATED/g' -i configure.ac || die #615144
+ if use heif ; then
+ has_version -d ">=media-libs/libheif-1.18.0" && eapply "${FILESDIR}/${PN}-2.10_libheif-1.18_unconditional_compat.patch" # 940915
+ fi
+
gnome2_src_prepare # calls eautoreconf
sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' -i configure || die #615144
@@ -192,7 +196,7 @@ src_install() {
# precedence on PDF documents by default
mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
- find "${D}" -name '*.la' -type f -delete || die
+ find "${ED}" -name '*.la' -type f -delete || die
# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
local gimp_app_version=$(ver_cut 1-2)
diff --git a/media-gfx/gimp/gimp-2.10.36.ebuild b/media-gfx/gimp/gimp-2.10.36-r3.ebuild
index 2407c368ab63..e0082d3fdfdb 100644
--- a/media-gfx/gimp/gimp-2.10.36.ebuild
+++ b/media-gfx/gimp/gimp-2.10.36-r3.ebuild
@@ -93,6 +93,10 @@ src_prepare() {
sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
sed 's/-DGIMP_DISABLE_DEPRECATED/-DGIMP_protect_DISABLE_DEPRECATED/g' -i configure.ac || die #615144
+ if use heif ; then
+ has_version -d ">=media-libs/libheif-1.18.0" && eapply "${FILESDIR}/${PN}-2.10_libheif-1.18_unconditional_compat.patch" # 940915
+ fi
+
gnome2_src_prepare # calls eautoreconf
sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' -i configure || die #615144
@@ -191,7 +195,7 @@ src_install() {
# precedence on PDF documents by default
mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
- find "${D}" -name '*.la' -type f -delete || die
+ find "${ED}" -name '*.la' -type f -delete || die
# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
local gimp_app_version=$(ver_cut 1-2)
diff --git a/media-gfx/gimp/gimp-2.10.36-r2.ebuild b/media-gfx/gimp/gimp-2.10.36-r4.ebuild
index 3f4740a9243d..1acf5d818486 100644
--- a/media-gfx/gimp/gimp-2.10.36-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.10.36-r4.ebuild
@@ -96,6 +96,10 @@ src_prepare() {
sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
sed 's/-DGIMP_DISABLE_DEPRECATED/-DGIMP_protect_DISABLE_DEPRECATED/g' -i configure.ac || die #615144
+ if use heif ; then
+ has_version -d ">=media-libs/libheif-1.18.0" && eapply "${FILESDIR}/${PN}-2.10_libheif-1.18_unconditional_compat.patch" # 940915
+ fi
+
gnome2_src_prepare # calls eautoreconf
sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' -i configure || die #615144
@@ -194,7 +198,7 @@ src_install() {
# precedence on PDF documents by default
mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
- find "${D}" -name '*.la' -type f -delete || die
+ find "${ED}" -name '*.la' -type f -delete || die
# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
local gimp_app_version=$(ver_cut 1-2)
diff --git a/media-gfx/gimp/gimp-2.10.38.ebuild b/media-gfx/gimp/gimp-2.10.38-r1.ebuild
index 013da52ecc68..89d2bf00caac 100644
--- a/media-gfx/gimp/gimp-2.10.38.ebuild
+++ b/media-gfx/gimp/gimp-2.10.38-r1.ebuild
@@ -105,6 +105,10 @@ src_prepare() {
sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
sed 's/-DGIMP_DISABLE_DEPRECATED/-DGIMP_protect_DISABLE_DEPRECATED/g' -i configure.ac || die #615144
+ if use heif ; then
+ has_version -d ">=media-libs/libheif-1.18.0" && eapply "${FILESDIR}/${PN}-2.10_libheif-1.18_unconditional_compat.patch" # 940915
+ fi
+
gnome2_src_prepare # calls eautoreconf
sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' -i configure || die #615144
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-29 06:02:29 +0000