[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (a9464714e00c99ed4722ed64459b9e42a72780c7)

Ladislav Hagara scm at sourcemage.org
Wed Jul 13 04:18:30 EDT 2011


GIT changes to master grimoire by Ladislav Hagara <hgr at vabo.cz>:

 mail/claws-mail/HISTORY                  |    4 ++++
 mail/claws-mail/PRE_BUILD                |    3 +++
 mail/claws-mail/claws-notify-crash.patch |   18 ++++++++++++++++++
 3 files changed, 25 insertions(+)

New commits:
commit a9464714e00c99ed4722ed64459b9e42a72780c7
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    claws-mail: added patch due to startup-notification 0.12

diff --git a/mail/claws-mail/HISTORY b/mail/claws-mail/HISTORY
index f0a8e97..ca75c1c 100644
--- a/mail/claws-mail/HISTORY
+++ b/mail/claws-mail/HISTORY
@@ -1,3 +1,7 @@
+2011-07-13 Ladislav Hagara <hgr at vabo.cz>
+	* PRE_BUILD, claws-notify-crash.patch: added patch from arch to work
+	  with startup-notification 0.12
+
 2011-04-12 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.7.9
 
diff --git a/mail/claws-mail/PRE_BUILD b/mail/claws-mail/PRE_BUILD
new file mode 100755
index 0000000..417374d
--- /dev/null
+++ b/mail/claws-mail/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/claws-notify-crash.patch
diff --git a/mail/claws-mail/claws-notify-crash.patch b/mail/claws-mail/claws-notify-crash.patch
new file mode 100644
index 0000000..e1d4eb6
--- /dev/null
+++ b/mail/claws-mail/claws-notify-crash.patch
@@ -0,0 +1,18 @@
+Index: src/main.c
+===================================================================
+RCS file: //claws/src/main.c,v
+retrieving revision 1.115.2.237
+retrieving revision 1.115.2.238
+diff -u -r1.115.2.237 -r1.115.2.238
+--- src/main.c	10 Apr 2011 17:19:04 -0000	1.115.2.237
++++ src/main.c	30 Apr 2011 19:27:15 -0000	1.115.2.238
+@@ -331,7 +331,7 @@
+ 		gtk_widget_show(hack);
+ 	}
+ 
+-	xdisplay = gdk_display_get_default();
++	xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
+ 	sn_display = sn_display_new(xdisplay,
+ 				sn_error_trap_push,
+ 				sn_error_trap_pop);
+


More information about the SM-Commit mailing list