Fix segfault at startup, patch from upstream, reported by Tomasz Golinski <tomaszg@alpha.uwb.edu.pl> in bug #527082

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

4 files changed, 51 insertions, 7 deletions

diff --git a/media-gfx/geeqie/ChangeLog b/media-gfx/geeqie/ChangeLog
index c5ba8c338b88..d625b16a994d 100644
--- a/media-gfx/geeqie/ChangeLog
+++ b/media-gfx/geeqie/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/geeqie
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/ChangeLog,v 1.27 2014/10/26 21:55:20 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/ChangeLog,v 1.28 2014/10/28 09:14:56 voyageur Exp $
+
+*geeqie-1.2-r1 (28 Oct 2014)
+
+  28 Oct 2014; Bernard Cafarelli <voyageur@gentoo.org> -geeqie-1.2.ebuild,
+  +geeqie-1.2-r1.ebuild, +files/geeqie-1.2-fix-lcms2-integration.patch:
+  Fix segfault at startup, patch from upstream, reported by Tomasz Golinski
+  <tomaszg@alpha.uwb.edu.pl> in bug #527082
 
 *geeqie-1.2 (26 Oct 2014)
 
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 60adb628af06..c45bb9957696 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -10,19 +10,20 @@ AUX geeqie-1.0-ui_pathsel.patch 1307 SHA256 2a42dc2a5ee4e4d5e4636d424e1adb6a707c
 AUX geeqie-1.0-up_path_restore.patch 626 SHA256 29cdffb3d1fe2c6c4823ba55e194dac39c59f56aec7aa84814435b656d2ee27a SHA512 21a7375957050a7d5c5650475215f03f2129faef524ef9a61fdd716761e979fbb4b2c619b6d736afe84ee0340a5ebdf391cd111ca18fb7cfd0593ad8cab8abd7 WHIRLPOOL 6c57255f238b2e91d6b51fab9e8dd43c814049e27f02e744d20d397b76dfb5097fdd96af0b673479638cdb2e11999ae11524240d634ae2041558e440e80cd2ff
 AUX geeqie-1.0-vflist-refresh.patch 1968 SHA256 5f7d53a22a42ed7afcb425bf3a9bb358e40225a6a356c2b3791349a2eda67bc0 SHA512 ceb5874f895a5a0ef1e60fc97e7ec4d99c508713bffceff616839abe216b223baf3cddcc2dab431c74e75bd4a72b3ec38c9e43a018a81c46fa3bf0d949152e90 WHIRLPOOL 63b58135799dc62cd1ecd7c95ef47bd025a21687c0a15498fd9e3e13f4067441623eadffdd128cc837612387df9cc3ecc8faef55d70a609cbbbb27b1305cd344
 AUX geeqie-1.1-fix_comment_update.patch 4649 SHA256 cd1ce814ea556f51e840e36b85a2316e30f57a887531688a2b20f481a3061612 SHA512 4b6e6b25264a7b9075dc2718fb48a0eb8157f695f206a047efc94d593ed5624bd86b47f38931bee24fc8a5ec0be75f4ea51338996f8ca8be56982d5d3584a786 WHIRLPOOL 38cbfec26e7b9f477e739de87609e442439a3a1d9c2a8ba37fccff6fa77869e74e14bfbe5977cbb447cd8649e97eef98c02483cae9820eb9958a99f95b686a6d
