commit:     4d2474359804ef26f5919c778a98d98639e837cf
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  4 20:55:56 2014 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Tue Nov  4 20:55:56 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=4d247435

fix working with newer gimp versions, bug #527836

Package-Manager: portage-2.2.14
Manifest-Sign-Key: 072AD062

---
 media-gfx/ufraw/Manifest                    |  9 +++++----
 media-gfx/ufraw/files/ufraw-0.20-gimp.patch | 24 ++++++++++++++++++++++++
 media-gfx/ufraw/ufraw-0.20.ebuild           |  3 ++-
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index 2ed4685..23e7799 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -3,17 +3,18 @@ Hash: SHA256
 
 AUX ufraw-0.17-cfitsio-automagic.patch 933 SHA256 
d489abaa6da90a46f4b3b23e2e5400c1eeb7d2e5532835df4d5ad244167e7d18 SHA512 
84aadb7dc41927a26ac37a801e136628380e79f032f87a925e737ec76c349c96c410750234f4870fe2fa61680085472a028e47c13cf01b2bd7fc7a55dad6de1b
 WHIRLPOOL 
7815f44171243408468347a6acdadbda239931b2f2a810e4f0a8e98023506d9761e73f3db137aad7930dd5814f7ffcc2c670cf572d50caf394e88d85cafef03b
 AUX ufraw-0.19.2-clang.patch 835 SHA256 
3d3f18ddd382fcb311dde265ce9d510d57069e8549166f2f5fdccaab3dcb089a SHA512 
5de7d191f5ed11c50725baab21c9949b752a0eabb750b42503a0e0376996aacb5abc05a95a20e1352790c893cdc28d632fa8003903f5bbd19d7f30fc818b3e98
 WHIRLPOOL 
224cfba0e3107654c1f31a841862e72633ae4dae477b38db0a571fa66d97aed103d019e6e6e4aabe7de2ab267d0042fbfacf2e58090f34f4bb4da0caadc0e112
+AUX ufraw-0.20-gimp.patch 943 SHA256 
8d1f64085455655b8a3e99d40403e2a3c7c40d633406e8b5f8f5ee1e717d23e4 SHA512 
225d87467ba0ccf7a8c4a985c62ef94d89cb51166f37c2abc616bf280730aa1a214989a91a9e8a4bb3173413640dc1b2f8de410e4897e60dccc332e7a9536e29
 WHIRLPOOL 
d16b677b0a0c54e65deb68a0427b5a65b3d8f428f4c3cb5e83b712a14eb260505acf487305eb9b83a39fb9375935cd7e3d137d4b990d83b9f6e501575c2f74b4
 DIST ufraw-0.19.2.tar.gz 980934 SHA256 
73befe9f16f015a8c0f26cef3bb2e17cac9ae64aef2ade48c29aedb1ee51abd3 SHA512 
fb104d51253b9db9242539fa63a184b1f3d30dd87ee173a061a8179ecb2b5db052569baf0d50ebb25b34f3930a3b2edf3e0061ca22ccbda510fe65672a4319b2
 WHIRLPOOL 
6ef89a1f9456ddb5865dee3a5485fef1b7f0c10f1d79fba14b3ce9be5858b800de860b86c973ac75812692c7b65096da2fa25224ff1c4f8eaf1d90da0af3bcfa
 DIST ufraw-0.20.tar.gz 1086969 SHA256 
6dcd30f73238f56641ec87ae07807a6ebeab141a1a481aafe3ddab6f3db8a1e0 SHA512 
d18ecc257f9d88c77fca0e7a8641ee1e78abd28e73c34bd98def2d0dbd65f8fbaa677deca34ac4ed3ce7775764b6baca2896a023d690573057e4659de6dc3b1a
 WHIRLPOOL 
fedecf66ef22bdffe667408ac0b8106ec99ee2a1dd29fab53877229ec375bdeab37cc6fe942d7e3ef2c3de38a5770eaf4f49c44367ca1677acfda13bb4c85a1d
 EBUILD ufraw-0.19.2.ebuild 1912 SHA256 
54668a6312d64122705ff7da57bba8ecb4d4a40c3a209343993a6545e0bf497c SHA512 
9a3ef1df981b10a055f9669f8edf3c73bcfc72dfacec58f6b211e5d9b5bae8084500df829da82f8a943d7573e79eee636c761d52d5c1db8b62e3f3ec1945bc92
 WHIRLPOOL 
86de2a62d95b80a33ae49fcf2c80d3c1713618e7e473765669ceb3bbc24df1ae2a9c3422fd20d1923df7e1eb9cdc734522c53115c8603a4e95bb8b8b30e08d2c
-EBUILD ufraw-0.20.ebuild 1859 SHA256 
c93e684bf79af078e9013cdbe810bd94dab06adb5d95a72bf56a379c749b70d2 SHA512 
c0a5c25a02117c6f490310fe33d66fa699c3a445b2f5ec4cfda904b409e34c209135e7ce0a1c4db736b2a5f75305bd0c179cd069c93cfd92b0c8c4305c8137d6
 WHIRLPOOL 
