Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (575f7aad35c57a05b70c548510b4b4a939fb0925)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (575f7aad35c57a05b70c548510b4b4a939fb0925)
  • Date: Sun, 7 Sep 2008 11:00:57 -0500

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

mail/claws-mail/HISTORY | 4 +
mail/claws-mail/PRE_BUILD | 3 +
mail/claws-mail/claws-mail-gtk.patch | 74
+++++++++++++++++++++++++++++++++++
3 files changed, 81 insertions(+)

New commits:
commit 575f7aad35c57a05b70c548510b4b4a939fb0925
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

claws-mail: Added upstream patch to allow it to build
with gtk 2.14.1 and glib 2.18.0

diff --git a/mail/claws-mail/HISTORY b/mail/claws-mail/HISTORY
index 4a2ea08..900d7cb 100644
--- a/mail/claws-mail/HISTORY
+++ b/mail/claws-mail/HISTORY
@@ -1,3 +1,7 @@
+2008-09-07 George Sherwood <gsherwood AT sourcemage.org>
+ * PRE_BUILD: Added to apply upstream patch
+ * claws-mail-gtk.patch: Upstream patch to fix compile with gtk 2.14.1
+
2008-06-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.5.0

diff --git a/mail/claws-mail/PRE_BUILD b/mail/claws-mail/PRE_BUILD
new file mode 100755
index 0000000..2496969
--- /dev/null
+++ b/mail/claws-mail/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/claws-mail-gtk.patch
diff --git a/mail/claws-mail/claws-mail-gtk.patch
b/mail/claws-mail/claws-mail-gtk.patch
new file mode 100644
index 0000000..a9ad2dd
--- /dev/null
+++ b/mail/claws-mail/claws-mail-gtk.patch
@@ -0,0 +1,74 @@
+Index: src/plugins/pgpcore/passphrase.c
+===================================================================
+RCS file: /srv/cvs/claws-mail/claws/src/plugins/pgpcore/Attic/passphrase.c,v
+retrieving revision 1.1.2.29
+retrieving revision 1.1.2.30
+diff -u -r1.1.2.29 -r1.1.2.30
+--- src/plugins/pgpcore/passphrase.c 10 Jan 2008 17:45:25 -0000
1.1.2.29
++++ src/plugins/pgpcore/passphrase.c 5 Jul 2008 10:02:55 -0000
1.1.2.30
+@@ -30,17 +30,7 @@
+ #ifdef GDK_WINDOWING_X11
+ # include <gdk/gdkx.h>
+ #endif /* GDK_WINDOWING_X11 */
+-#include <gtk/gtkmain.h>
+-#include <gtk/gtkwidget.h>
+-#include <gtk/gtkwindow.h>
+-#include <gtk/gtkvbox.h>
+-#include <gtk/gtktable.h>
+-#include <gtk/gtklabel.h>
+-#include <gtk/gtkentry.h>
+-#include <gtk/gtkhbbox.h>
+-#include <gtk/gtkbutton.h>
+-#include <gtk/gtkfilesel.h>
+-#include <gtk/gtksignal.h>
++#include <gtk/gtk.h>
+ #include <string.h>
+ #include <sys/types.h>
+ #ifdef G_OS_WIN32
+Index: src/plugins/pgpcore/prefs_gpg.c
+===================================================================
+RCS file: /srv/cvs/claws-mail/claws/src/plugins/pgpcore/Attic/prefs_gpg.c,v
+retrieving revision 1.1.2.28
+retrieving revision 1.1.2.29
+diff -u -r1.1.2.28 -r1.1.2.29
+--- src/plugins/pgpcore/prefs_gpg.c 4 Oct 2007 17:36:48 -0000
1.1.2.28
++++ src/plugins/pgpcore/prefs_gpg.c 5 Jul 2008 10:02:55 -0000
1.1.2.29
+@@ -22,8 +22,7 @@
+ #include <glib/gi18n.h>
+
+ #include "defs.h"
+-#include "utils.h"
+-#include "gtk/gtkutils.h"
++#include "utils.h"
+ #include "prefs.h"
+ #include "prefs_gtk.h"
+ #include "prefs_gpg.h"
+Index: src/plugins/pgpcore/select-keys.c
+===================================================================
+RCS file: /srv/cvs/claws-mail/claws/src/plugins/pgpcore/Attic/select-keys.c,v
+retrieving revision 1.1.2.19
+retrieving revision 1.1.2.20
+diff -u -r1.1.2.19 -r1.1.2.20
+--- src/plugins/pgpcore/select-keys.c 17 Oct 2007 16:03:01 -0000
1.1.2.19
++++ src/plugins/pgpcore/select-keys.c 5 Jul 2008 10:02:56 -0000
1.1.2.20
+@@ -27,19 +27,7 @@
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include <gdk/gdkkeysyms.h>
+-#include <gtk/gtkmain.h>
+-#include <gtk/gtkwidget.h>
+-#include <gtk/gtkwindow.h>
+-#include <gtk/gtkscrolledwindow.h>
+-#include <gtk/gtkvbox.h>
+-#include <gtk/gtkhbox.h>
+-#include <gtk/gtkclist.h>
+-#include <gtk/gtklabel.h>
+-#include <gtk/gtkentry.h>
+-#include <gtk/gtkhbbox.h>
+-#include <gtk/gtkbutton.h>
+-#include <gtk/gtkstock.h>
+-
++#include <gtk/gtk.h>
+ #include "select-keys.h"
+ #include "utils.h"
+ #include "gtkutils.h"



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (575f7aad35c57a05b70c548510b4b4a939fb0925), George Sherwood, 09/07/2008

Archive powered by MHonArc 2.6.24.

Top of Page