+AUX geeqie-1.2-fix-lcms2-integration.patch 1088 SHA256 fb6b64d267f7cd5b78ab87f79bac36a91678fa919247ab90bdef1ef0a1a15ccd SHA512 0258c22f56759116c312e2df2541a5ac0a8d248a6fe9282421b4dcd5838cd6c31241c7629d1b7664960469f475b7fd09f99d2d6db0cf416b38ce44928b745b86 WHIRLPOOL 468ae7b7c36d1459908b678d39b9b1c4a1a7fa9326596cc8cb60a53c038ae8a4656b6c23f25033d43a5a094aba67c114c7fd80ce64e907e9cb6a689b342871d3
 AUX geeqie-1.2-fix_version.patch 374 SHA256 450692df420c993f8a91a7b5b71cf40c2dcc8b21a546533b4b894b4ff6e8c353 SHA512 f9ea503a6a367838380e20ed7f102b9ce8c22286ab1c1ba6b33741ecc5d82770e0cf147462bc3a42bf3b602fc5116b9d267e8125af374ddae48352b14bb82fcd WHIRLPOOL 446ef59f4eb635c85c67cd72329e28ab004936d1a73f92ac62174bfbef9adfa8786fd88432a7fe880ec3b3d6f9489d684d8309bbe33b89643bb9ea6f64cffe8f
 DIST geeqie-1.0.tar.gz 1934236 SHA256 d1ad64666446c1d490437a9441267e8d7c1b9dc6ab640716b213e386d9211fdd SHA512 34ad22468e1faaad8842df8c172e305149415812a9421edc590bf1717ab8ce787e55152f9348d39b69e2c5642cba5abd4e574c0b46d06bc741994bcecaa8a18a WHIRLPOOL af3406b27b491fe8836f39faf5013091a3c5b74287e94d9022b2b3cc337ce338e586fc287de90e272a284400926af97b41e32af5e6e87babc770bb1b66cddc89
 DIST geeqie-1.1.tar.gz 1966211 SHA256 5544e81c29917a647f19bfe800d9f0dd1cd5b890329feebd9abd80927e1afecf SHA512 3949b2717c70adb4e6b2c6db002042bcd1c3e9a5345991d3cba41de1765709ccf70fadfcde9dd221b1da03ef14512c746ab424cbc0d09617c52dbf445ee0243d WHIRLPOOL 1c62611f597e08b51b0306dac2af5af1893d4c1b96726bbc6220b28d1779275516624ff3865dec0056d93a1af24edcce1a3a0f2891b954be19bab1b7d728a929
 DIST geeqie-1.2.tar.gz 1904764 SHA256 f13fc2489fb9bed31ed48aec8b2a3a573c11cd6e036f1b07ed2cf6495ccc75dd SHA512 cd27cc480cc649f6ba6ea2997bf9a3dc1aa3f655e6f949de27bb4bbfa79927126851604005bf0a0e2be86683f5b9b06dbfb86b919f828e54a79bafcdd6a0be92 WHIRLPOOL 82e25e743b62566dd99a630fb347966195a93b8eba51a300907e04e7113c5bc39a0bf74da28eeba6325558ff86d1bdea80cfe8c7fedf70ce5466e224e0b648c0
 EBUILD geeqie-1.0-r4.ebuild 1714 SHA256 13b1e5dac08c772ad44d80d1c5cfa6e8036554cc918380b9795da0630607cae6 SHA512 0630e439aa0967d38f255afb182e3ecd6caf1755faf8098914714215b0e54bd1ae5231d31fcb6b9a73f2cf9e5f770e17ddb55c674fa02fc9348aed7828ad0058 WHIRLPOOL bb0988192d3bc96bd11ad06705a0e2ac8f152dd2dbff065fe9e3b2ff809b46d98272004effbc0e87c455e2a475193ad92344fafb5179f8bc4f4319a14c49889b
 EBUILD geeqie-1.1.ebuild 1530 SHA256 fdd5fe84fa8c94f1a613953e5105acd297e5f8174393621c4535e1010dcfe00d SHA512 5f4623a257a5444fe84e6065eea1051838d9e656587d4d5e6968879a76cd3545fc9ceec1e28ebb4f9074e63b8671b0aa93b33b1eee28f310636d353200c62fa7 WHIRLPOOL eae5e011e904cd31665dcfd4b932025b47b5c5a3fb6641ff961fb83d76fb8b105d707f717fad6bea384680876424cc8d8d8e0709a557c954ee02b6fdf1fedd4f
