[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (dabedbd5a1b90c9c6b3d3784d6ccd5e12c3c31c6)

Vlad Glagolev scm at sourcemage.org
Fri Nov 28 08:17:02 EST 2008


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 mail/sylpheed/HISTORY      |    5 ++++
 mail/sylpheed/PRE_BUILD    |    8 ++++--
 mail/sylpheed/patch-gtk    |   50 ++++++++++++++++++++++++++++++++++++++++++
 mail/sylpheed/patch-socket |   53 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 113 insertions(+), 3 deletions(-)

New commits:
commit dabedbd5a1b90c9c6b3d3784d6ccd5e12c3c31c6
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    sylpheed: fixed compilation with new libs

diff --git a/mail/sylpheed/HISTORY b/mail/sylpheed/HISTORY
index 32e72d6..41280fd 100644
--- a/mail/sylpheed/HISTORY
+++ b/mail/sylpheed/HISTORY
@@ -1,3 +1,8 @@
+2008-11-26 Vlad Glagolev <stealth at sourcemage.org>
+	* PRE_BUILD: fixed libsylph to not redefine SOCK_NONBLOCK, which would
+	  conflict with /usr/include/bits/socket.h; compilation with new GTK+2
+	* patch-{socket,gtk}: added
+
 2008-06-17 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 2.5.0, fixed website, source url
 
diff --git a/mail/sylpheed/PRE_BUILD b/mail/sylpheed/PRE_BUILD
index e7794a1..82c11a8 100755
--- a/mail/sylpheed/PRE_BUILD
+++ b/mail/sylpheed/PRE_BUILD
@@ -1,8 +1,10 @@
 default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+cd "$SOURCE_DIRECTORY" &&
 
-patch -p0 < $SPELL_DIRECTORY/patch-gtkspell &&
+patch -p0 < "$SPELL_DIRECTORY/patch-gtkspell" &&
+patch -p0 < "$SPELL_DIRECTORY/patch-socket" &&
+patch -p0 < "$SPELL_DIRECTORY/patch-gtk" &&
 
 if [[ $NO_USERAGENT == y ]]; then
-  patch -p0 < $SPELL_DIRECTORY/patch-src_compose_c
+  patch -p0 < "$SPELL_DIRECTORY/patch-src_compose_c"
 fi
diff --git a/mail/sylpheed/patch-gtk b/mail/sylpheed/patch-gtk
new file mode 100644
index 0000000..da140f1
--- /dev/null
+++ b/mail/sylpheed/patch-gtk
@@ -0,0 +1,50 @@
+--- src/addr_compl.c.orig	2008-03-13 08:15:07.000000000 +0100
++++ src/addr_compl.c	2008-06-10 14:54:24.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include <gtk/gtkwindow.h>
+ #include <gtk/gtkentry.h>
+ #include <gtk/gtkeditable.h>
++#include <gtk/gtk.h>
+ #include <gtk/gtkclist.h>
+ #include <gtk/gtkscrolledwindow.h>
+ 
+--- src/editgroup.c.orig	2007-03-28 03:30:15.000000000 +0200
++++ src/editgroup.c	2008-06-10 14:57:20.000000000 +0200
+@@ -27,6 +27,7 @@
+ #include <glib/gi18n.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <gtk/gtkwindow.h>
++#include <gtk/gtk.h>
+ #include <gtk/gtkclist.h>
+ #include <gtk/gtkvbox.h>
+ #include <gtk/gtkstatusbar.h>
+--- src/prefs_display_items.c.orig	2007-09-20 04:17:58.000000000 +0200
++++ src/prefs_display_items.c	2008-06-10 14:37:44.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include <gtk/gtkwindow.h>
+ #include <gtk/gtkvbox.h>
+ #include <gtk/gtkhbox.h>
++#include <gtk/gtk.h>
+ #include <gtk/gtkclist.h>
+ #include <gtk/gtkbutton.h>
+ #include <gtk/gtkstock.h>
+--- src/prefs_summary_column.c.orig	2007-09-12 08:56:55.000000000 +0200
++++ src/prefs_summary_column.c	2008-06-10 14:36:12.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include <gtk/gtkwindow.h>
+ #include <gtk/gtkvbox.h>
+ #include <gtk/gtkhbox.h>
++#include <gtk/gtk.h>
+ #include <gtk/gtkclist.h>
+ #include <gtk/gtkbutton.h>
+ #include <gtk/gtkstock.h>
+--- src/select-keys.c.orig	2008-05-16 11:19:55.000000000 +0200
++++ src/select-keys.c	2008-06-10 14:58:13.000000000 +0200
+@@ -33,6 +33,7 @@
+ #include <gtk/gtkscrolledwindow.h>
+ #include <gtk/gtkvbox.h>
+ #include <gtk/gtkhbox.h>
++#include <gtk/gtk.h>
+ #include <gtk/gtkclist.h>
+ #include <gtk/gtklabel.h>
+ #include <gtk/gtkentry.h>
diff --git a/mail/sylpheed/patch-socket b/mail/sylpheed/patch-socket
new file mode 100644
index 0000000..a38dbed
--- /dev/null
+++ b/mail/sylpheed/patch-socket
@@ -0,0 +1,53 @@
+--- libsylph/socket.c.orig	2008-02-15 09:32:49.000000000 +0100
++++ libsylph/socket.c	2008-08-28 19:01:35.000000000 +0200
+@@ -383,9 +383,9 @@
+ 	sock = sock_find_from_fd(fd);
+ 	if (sock) {
+ 		if (nonblock) {
+-			SOCK_SET_FLAGS(sock->flags, SOCK_NONBLOCK);
++			SOCK_SET_FLAGS(sock->flags, LIBSYLPH_SOCK_NONBLOCK);
+ 		} else {
+-			SOCK_UNSET_FLAGS(sock->flags, SOCK_NONBLOCK);
++			SOCK_UNSET_FLAGS(sock->flags, LIBSYLPH_SOCK_NONBLOCK);
+ 		}
+ 	}
+ 	debug_print("set nonblocking mode to %d\n", nonblock);
+@@ -418,9 +418,9 @@
+ 	ret = set_nonblocking_mode(sock->sock, nonblock);
+ 	if (ret == 0) {
+ 		if (nonblock) {
+-			SOCK_SET_FLAGS(sock->flags, SOCK_NONBLOCK);
++			SOCK_SET_FLAGS(sock->flags, LIBSYLPH_SOCK_NONBLOCK);
+ 		} else {
+-			SOCK_UNSET_FLAGS(sock->flags, SOCK_NONBLOCK);
++			SOCK_UNSET_FLAGS(sock->flags, LIBSYLPH_SOCK_NONBLOCK);
+ 		}
+ 	}
+ 
+@@ -950,7 +950,7 @@
+ 	sockinfo->hostname = g_strdup(conn_data->hostname);
+ 	sockinfo->port = conn_data->port;
+ 	sockinfo->state = CONN_ESTABLISHED;
+-	sockinfo->flags = SOCK_NONBLOCK;
++	sockinfo->flags = LIBSYLPH_SOCK_NONBLOCK;
+ 
+ 	sock_list = g_list_prepend(sock_list, sockinfo);
+ 
+--- libsylph/socket.h.orig	2007-06-11 10:06:45.000000000 +0200
++++ libsylph/socket.h	2008-08-28 19:01:34.000000000 +0200
+@@ -46,13 +46,13 @@
+ 
+ typedef enum
+ {
+-	SOCK_NONBLOCK	= 1 << 0,
++	LIBSYLPH_SOCK_NONBLOCK	= 1 << 0,
+ 	SOCK_CHECK_IO	= 1 << 1
+ } SockFlags;
+ 
+ #define SOCK_SET_FLAGS(flags, set)	{ (flags) |= (set); }
+ #define SOCK_UNSET_FLAGS(flags, set)	{ (flags) &= ~(set); }
+-#define SOCK_IS_NONBLOCK(flags)		((flags & SOCK_NONBLOCK) != 0)
++#define SOCK_IS_NONBLOCK(flags)		((flags & LIBSYLPH_SOCK_NONBLOCK) != 0)
+ #define SOCK_IS_CHECK_IO(flags)		((flags & SOCK_CHECK_IO) != 0)
+ 
+ typedef gint (*SockConnectFunc)		(SockInfo	*sock,



More information about the SM-Commit mailing list