Fix crash with patch approved by upstream, bug #504582 by 504582

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 69 insertions, 13 deletions

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index ef6156bf0cca..892169d88af7 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/seahorse
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.176 2014/03/09 11:53:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.177 2014/03/15 10:48:43 pacho Exp $
+
+*seahorse-3.10.2-r1 (15 Mar 2014)
+
+  15 Mar 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/seahorse-3.10.2-include-correct-headers-for-vala.patch,
+  +seahorse-3.10.2-r1.ebuild, -seahorse-3.10.1.ebuild:
+  Fix crash with patch approved by upstream, bug #504582 by 504582
 
   09 Mar 2014; Pacho Ramos <pacho@gentoo.org> seahorse-3.10.2.ebuild:
   x86 stable, bug 499954
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 40004182175f..300b5a0c5b7a 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -2,20 +2,20 @@
 Hash: SHA256
 
 AUX seahorse-2.32.0-libnotify-0.7.patch 729 SHA256 8f7b2fc0ad1cb572de3c31ed694e5131e8ec6373e9f3e202d98858a12902c467 SHA512 a8752d88779969923b8866e5f627e469cb2e3da06e00e8a4fc9cc39f2e5de9c93f17d81fda7ba143e523105a3d1909cfc3b72e460dd3d6fb48bae7970b5cdcea WHIRLPOOL 33ca07d06d5623c6924ebbab5d28a0a4ae3c0d3b226d8083769c308b425535d70b41c9776547335a9efb30f6875fa2e772c9155a99ab824e04ecfd0c108f6ceb
+AUX seahorse-3.10.2-include-correct-headers-for-vala.patch 943 SHA256 3070918a99ac4ff1de4f67a4db82e867578259ae3454c30660f368cbb6d62f52 SHA512 02f8cf69b74e7f34a85b24557518782e25701ee7b5c622f1e5de46563d07970a28527017fba5426899455d03cb59d803a403dda3c1042a572c6762e76f4127fc WHIRLPOOL ae4194912805bb52b0f2fca7468c5ad94de8af5ded27186ee836eb76aaa3b7aad25d8d788a095bb688e8513e219ccec09654f2846ad865d9f3e0e73e6cb115f3
 DIST seahorse-2.32.0.tar.bz2 2491230 SHA256 f55468237246a485317d59e2fbc1b1ef5f5bd4c5a7b9ff6f40c3d921af0ed52d SHA512 b75d94dbce8a00ecec4c230975104b0868f5b51bbcaf18a3b0a2520156c1b1336ad60a978775657fdca0bdabd0ebcd52a5e086a25ed8be1cbae9354245705879 WHIRLPOOL ce686c02f8f3935e963ef2fcf4b334372cb8698eb67353891276c79e3f587e50d3b9cb8bd5291eaff21e1e7bc48a82ddc8fa87a24cdf39e1c1732846d71d1e5d
-DIST seahorse-3.10.1.tar.xz 2110272 SHA256 1df307481988c272d5648a335b2e8bb545b568a00c3f2ca2f3aa732badb46985 SHA512 5e86eea1cfcdd9d69cb5e3f16dc4506855a30df341fd955a036fb95e325fa4c6a5e1b3d3c837aea79518ed98ac466719844672a368c0566af9ff9db776e28264 WHIRLPOOL 4b694ef5859d565e3a1bc7ab27b8a85f3f91bf0646c09d69b45dc1bc2670b23184d25e785fabda9fb6290a2c26b52e4594bfa6310b99d0990a7e9e82bd96a7ad
 DIST seahorse-3.10.2.tar.xz 2109592 SHA256 89cabf19f77a55f220bc61a3b97e4db845a0980f0f1d9c66147cc9a4ced8cd16 SHA512 7257f96c4e77902c018cfcff9e2096ab216fd4bfde729c08d7305f20e58664675381ad60e394d0536e392345cc6bcfb2de59af1a2a4e3e5ae56856aa8fc0d80c WHIRLPOOL 9c940ac1168b12c19884aff2b8ffbad48b1e0f1aaebca182489722e2c542f54fedafcc17c912b21afff547e4c6b1253c2d8c2a2f2195978b21edef3b055151b8
 DIST seahorse-3.8.2.tar.xz 2012712 SHA256 b3837d088b7e3f7ebc41cb3f11c5c85e2df7e06bdc538a3e85bb1a13c34c9a12 SHA512 bef79052b874e752a6adcce7273bb5bc0ef513c9814374494f5da1e78e8653f0ef59ea7b5233e59419113e2b18d35578e2d902cc8ffbdeb50a419a0257fc3ada WHIRLPOOL 59ad2c53bfed0ca731e1fe1e61af215eea5c7a81c133a6fd5b5787731626a3fd44fca58b490063a5c4d1ccffed614f5ae6ccd59d4d551b02ea66c9d45456834f
 EBUILD seahorse-2.32.0.ebuild 2162 SHA256 badf51a1c01e93ba577a0458f68d3724a2b313a44bba565b6b1696a20b11dfe5 SHA512 484f27fda351e6adb8732da527f091fe2299a56bc909a5a9fc2edc4b00fef795111bd07090c97bf73e8f7feca6b5863ca7bf41c991e64adabbb6bddd1d2607ef WHIRLPOOL 8a565ff071f14a638622473909ae2214192f7a49233e44709151f1807258c2bfbd3135d18087144f532d56f140acfc76e3a5ce9c4010a4ecddda59bd6041a04b
