Improve glib-2.32 fix (bug #412239, thanks to Dmitry K). Fix crash and build failure with gtkhtml-4.4. Drop old.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

5 files changed, 84 insertions, 16 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 9ec1b3b2ea26..a74cb1dddda6 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.359 2012/04/19 20:38:13 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.360 2012/04/20 05:51:19 tetromino Exp $
+
+*evolution-3.2.3-r1 (20 Apr 2012)
+
+  20 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -evolution-3.2.2.ebuild, +evolution-3.2.3-r1.ebuild,
+  files/evolution-3.2.3-g_thread_init.patch,
+  +files/evolution-3.2.3-gtkhtml-4.4.patch:
+  Improve glib-2.32 fix (bug #412239, thanks to Dmitry K). Fix crash and build
+  failure with gtkhtml-4.4. Drop old.
 
   19 Apr 2012; Brent Baude <ranger@gentoo.org> evolution-2.32.3-r1.ebuild:
   Marking evolution-2.32.3-r1 ppc64 stable for bug 410611
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index bf557029aea9..38cd3c07d7b6 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX evolution-2.32.0-wrong-lafile-usage.patch 634 RMD160 e14b9b17faacc3590419f7f1de78cd0f76323d58 SHA1 221fbd2112d206e52e741018c7ff2a3434819d18 SHA256 79e169a86b658bbd339fe79585f908f0eee4cfeef972be0731faa742a769deb8
 AUX evolution-2.32.1-libnotify-0.7.patch 2239 RMD160 b0d8f2e830e32d9bc227978074f7e9975ae1307a SHA1 64c1f4ed1311cead4071e7543704ee8eeca4e418 SHA256 73746e65a3ba190ace8bd1e5fc9d52f6a67556fac0ba8727d7705ffe74e3ce0d
 AUX evolution-2.32.2-mime-handler.patch 4169 RMD160 8ec9bd24fcaa9cff0b2e865a85a430a3ea0856ca SHA1 e974601ec51a8e79db14520d18282af893cf89c9 SHA256 ba6db000b4c38b53462c0281146e504b7212b84a6d7f5f482b375674042ff846
@@ -5,18 +8,29 @@ AUX evolution-2.32.2-smime-fix.patch 2444 RMD160 e3f5c36d800bd7d0578f1696efe2582
 AUX evolution-2.32.3-g_thread_init.patch 2810 RMD160 d1bf14cc407a5515523f921bb534309d8f4e0498 SHA1 83acea3144c01172e5cfe247197b13ec46f2720c SHA256 2162851b365ceb0bf3f7963d21951156bd7dd58c875dbaf33b6714d1a3df1c68
 AUX evolution-2.32.3-gmodule-explicit.patch 808 RMD160 a1a7931e56a5d56b6b9f3b649345baa394235d96 SHA1 32ba1f7e366de333485d07ef5621926342c6788c SHA256 92e12766bcbe6e9dc46720c93ece116c4abd28a15798eb976ad0deb96da6e29c
 AUX evolution-3.2.1-reorder-mx-clutter-gtk.patch 1308 RMD160 9d6db86c94ea6f5ed9a4a1e15901f6d7c942e165 SHA1 5f26590d80512f754f7547b20e620345a3efaed0 SHA256 d05f8b29a58defb11d08fb576028b198116f069d2edae6c9545a667e35d57a40
-AUX evolution-3.2.3-g_thread_init.patch 1751 RMD160 ba8e7fada9d13d822e962889cb916b9e2528df28 SHA1 355bcd51fb6b40684321b6ddd55bcc6393cdf59e SHA256 9f6c33231d5f33b49a5857ada1ca1eb186f5023ec505e9b5c25b057746935d77
+AUX evolution-3.2.3-g_thread_init.patch 2335 RMD160 6f5a4cd0053e50b0adf887755726722857523043 SHA1 1b302d79e86925154a2b8bf2f5029f625f11f032 SHA256 20b87e3fea68863fcda9dc57d6ccf74ce7e2c9f5b8e7d6f30032c034f0975116
 AUX evolution-3.2.3-gmodule-explicit.patch 727 RMD160 80cc5b748f1d25aba0a1fca96fc4835cc9c1d6ae SHA1 37121a02f5164fd978190e3901f9e3b9634d28d7 SHA256 0fadbfec6a35ac569432007464ad165b51d65b16fcf95cd09c6a25a542880f54
+AUX evolution-3.2.3-gtkhtml-4.4.patch 900 RMD160 7009155e3ce50e58e4dad01da2f99ba024ef81f2 SHA1 8084c904409eee75e12170b22988eaed78a5d83d SHA256 ee98a29f0dac28ad67fee72c4372f4edaa4dbe4b6a8627606784f20c1cdf440c
 DIST evolution-2.32.2-patches-r1.tar.bz2 15387 RMD160 1b5279f83c5d6048294a4b320b3bbc03bcb91485 SHA1 d6a6c18eaf2cb94256971e8b4444fe7c7ba20851 SHA256 466783eadc50e06c7c34c6e5a93ddc87b3af15456f28b40e52c2e785fb324b8e
 DIST evolution-2.32.2.tar.bz2 31929154 RMD160 1d68825111309600093c8d4718e1cc001635e61d SHA1 48f25fffda1ac9c209fd02162ca298df5c03b05f SHA256 1831c7f5f00b4755869cf84ef3e3f79c4705a33e0659e72b6c1ffa4a59d4a4bb
 DIST evolution-2.32.3-patches.tar.xz 11784 RMD160 34e536268814b2c41fd081321f3435ea10af620c SHA1 2f9af7d7f9489099daefceb7ea7f2948fa1314a5 SHA256 eadfcd9d1663206f1d15457358afa7901f095894d782d4043ffd762b242eded6
 DIST evolution-2.32.3.tar.bz2 31966138 RMD160 1b64d00a38cf8ad5c273cc4f4aee73124fe818af SHA1 cc2a2126ef4192193dce50c43c5bb6fc0a57fcde SHA256 33ab38780e9abb71506230e331e9c3534444b5ed3f17046f0b6371a00df686fb
-DIST evolution-3.2.2.tar.xz 11489564 RMD160 494db8147be89f62a337dcd357c3ba0eabc1047b SHA1 cae31984cfbcd26a8848a7b94a0f4957502ae173 SHA256 03c68242bbf494dda3bf34f52ec843c282c9bb07f9415a69fe58237c7efbbe7d
 DIST evolution-3.2.3.tar.xz 12419112 RMD160 9e7f770e3fa778c0742a6d9f3d35169772355ebe SHA1 847f4657250008f1963b94718e2377687961bb3b SHA256 a25d523e775c022ec9e68d7b989316e7252b687d70b9db2f60b72bb833099e9d
 EBUILD evolution-2.32.2-r3.ebuild 5691 RMD160 2d6159c4990e2630e59c1562f664dd87918db5dd SHA1 5ad0dbe872123b0b2401b7a216ee042ac04b6014 SHA256 db9c5ead5e9417cc5dfaf756920219cd7d89636b9ddfe3acf066b247af11b109
 EBUILD evolution-2.32.3-r1.ebuild 5963 RMD160 b3bf8af01191945b4bdaa28ac9b18a2fd6ea3356 SHA1 fcaff1c9fd8d07f670e532bb9ea6f47a8cbfca02 SHA256 df1e54811fb98b94941bc29b2583e05daffc5b7b78e3222eef6630e2a635daaf
 EBUILD evolution-2.32.3.ebuild 5544 RMD160 a5f90a45c4ec5840d414a6063fe18637943791a7 SHA1 e5c168ce2b73ada8519bf0db3230673232a1d905 SHA256 56ca1232a197a08744835fa11ae2c05935ad92660c0972852029ed3109ae05c9
-EBUILD evolution-3.2.2.ebuild 5366 RMD160 6da67f8b1023d6c1d7ff98c399a3361d494cab7f SHA1 3d366d21496324768633b2fce2042d4f22a24691 SHA256 0a1fa37472611730070aaa46da683eee91280f13ab6c5519a05bcf662b7d1f3d
+EBUILD evolution-3.2.3-r1.ebuild 5471 RMD160 97d38c3bcfb315fb09d25089bb1193791a74fd9a SHA1 3a248adb1190da1cfe278029f2ab183b2912abfb SHA256 a4dc783537b0ecc9c5756f78c85caa71ad37e55e4e1b29145b424a908939f0b8
 EBUILD evolution-3.2.3.ebuild 5371 RMD160 6bdc133ec1e9150a591e3f7d82b115d7f3b28d1f SHA1 2a504c4ab0ade7368cf06642408d0832d7a94071 SHA256 eb04a059653daac6cdb6edf606b419b0c9f33983ad23ede8414916d6742dec82
-MISC ChangeLog 81717 RMD160 5049228f396dc024c2fc08dfa8d462a1ab3d8c53 SHA1 1c38d8be5a8af29f0761e621f1f196d9cb895ecb SHA256 76b96fe08f519dfad52a42c5422b499b56ba4d5445e681621d091908bc657f43
+MISC ChangeLog 82076 RMD160 f39bc1fffb35b6df0698264d2b59240effd3fbb2 SHA1 ee5f8b8af5f265bc57d9c16545dd9ffe36879772 SHA256 4703ff8c54365b5e759820e8b2d0fe4275c67c061e4b108366b74d504e09f25b
 MISC metadata.xml 1097 RMD160 b1d9ba9ac1576e4e70d144b4db37c221ca6290dd SHA1 5f659a37f0021e82eb8fe9572d87d2af2ffe212c SHA256 fd96c4817ed5c032a35790835aa072abbee8188b443e43f591badb35f8b38147
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPkPlcAAoJEJ0WA1zPCt1hE8kH/3UZemlxtwU1poBIGV5gElDn
+Gj7mzkiyI4dyFazjM7EJZ36iirIglixd7LBpIetaIecveNxCK/pf6HB48rAFW5XW
+NFtsIuXGxBy/U+moUHuwSED04m7tUWVwriTTt2pP3Qkmg1CALjbvnllfxTgMyhQB
+urcW/WdxL0dXR5cx7yc0Ri5IYY8YH3IZj8o6oi0nrGn8nkmtoPhk8fbmpe+q/X/y
+lBY//lyiSO68vevns4g9aadVGDT9B7s9l7uUOeNiJwz1V/Ohtb7yciqqFmIGkRik
+KSyD/HKgZg8ub/8HBka8+Bx4UlgWYexEyLaB50HhowvaQTqRVoDUHsc1xmRS3r4=
+=fmB9
+-----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-3.2.2.ebuild b/mail-client/evolution/evolution-3.2.3-r1.ebuild
index 8d525d72307a..d26c9325ebe2 100644
--- a/mail-client/evolution/evolution-3.2.2.ebuild
+++ b/mail-client/evolution/evolution-3.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.2.2.ebuild,v 1.2 2012/02/10 03:29:22 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.2.3-r1.ebuild,v 1.1 2012/04/20 05:51:19 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -138,13 +138,14 @@ pkg_setup() {
 src_prepare() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=663077, requires eautoreconf
 	epatch "${FILESDIR}/${PN}-3.2.1-reorder-mx-clutter-gtk.patch"
+	# Fix build failure with glib-2.32
+	epatch "${FILESDIR}/${P}-gmodule-explicit.patch"
+	epatch "${FILESDIR}/${P}-g_thread_init.patch"
+	# Fix crashes and linking failure with gtkhtml-4.4
+	epatch "${FILESDIR}/${P}-gtkhtml-4.4.patch"
 	eautoreconf
 
 	gnome2_src_prepare
-
-	# Fix compilation flags crazyness
-	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure || die "CPPFLAGS sed failed"
 }
 
 pkg_postinst() {
diff --git a/mail-client/evolution/files/evolution-3.2.3-g_thread_init.patch b/mail-client/evolution/files/evolution-3.2.3-g_thread_init.patch
index d34d859994ce..915de364caf6 100644
--- a/mail-client/evolution/files/evolution-3.2.3-g_thread_init.patch
+++ b/mail-client/evolution/files/evolution-3.2.3-g_thread_init.patch
@@ -1,19 +1,21 @@
-From 8c67e84f9bf1803108f7a004513e37c6ef22d41f Mon Sep 17 00:00:00 2001
+From ed7f672fa38aa1528e9eca5419176e0f8a9583f6 Mon Sep 17 00:00:00 2001
 From: Milan Crha <mcrha@redhat.com>
 Date: Mon, 24 Oct 2011 09:42:48 +0200
 Subject: [PATCH] Call g_thread_init() conditionally
 
+[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 3.2.3]
 ---
  capplet/anjal-settings-main.c         |    2 ++
  capplet/settings/mail-guess-servers.c |    2 ++
+ plugins/backup-restore/backup.c       |    2 ++
  shell/main.c                          |    2 ++
- 3 files changed, 6 insertions(+), 0 deletions(-)
+ 4 files changed, 8 insertions(+), 0 deletions(-)
 
 diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c
-index 99e0b4a..91e3690 100644
+index 2bc3268..c810db3 100644
 --- a/capplet/anjal-settings-main.c
 +++ b/capplet/anjal-settings-main.c
-@@ -167,8 +167,10 @@ main (gint argc,
+@@ -168,8 +168,10 @@ main (gint argc,
  	if (!gtk_init_with_args (&argc, &argv, NULL, entries, NULL, &error))
  		g_error ("%s", error->message);
  
@@ -38,11 +40,25 @@ index 0b14494..0b15271 100644
  	g_type_init ();
  
  	provider = g_new0 (EmailProvider, 1);
+diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
+index 370608a..1e0ecb5 100644
+--- a/plugins/backup-restore/backup.c
++++ b/plugins/backup-restore/backup.c
+@@ -691,7 +691,9 @@ main (gint argc,
+ 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ 	textdomain (GETTEXT_PACKAGE);
+ 
++	#if !GLIB_CHECK_VERSION(2,31,0)
+ 	g_thread_init (NULL);
++	#endif
+ 
+ 	gtk_init_with_args (
+ 		&argc, &argv, NULL, options, (gchar *) GETTEXT_PACKAGE, &error);
 diff --git a/shell/main.c b/shell/main.c
-index bb056e3..5b76a2e 100644
+index 36e67d1..f0afc5a 100644
 --- a/shell/main.c
 +++ b/shell/main.c
-@@ -492,8 +492,10 @@ main (gint argc,
+@@ -509,8 +509,10 @@ main (gint argc,
  	textdomain (GETTEXT_PACKAGE);
  
  	g_type_init ();
diff --git a/mail-client/evolution/files/evolution-3.2.3-gtkhtml-4.4.patch b/mail-client/evolution/files/evolution-3.2.3-gtkhtml-4.4.patch
new file mode 100644
index 000000000000..24b6cf98ba88
--- /dev/null
+++ b/mail-client/evolution/files/evolution-3.2.3-gtkhtml-4.4.patch
@@ -0,0 +1,28 @@
+From 739cec4c2bfb1a89fd512315f573ef2313040c31 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 20 Apr 2012 01:39:35 -0400
+Subject: [PATCH] gtkhtml_editor_file_chooser_dialog_run() was removed in
+ gtkhtml-4.4
+
+It is no longer needed with gtk+-3.2.
+---
+ composer/e-composer-actions.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
+index 163270f..cd50f7a 100644
+--- a/composer/e-composer-actions.c
++++ b/composer/e-composer-actions.c
+@@ -218,8 +218,7 @@ action_save_as_cb (GtkAction *action,
+ 	gtk_window_set_icon_name (
+ 		GTK_WINDOW (dialog), "mail-message-new");
+ 
+-	response = gtkhtml_editor_file_chooser_dialog_run (
+-		GTKHTML_EDITOR (composer), dialog);
++	response = gtk_dialog_run (GTK_DIALOG (dialog));
+ 
+ 	if (response != GTK_RESPONSE_OK)
+ 		goto exit;
+-- 
+1.7.8.5
+