gentoo auto-resync : 25:09:2022 - 05:33:00

3 files changed, 82 insertions, 1 deletions

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 43ad184fa073..6b7459fbbee8 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,9 +1,10 @@
 AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067
+AUX gimp-2.99.12_fix_libheif-1.13_build.patch 2309 BLAKE2B 32d4edf87f20f9fc0b7839352adbae6006dc021b3e3e6541fc48f1f44496780e39870da41642e0abe2551302d942a8a1382a539180437be4b37e78c1c0b55c48 SHA512 1f7b8a0479603376dd356bb156354d31b113513213f39e11e65fa75b99eac52375d6c32043a7bb56a21e7e1e6bdf9371099bfe3f1eb41f3528fdd1f81bec4b2a
 DIST gimp-2.10.32.tar.bz2 31397425 BLAKE2B 3887e2e29ebfd5dcfa671a9d1549180d11bd5e3656c6854ff4130c6c6e6ca9479df075981e09b9b6b97e47dd1fcd939fea726ca09c08c040ebd1998d80e61771 SHA512 aa999c1ec388154965f84d995a9b5517e9c38608d03a0d0bb6ec9fa55de946f9da106e7d6f7c02052b61d2b6806e7a378e786539f0de5b5ffaa2fcd1bbd9c7f1
 DIST gimp-2.99.10.tar.bz2 26782056 BLAKE2B 103e7fa2d04b1989e59fb03964a122891831d122cdc6dd3b7637f06cff28310e12d9a79678ac477b56728f4ceb53292001c53f026e94be417db76dd7e14740ab SHA512 898c1e1ffd2270ccc965db9a8263e04d95455535361b47f92256b4028808e1e91eb1924cf6cef7ff9e988194ebbc67535bd9cfbf0243159824e58551a2b91ba3
 DIST gimp-2.99.12.tar.xz 24282140 BLAKE2B 2174e1d50941071ea6e96f0e3f315484867aa90ae06cbcdc7b30914f959c1a15a7e7ea34ba22ce09a973b29acf1277e3a4519d744140c3fcabc59f31dc3ebf43 SHA512 4b87dd40eccc39c560e69a90b4042b1b19506e9ae52e5079ace442325b54bf7c47477662197da8f7655c12aad16e08bae60d11cf269684b8aa291e978d246917
 EBUILD gimp-2.10.32.ebuild 5649 BLAKE2B ed0b99850166d7d0a464d16aa74faa18aea2a92e5dab1ae8680bf813e9eed1323a2fb042c08b3a6fec416fa9e5cc83c14591e785931ecf7ffaf5ab3a404cc271 SHA512 ed4a2a0a1f4c3eb0188d97cc8527996cfe5c18279cbbe7577c14435229261aeb7e77d7ec87b4295fdb9e298bb7e91d767f5bc5048ffaa9e6cb21d0b95bc4f5fd
 EBUILD gimp-2.99.10-r1.ebuild 6613 BLAKE2B 2883d26916fa9a54d5037c7524f141b47faeba5816dcf086e549f0c5eadcd607e591c655bce0ae8322ba9d69f14f20a7f816ad732fc7cc0ba063715e3286e1d0 SHA512 17e79ffad687a53ce0da2280c628b2309245aff2935997a6817e2297435291992216b934ece01bdbef69633744740849faf1115e6230e92053ef6c19621835f9
-EBUILD gimp-2.99.12.ebuild 6801 BLAKE2B 8e3539c9d455cf4d440aacfd5917a560c31c84158087326f69d84017b758945f36933ffa07ad7a40701f6462086043eb3f391f47d71846c752dde391708da2c3 SHA512 a2371421e9c4aac2b44ea03eefeba2e8f53dd808491d5b7d862aad2e96db1bb52af51a28de6e27532622a6a3744c9b566f18a89a5ef3967a343b60841fda7694
+EBUILD gimp-2.99.12.ebuild 6862 BLAKE2B 2cd043793acc11e23526a1a2f68b808c664472738e91e9d08a25d6812ac8e4deb0854941a936c8da9c769628ca352cc2d31e0e3f76afab35fba02b28949737b9 SHA512 cc8ce92d51e1340ae595eae143c26720eadfba0381d334fa8bf9d6d2bbd024e019cdca3c4b1be04121c0b32afec4c3af37911353c8c037bf7cf9b3b5ff7cd320
 EBUILD gimp-9999.ebuild 6714 BLAKE2B 027a7b3582dc93f251c6efe6150990e5a13ed4173f6923717052b9fbd28494d031af1cabb7a8bd3d6cd2b26dd403dd8d4cf1ba2ca81491017c83903b667cd54b SHA512 dda911c6d56ec16cd67387beb4199a47d9d9e7d081afb7b6cf44b2d92280f5a2e57be1dd1ad91a74a3b984ce7eb98e86dd476a8ae074ef2fb629e9d6de582536
 MISC metadata.xml 646 BLAKE2B 167cb95fb064b2470cdbb6b625f7d6e24aacac57081a1177fdc9e878b4cf1a20c6b86a7e621530b45bc7db5f07e173a47829fd5be9dde6f9b9fcf54a39f24236 SHA512 9f6501b6a14f860be69e29baaace61fe4c964413b8c43882bf06144406333f4d69d6adaa315503dc83fbdb467cd47e3d752ed6abe4b78bd5cb32fb9f3be1ac1d
