| 1 |
tetromino 12/04/20 05:51:19 |
| 2 |
|
| 3 |
Modified: evolution-3.2.3-g_thread_init.patch |
| 4 |
Added: evolution-3.2.3-gtkhtml-4.4.patch |
| 5 |
Log: |
| 6 |
Improve glib-2.32 fix (bug #412239, thanks to Dmitry K). Fix crash and build failure with gtkhtml-4.4. Drop old. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 mail-client/evolution/files/evolution-3.2.3-g_thread_init.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/files/evolution-3.2.3-g_thread_init.patch?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/files/evolution-3.2.3-g_thread_init.patch?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/files/evolution-3.2.3-g_thread_init.patch?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: evolution-3.2.3-g_thread_init.patch |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/mail-client/evolution/files/evolution-3.2.3-g_thread_init.patch,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- evolution-3.2.3-g_thread_init.patch 16 Apr 2012 18:14:52 -0000 1.1 |
| 24 |
+++ evolution-3.2.3-g_thread_init.patch 20 Apr 2012 05:51:19 -0000 1.2 |
| 25 |
@@ -1,19 +1,21 @@ |
| 26 |
-From 8c67e84f9bf1803108f7a004513e37c6ef22d41f Mon Sep 17 00:00:00 2001 |
| 27 |
+From ed7f672fa38aa1528e9eca5419176e0f8a9583f6 Mon Sep 17 00:00:00 2001 |
| 28 |
From: Milan Crha <mcrha@××××××.com> |
| 29 |
Date: Mon, 24 Oct 2011 09:42:48 +0200 |
| 30 |
Subject: [PATCH] Call g_thread_init() conditionally |
| 31 |
|
| 32 |
+[Alexandre Rostovtsev <tetromino@g.o>: backport to 3.2.3] |
| 33 |
--- |
| 34 |
capplet/anjal-settings-main.c | 2 ++ |
| 35 |
capplet/settings/mail-guess-servers.c | 2 ++ |
| 36 |
+ plugins/backup-restore/backup.c | 2 ++ |
| 37 |
shell/main.c | 2 ++ |
| 38 |
- 3 files changed, 6 insertions(+), 0 deletions(-) |
| 39 |
+ 4 files changed, 8 insertions(+), 0 deletions(-) |
| 40 |
|
| 41 |
diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c |
| 42 |
-index 99e0b4a..91e3690 100644 |
| 43 |
+index 2bc3268..c810db3 100644 |
| 44 |
--- a/capplet/anjal-settings-main.c |
| 45 |
+++ b/capplet/anjal-settings-main.c |
| 46 |
-@@ -167,8 +167,10 @@ main (gint argc, |
| 47 |
+@@ -168,8 +168,10 @@ main (gint argc, |
| 48 |
if (!gtk_init_with_args (&argc, &argv, NULL, entries, NULL, &error)) |
| 49 |
g_error ("%s", error->message); |
| 50 |
|
| 51 |
@@ -38,11 +40,25 @@ |
| 52 |
g_type_init (); |
| 53 |
|
| 54 |
provider = g_new0 (EmailProvider, 1); |
| 55 |
+diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c |
| 56 |
+index 370608a..1e0ecb5 100644 |
| 57 |
+--- a/plugins/backup-restore/backup.c |
| 58 |
++++ b/plugins/backup-restore/backup.c |
| 59 |
+@@ -691,7 +691,9 @@ main (gint argc, |
| 60 |
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); |
| 61 |
+ textdomain (GETTEXT_PACKAGE); |
| 62 |
+ |
| 63 |
++ #if !GLIB_CHECK_VERSION(2,31,0) |
| 64 |
+ g_thread_init (NULL); |
| 65 |
++ #endif |
| 66 |
+ |
| 67 |
+ gtk_init_with_args ( |
| 68 |
+ &argc, &argv, NULL, options, (gchar *) GETTEXT_PACKAGE, &error); |
| 69 |
diff --git a/shell/main.c b/shell/main.c |
| 70 |
-index bb056e3..5b76a2e 100644 |
| 71 |
+index 36e67d1..f0afc5a 100644 |
| 72 |
--- a/shell/main.c |
| 73 |
+++ b/shell/main.c |
| 74 |
-@@ -492,8 +492,10 @@ main (gint argc, |
| 75 |
+@@ -509,8 +509,10 @@ main (gint argc, |
| 76 |
textdomain (GETTEXT_PACKAGE); |
| 77 |
|
| 78 |
g_type_init (); |
| 79 |
|
| 80 |
|
| 81 |
|
| 82 |
1.1 mail-client/evolution/files/evolution-3.2.3-gtkhtml-4.4.patch |
| 83 |
|
| 84 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/files/evolution-3.2.3-gtkhtml-4.4.patch?rev=1.1&view=markup |
| 85 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/files/evolution-3.2.3-gtkhtml-4.4.patch?rev=1.1&content-type=text/plain |
| 86 |
|
| 87 |
Index: evolution-3.2.3-gtkhtml-4.4.patch |
| 88 |
=================================================================== |
| 89 |
From 739cec4c2bfb1a89fd512315f573ef2313040c31 Mon Sep 17 00:00:00 2001 |
| 90 |
From: Alexandre Rostovtsev <tetromino@g.o> |
| 91 |
Date: Fri, 20 Apr 2012 01:39:35 -0400 |
| 92 |
Subject: [PATCH] gtkhtml_editor_file_chooser_dialog_run() was removed in |
| 93 |
gtkhtml-4.4 |
| 94 |
|
| 95 |
It is no longer needed with gtk+-3.2. |
| 96 |
--- |
| 97 |
composer/e-composer-actions.c | 3 +-- |
| 98 |
1 files changed, 1 insertions(+), 2 deletions(-) |
| 99 |
|
| 100 |
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c |
| 101 |
index 163270f..cd50f7a 100644 |
| 102 |
--- a/composer/e-composer-actions.c |
| 103 |
+++ b/composer/e-composer-actions.c |
| 104 |
@@ -218,8 +218,7 @@ action_save_as_cb (GtkAction *action, |
| 105 |
gtk_window_set_icon_name ( |
| 106 |
GTK_WINDOW (dialog), "mail-message-new"); |
| 107 |
|
| 108 |
- response = gtkhtml_editor_file_chooser_dialog_run ( |
| 109 |
- GTKHTML_EDITOR (composer), dialog); |
| 110 |
+ response = gtk_dialog_run (GTK_DIALOG (dialog)); |
| 111 |
|
| 112 |
if (response != GTK_RESPONSE_OK) |
| 113 |
goto exit; |
| 114 |
-- |
| 115 |
1.7.8.5 |
Archives