-EBUILD seahorse-3.10.1.ebuild 1536 SHA256 e8eb0f7ba319121a1e7b3abbf56e264d60b6444da3e51bdce79fd2942d880436 SHA512 a9987c730543435a72eba84d2b8566af8f68c3272e4ec3e3aab8f8c097f5f797209d3c7eeae1f8e8a040587ddde4e1ecc8aa1b8ee69c0b64c3d107056258edea WHIRLPOOL 8ef79d57d00efdcd2d81346e310a5d42d2469648d27da12172028f600015b37ac2e1591f8b4e782a182064b9095b160924413c4f0562fc11036d61e71088606c
+EBUILD seahorse-3.10.2-r1.ebuild 1989 SHA256 7baa1b22b5e14557504b462f371b0c3463c400be0f069eb950993b70f987481a SHA512 7665f941bcba6d54d08e272c963d13d35c52a7fcba061c468b3cf1b9198b8b8e64a6b40d49f9ddc1c430eb352a6d6db727d81d0fae2e4a6f20ae90e8d1ac6258 WHIRLPOOL 1f01d2908b6e9072b392516ea2215683fd5db22e3459054c616285b61558514bf7c95569d5465cec83c0e5798c6e821d8562d95629edbbcdfa1ac705c5599710
 EBUILD seahorse-3.10.2.ebuild 1534 SHA256 1e9e95982555b27f92d9080cea46cec9fbe2ec94470e4f311860dfd3715bcb72 SHA512 93760005543f3f8900cf0306c5777dd235b345590922a25f7b33fdf64e632ec0456a8fff57f859f9413da9e117dddec9dea6e50fb4fc0a7e599a41fd4e276a21 WHIRLPOOL 398c449b5b89a171de64ed421f9ffa83d6a5ae745078bb314fe1511aae9815d961c7bf641b34bf548651b56c70857c6dec4eb3a775d0c8d6a3aba9c31f6b2900
 EBUILD seahorse-3.8.2.ebuild 1505 SHA256 edce30328881bd8d02e649434a52915bf5e46f68c942713553978f473a51b37d SHA512 e264d5d49093aa98e0fecd4b2891bb90b37be839cecfdd3fc913b226af36c4e737aa1d3f0cad4d7d3802623e144c49c34717bd801585439b9ea8f13975849507 WHIRLPOOL 99d2633cd125b6caf0d2cdd95be36b815eb7277da641167af15130d049f0c032a4542273a5b022ff08664bd52690861c74ca4796a0c9c0de54b124477f59229d
-MISC ChangeLog 25357 SHA256 328b3839091e496dcd887147debad6b849dce61cac499de509284bd7dd808b56 SHA512 53944bba8f282d6d1fa7f2b9750a5b6083dfde47e7e7bafd023e8591791365dcd92db56b17b2e3f830be30db623c39101c9d86471c87275e1f64b2a48e5a71f1 WHIRLPOOL d1e4b5728d595d35e113360ca9e3e9dc9ad807396d59d64f20309e47f101a52067864353a713f36826d6f1fc12e49f64d8fab39e65aa63bb5b644c453c3d3b49
+MISC ChangeLog 25626 SHA256 863a028aa18c51db115b648c12d5a40012dd821509cc36316b90b3ba3b2baf42 SHA512 e4852d4a89c517d8f10a267da3b1b8c2157aec845a088a3bcc17126377c0686b743d847da70386a64201e72e4f395135f0be3838676b649fea008da1aacc3bbf WHIRLPOOL e4dc3bf6c8d2f762503848189815e52f2e3e18600f0a2c1c69085e9ee77ed16a90b6459254c3c9205bd29a55eb9d1d8adb2900e5a465b01bae5c95cc73ac354b
 MISC metadata.xml 780 SHA256 a451d0176823370754ceaaa2bd6d5e372523008eaf29410541378392241d20d6 SHA512 3e5c6a4edd1ab1ce4353145afbb96a353b126c19295536e1207766fe7348050842e871e93013d63d067078ffe3c017d366e4677390992de2a7d1d9a5775960c1 WHIRLPOOL 39481ab218ed04e835f5447ed74df6d4d26102c8e0f0e48b4f85aea41afa0284b529d28ad937e9d02fef17d52e564c3c765ee8117d8ce3fbc3b08d780dcfcaea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMcVjUACgkQCaWpQKGI+9TswQCfRxOwHvuIUZ8bWBs9lXuzqIn2