diff --git a/media-gfx/gimp/files/gimp-2.99.12_fix_libheif-1.13_build.patch b/media-gfx/gimp/files/gimp-2.99.12_fix_libheif-1.13_build.patch
new file mode 100644
index 000000000000..672a9ef7217e
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.99.12_fix_libheif-1.13_build.patch
@@ -0,0 +1,78 @@
+Upstream issue: "GIMP fails to build with libheif >= 1.13.0"
+https://gitlab.gnome.org/GNOME/gimp/-/issues/8570
+
+From a61299ddb184babca015a846c72bf3e1a57faf2a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= <dnovomesky@gmail.com>
+Date: Sat, 3 Sep 2022 13:19:33 +0200
+Subject: [PATCH] plug-ins: fix builing with libheif 1.13.0+
+
+---
+ plug-ins/common/file-heif.c | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/plug-ins/common/file-heif.c b/plug-ins/common/file-heif.c
+index 76bc41f44d..36899bcf5f 100644
+--- a/plug-ins/common/file-heif.c
++++ b/plug-ins/common/file-heif.c
+@@ -56,24 +56,24 @@ typedef enum _HeifpluginExportFormat
+   HEIFPLUGIN_EXPORT_FORMAT_YUV420 = 3
+ } HeifpluginExportFormat;
+ 
+-typedef struct _Heif      Heif;
+-typedef struct _HeifClass HeifClass;
++typedef struct _GimpHeif      GimpHeif;
++typedef struct _GimpHeifClass GimpHeifClass;
+ 
+-struct _Heif
++struct _GimpHeif
+ {
+   GimpPlugIn      parent_instance;
+ };
+ 
+-struct _HeifClass
++struct _GimpHeifClass
+ {
+   GimpPlugInClass parent_class;
+ };
+ 
+ 
+-#define HEIF_TYPE  (heif_get_type ())
+-#define HEIF (obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), HEIF_TYPE, Heif))
++#define GIMP_HEIF_TYPE  (gimp_heif_get_type ())
++#define GIMP_HEIF (obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_HEIF_TYPE, GimpHeif))
+ 
+-GType                   heif_get_type         (void) G_GNUC_CONST;
++GType                   gimp_heif_get_type    (void) G_GNUC_CONST;
+ 
+ static GList          * heif_init_procedures  (GimpPlugIn           *plug_in);
+ static GimpProcedure  * heif_create_procedure (GimpPlugIn           *plug_in,
+@@ -123,14 +123,14 @@ static gboolean         save_dialog           (GimpProcedure        *procedure,
+                                                GimpImage            *image);
+ 
+ 
+-G_DEFINE_TYPE (Heif, heif, GIMP_TYPE_PLUG_IN)
++G_DEFINE_TYPE (GimpHeif, gimp_heif, GIMP_TYPE_PLUG_IN)
+ 
+-GIMP_MAIN (HEIF_TYPE)
++GIMP_MAIN (GIMP_HEIF_TYPE)
+ DEFINE_STD_SET_I18N
+ 
+ 
+ static void
+-heif_class_init (HeifClass *klass)
++gimp_heif_class_init (GimpHeifClass *klass)
+ {
+   GimpPlugInClass *plug_in_class = GIMP_PLUG_IN_CLASS (klass);
+ 
+@@ -140,7 +140,7 @@ heif_class_init (HeifClass *klass)
+ }
+ 
+ static void
+-heif_init (Heif *heif)
++gimp_heif_init (GimpHeif *heif)
+ {
+ }
+ 
+-- 
+GitLab
+
diff --git a/media-gfx/gimp/gimp-2.99.12.ebuild b/media-gfx/gimp/gimp-2.99.12.ebuild
index 5a97b3f4724a..fc46f29d2a4a 100644
--- a/media-gfx/gimp/gimp-2.99.12.ebuild
+++ b/media-gfx/gimp/gimp-2.99.12.ebuild
@@ -111,6 +111,8 @@ BDEPEND="
 
 DOCS=( "AUTHORS" "devel-docs/CODING_STYLE.md" "devel-docs/HACKING.md" "NEWS" "README" "README.i18n" )
 
+PATCHES=( "${FILESDIR}/${P}_fix_libheif-1.13_build.patch" )
+
 pkg_setup() {
 	use lua && lua-single_pkg_setup