-EBUILD geeqie-1.2.ebuild 1791 SHA256 934f5bb1466cee9805dbbedfe646efc7f1736cf483f0045d2e0c4c59e51e8c5f SHA512 0e77d4c2d9ebc725eb5df2d4ea21f8e24ced5f35416243fef1132a87e082de8e3dd5735fba171f8b339aa0f094180c81f75d5a3e81b1a301367e56dd80a73676 WHIRLPOOL 451bd600034515e71d7e4624499139a3fdfd81e0542a90ee7164c35f9480959f0888a52ef4d551a17825329332adcfeca743be18a601d992f10dc14b2f0ce4ca
-MISC ChangeLog 5177 SHA256 c4dacb3deceeb07aa70567b260e99929c6c105156e81b73a1f27664603964a3c SHA512 c7fdbc772dd82dfeb2e325e1fe3a984ceff4bf018172fa3b7c96b82d6103884850c5541434db6b0899b3e965dcf8b6d677e1ed197ec14fb65812dc28e60d437d WHIRLPOOL 0b2f4c94c88f0ef0bc05e117627f8b1aefb297349b74859af7c758a6bfba4bc1445901b16fe1abc86d1503e26bb13cef590916b0433df00670d71c24426645e5
+EBUILD geeqie-1.2-r1.ebuild 1842 SHA256 6e093817fe6b5475b77940f1a2a7c69474be8537d9b5efd56b739fdcd3fbc27b SHA512 b9d7e12cb8a0f63ca0d680e884e55d2adca22753a419cf5620ae298d060e80d8e16383ea49f39acf5125a76c0ca7a7dd96c33998752768fce9a724f3b469444b WHIRLPOOL 3af7de80f6cdb9e4dc828e6ba0771979458c76baa95ef81aab614d1f49b9ae92ea168b23aad67f58b6460e1d3b702f44a71d01e746c9a95450c770587711e816
+MISC ChangeLog 5475 SHA256 3300f54f7570f6894d1d5f09cfa0ded4ed14760ba2e9d790beee86f012010e1e SHA512 fd81d6948da51817a36f8494796708ce6dc38f7fd830a7b8f2be07ab413514135e538c0c20bd5750e3d39e6a8f038b14c35dba3e814acdf4d878d0d6dd0d60d7 WHIRLPOOL b8ae205ad6b42ae4e16e3e1a14e859361ff74db7ad30e7a910a22c962cbca4e811da04372bc721d290b6925208bb4df093afcfee9fa40aaac7878999a12420ce
 MISC metadata.xml 527 SHA256 0d271c29ec180ce0cad2f6129d90fcbd562996c76d59d56063c3e29d6e68b877 SHA512 7ba8db75611e19112aeff58820af895493f9153916972ba088673afd0dc9c4e9dd894e34c4a0b8cab413e5c8f777827178e407e0153ebf5be31d5b9ad6810cd2 WHIRLPOOL 9720b49bf795bcd36b03eda5d616a913c8da455791dbd8c8e73e44e6690c7569153fc5eac942c157b8dfb9cc505bd700a88fbd0565d0c01faa2658cca5077e34
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRNbc8ACgkQFYEBGcdFJfJBTgD/X6tAOa042uxxhb4taVSdB6qc
-mIRwKxHTP/tr0JDw2L4A/jVwRr2C+oShIEZ7oEXxeKAfH/C3pofVIBwie4PM1gtd
-=sAyJ
+iF4EAREIAAYFAlRPXpUACgkQFYEBGcdFJfI2uwEAkCLXg6j1Fq15K5a3zP3HmzK2
+hCLEGBf6ir/hZyZJVF8A/0iF4a7eTtLWeVY3CIDOhw3Eo2zMiqli2uN6sPE5kewF
+=9SJw
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/geeqie/files/geeqie-1.2-fix-lcms2-integration.patch b/media-gfx/geeqie/files/geeqie-1.2-fix-lcms2-integration.patch
new file mode 100644
index 000000000000..5f13c92cb6db
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-1.2-fix-lcms2-integration.patch
@@ -0,0 +1,35 @@
+From a1afabd3ce740872a857234b91eeb64fcf239f6a Mon Sep 17 00:00:00 2001
+From: Klaus Ethgen <Klaus@Ethgen.de>
+Date: Sat, 27 Sep 2014 12:07:10 +0100
+Subject: [PATCH] Fix lcms2 integration
+
+Thanks Michael Schwendt <mschwendt@gmail.com> for the bug reporting and
+the patch.
+---
+ src/color-man.c |   10 ++++++----
+ 1 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/color-man.c b/src/color-man.c
+index 7788c7a..e4f1bab 100644
+--- a/src/color-man.c
++++ b/src/color-man.c
+@@ -432,10 +432,12 @@ static gchar *color_man_get_profile_name(ColorManProfileType type, cmsHPROFILE p
+ 			if (profile)
+ 				{
+ #ifdef HAVE_LCMS2
+-				cmsUInt8Number profileID[17];
+-				profileID[16] = '\0';
+-				cmsGetHeaderProfileID(profile, profileID);
+-				return g_strdup((gchar *) profileID);
++				cmsUInt32Number r;
++				char buffer[20];
++				buffer[0] = '\0';
++				r = cmsGetProfileInfoASCII(profile, cmsInfoDescription, "en", "US", &buffer, 20);
++				buffer[19] = '\0'; /* Just to be sure */
++				return g_strdup(buffer);
+ #else
+ 				return g_strdup(cmsTakeProductName(profile));
+ #endif
+-- 
+1.7.1
+
diff --git a/media-gfx/geeqie/geeqie-1.2.ebuild b/media-gfx/geeqie/geeqie-1.2-r1.ebuild
index 6d50a5d38a0e..92ebe66339fc 100644
--- a/media-gfx/geeqie/geeqie-1.2.ebuild
+++ b/media-gfx/geeqie/geeqie-1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.2.ebuild,v 1.1 2014/10/26 21:55:20 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.2-r1.ebuild,v 1.1 2014/10/28 09:14:56 voyageur Exp $
 
 EAPI=5
 inherit autotools base eutils
@@ -32,6 +32,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-${PN}
 
 PATCHES=(
+	"${FILESDIR}"/${P}-fix-lcms2-integration.patch
 	"${FILESDIR}"/${P}-fix_version.patch
 )