-X3cAn3uufhGt+dGRvnSvxnk13jWl093O
-=8baS
+iEYEAREIAAYFAlMkMAwACgkQCaWpQKGI+9RTGgCfafJN0RUfzEsR7V61NVOQsHfv
+dVIAn0rA4evoJPy5CuSMnxZ70MvMFoih
+=XKQ8
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/seahorse/files/seahorse-3.10.2-include-correct-headers-for-vala.patch b/app-crypt/seahorse/files/seahorse-3.10.2-include-correct-headers-for-vala.patch
new file mode 100644
index 000000000000..8e67c5a40a6a
--- /dev/null
+++ b/app-crypt/seahorse/files/seahorse-3.10.2-include-correct-headers-for-vala.patch
@@ -0,0 +1,35 @@
+From 577c4ba0fc84d904338280c0ead77177c9d94ea3 Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw@gnome.org>
+Date: Thu, 20 Feb 2014 08:41:54 +0000
+Subject: common: Include correct headers for vala calling C code
+
+These caused crashes due to pointers being casted to int.
+
+Due to the way vala code is generated, this fix may require
+you to:
+
+$ rm common/*.c
+$ make clean all
+
+https://bugzilla.gnome.org/show_bug.cgi?id=708996
+---
+diff --git a/common/config.vapi b/common/config.vapi
+index b814388..056021f 100644
+--- a/common/config.vapi
++++ b/common/config.vapi
+@@ -16,11 +16,13 @@ namespace Config
+  */
+ namespace Seahorse {
+ 
++[CCode (cheader_filename = "libseahorse/seahorse-prefs.h")]
+ namespace Prefs {
+ 	public void show(Gtk.Window window, string? tabid);
+ 	public bool available();
+ }
+ 
++[CCode (cheader_filename = "libseahorse/seahorse-application.h")]
+ namespace Application {
+ 	public unowned Gtk.Application @get();
+ }
+--
+cgit v0.9.2
diff --git a/app-crypt/seahorse/seahorse-3.10.1.ebuild b/app-crypt/seahorse/seahorse-3.10.2-r1.ebuild
index 4b0b0b7f2640..c07789048721 100644
--- a/app-crypt/seahorse/seahorse-3.10.1.ebuild
+++ b/app-crypt/seahorse/seahorse-3.10.2-r1.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.10.1.ebuild,v 1.1 2013/12/24 15:24:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.10.2-r1.ebuild,v 1.1 2014/03/15 10:48:43 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
+VALA_MIN_API_VERSION="0.18"
+# All vala usage can be dropped when patch from bug #504582 is included
 
-inherit gnome2
+inherit eutils gnome2 vala
 
 DESCRIPTION="A GNOME application for managing encryption keys"
-HOMEPAGE="http://projects.gnome.org/seahorse/index.html"
+HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
@@ -33,6 +35,8 @@ COMMON_DEPEND="
 	ldap? ( net-nds/openldap:= )
 "
 DEPEND="${COMMON_DEPEND}
+	$(vala_depend)
+	app-crypt/gcr[vala]
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -48,6 +52,11 @@ src_prepare() {
 		-e '/CFLAGS="$CFLAGS -O0/d' \
 		-i configure.ac configure || die "sed 1 failed"
 
+	# Regenerate the pre-generated C sources, bug #504582
+	rm -f common/*.c
+	epatch "${FILESDIR}"/${PN}-3.10.2-include-correct-headers-for-vala.patch
+
+	vala_src_prepare
 	gnome2_src_prepare
 }
 
@@ -61,6 +70,11 @@ src_configure() {
 		$(use_enable avahi sharing) \
 		$(use_enable debug) \
 		$(use_enable ldap) \
-		ITSTOOL=$(type -P true) \
-		VALAC=$(type -P true)
+		ITSTOOL=$(type -P true)
+		#VALAC=$(type -P true) -> readd when we don't need patch for bug #504582
+}
+
+src_compile() {
+	emake -j1 -C common # Needed due patch for bug #504582
+	gnome2_src_compile
 }