Skip to Content.
Sympa Menu

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

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 (34b66e5e6bb06fc8b1218b9cbf127f76df995fa5)
  • Date: Fri, 28 Mar 2008 14:41:33 -0500

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

gnome2-apps/pan/HISTORY | 4 ++++
gnome2-apps/pan/PRE_BUILD | 1 +
gnome2-apps/pan/glib.patch | 11 +++++++++++
3 files changed, 16 insertions(+)

New commits:
commit 34b66e5e6bb06fc8b1218b9cbf127f76df995fa5
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

pan: Updated to compile with latest glib2

diff --git a/gnome2-apps/pan/HISTORY b/gnome2-apps/pan/HISTORY
index 957b8c9..9133129 100644
--- a/gnome2-apps/pan/HISTORY
+++ b/gnome2-apps/pan/HISTORY
@@ -1,3 +1,7 @@
+2008-03-28 George Sherwood <george AT beernabeer.com>
+ * PRE_BUILD: Added patch
+ * glib.patch: Added patch to fix compile problem with glib2 2.16.x
+
2007-08-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: fixed svn SOURCE_DIRECTORY

diff --git a/gnome2-apps/pan/PRE_BUILD b/gnome2-apps/pan/PRE_BUILD
index a14b50c..a1eeb06 100755
--- a/gnome2-apps/pan/PRE_BUILD
+++ b/gnome2-apps/pan/PRE_BUILD
@@ -1,5 +1,6 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
+patch -p0 < $SCRIPT_DIRECTORY/glib.patch &&
if [ "$REL" == "cvs" ]; then
NOCONFIGURE=Y ./autogen.sh
fi
diff --git a/gnome2-apps/pan/glib.patch b/gnome2-apps/pan/glib.patch
new file mode 100644
index 0000000..c237251
--- /dev/null
+++ b/gnome2-apps/pan/glib.patch
@@ -0,0 +1,11 @@
+--- pan/data-impl/my-tree.cc.orig 2008-03-28 22:22:43.000000000 +0400
++++ pan/data-impl/my-tree.cc 2008-03-28 22:23:34.000000000 +0400
+@@ -19,7 +19,7 @@
+
+ #include <config.h>
+ #include <cassert>
+-#include <glib/gmessages.h> // for g_assert
++#include <glib/gtestutils.h> // for g_assert
+ #include <pan/general/debug.h>
+ #include <pan/general/foreach.h>
+ #include <pan/general/quark.h>



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (34b66e5e6bb06fc8b1218b9cbf127f76df995fa5), George Sherwood, 03/28/2008

Archive powered by MHonArc 2.6.24.

Top of Page