1ebfb3c06a679e0ad28e148207383b06f05ac328a80cdceb152abfa917100e5cd69c5d8aeb9975b15db04519b632e5d221b0dab9bf16a23c4e15629b6f246f35
+EBUILD ufraw-0.20.ebuild 1893 SHA256 
a9e9e8618420bcce79b0c2a525b6cea9203d30ddeceba2b53855696f155b0b3a SHA512 
88c4cf85f01caee6c33e4ffaf8973c4cd3827893ae2324742b95dac5c3f97d874da8c3462a3d6e2d510575bf58afef9f830d0c9ea733388815364548b76dee36
 WHIRLPOOL 
c9f4afc7a467239f5ce2e466c785f556272e8aeb4c5b40a12f30cbb45e7ccc43ed28f1c4f967c06ca407faa7050c5524b0c1bc33d0e56297fb942f9c32b781fa
 EBUILD ufraw-9999.ebuild 1783 SHA256 
a82f95ef4d3fccbb559754821bc2a09e9bf03e1b2d2b925d9e3498acc0084f08 SHA512 
9947de270714bce9dc45b1cb3b15f5f2b6071df2148a2025aa269a4deb421af01dfe3969334e721eb1dcf1c50a38f29bbb118e70f9025fad5c865ea71d283a69
 WHIRLPOOL 
590e3075de9b54cc89e3d035845caa9edfc3d1fbe05157604f2209edce4e08b9bfbcb5599cd006b056540dd3ec7178998f2f549599eec1666faa98d7c4129c51
 MISC ChangeLog 10748 SHA256 
85eeb8faf237678885556506ae213edc99ed8354116ea18aaed0dabb80d2790e SHA512 
e3f2e8f06277f1f224e318b7960ff9ad82b6cc2e1b83c11e1f4e73b96b155d478aebe81d77dd2b8a6da2dd6f8e50b11e32781b7ea3e71ab07189cb4146dc0d4f
 WHIRLPOOL 
96c6192d4138a6caef7510e7f1b173e9bb23f96de319d97a28369eeedddfaca460585319e727eb0cf7af59f9cb2c2bcaf262c387c3e430bbf65ea521767b5997
 MISC metadata.xml 437 SHA256 
101562af2e68f9ce05d05494d48c03aaae046560eab55d6c5d472ae85fe3e4bc SHA512 
be7071c107a374d39fc92eab5b1b0ca0be19dc3ec847241e7bc56acadca27d0bbd803beaaf4a40f12e44d581642d5338a65dfa7d37f78a3d75bc756ad6782446
 WHIRLPOOL 
cab4d10b64bc1fbb4c2c72ba3d63b0ea46033bcd371472401e703304d1e6b76dfa8934e02192047b388b772da2af2dddc343067e225a1bd882943321524a3f3c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQoNWkACgkQkKaRLQcq0GK+IwCgr9j7YA/tTkT/xhOkO7tKt2wd
-FTUAnimbXQx7hpFH+1sNnJFBUKbJgkrk
-=9oOt
+iEYEAREIAAYFAlRZPVwACgkQkKaRLQcq0GL5TQCeMkK88Eppk7LOdoJPVDhJLtcY
+w9wAnjBPj6m3Es9KdvZfoyV5n09K+eNF
+=DCKw
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/ufraw/files/ufraw-0.20-gimp.patch 
b/media-gfx/ufraw/files/ufraw-0.20-gimp.patch
new file mode 100644
index 0000000..5ce607c
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.20-gimp.patch
@@ -0,0 +1,24 @@
+http://ufraw.cvs.sourceforge.net/viewvc/ufraw/ufraw/ufraw-gimp.c?r1=1.82&r2=1.83&diff_format=u
+http://sourceforge.net/p/ufraw/bugs/392/
+https://bugs.gentoo.org/show_bug.cgi?id=527836
+
+--- ufraw-gimp.c       2014/01/07 13:00:08     1.82
++++ ufraw-gimp.c       2014/10/20 04:00:10     1.83
+@@ -79,12 +79,16 @@
+                            load_args,
+                            load_return_vals);
+ 
++#if HAVE_GIMP_2_9
+     gimp_register_magic_load_handler("file_ufraw_load",
+                                      (char *)raw_ext,
+                                      "",
+                                      "0,string,II*\\0,"
+                                      "0,string,MM\\0*,"
+                                      "0,string,<?xml");
++#else
++    gimp_register_load_handler("file_ufraw_load", (char *)raw_ext, "");
++#endif
+ 
+     gimp_install_procedure("file_ufraw_load_thumb",
+                            "Loads thumbnails from digital camera raw files.",
+

diff --git a/media-gfx/ufraw/ufraw-0.20.ebuild 
b/media-gfx/ufraw/ufraw-0.20.ebuild
index 950b947..623fc54 100644
--- a/media-gfx/ufraw/ufraw-0.20.ebuild
+++ b/media-gfx/ufraw/ufraw-0.20.ebuild
@@ -33,7 +33,8 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
        epatch \
-               "${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch
+               "${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch \
+               "${FILESDIR}"/${P}-gimp.patch
        eautoreconf
 }
 

Reply via email to