[SM-Commit] GIT changes to master grimoire by George Sherwood (3722306a243841f681d78c789c6ac7608abb9b54)
George Sherwood
scm at sourcemage.org
Tue Jul 8 22:35:17 EDT 2008
GIT changes to master grimoire by George Sherwood <gsherwood at sourcemage.org>:
gnome2-apps/pan/HISTORY | 3 +++
gnome2-apps/pan/PRE_BUILD | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 3722306a243841f681d78c789c6ac7608abb9b54
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>
pan: Do not apply glib2 patch for svn version. Author has started
development again after a year off.
diff --git a/gnome2-apps/pan/HISTORY b/gnome2-apps/pan/HISTORY
index 9133129..70006a7 100644
--- a/gnome2-apps/pan/HISTORY
+++ b/gnome2-apps/pan/HISTORY
@@ -1,3 +1,6 @@
+2008-07-08 George Sherwood <george at beernabeer.com>
+ * PRE_BUILD: Do not patch the cvs version for glib2
+
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
diff --git a/gnome2-apps/pan/PRE_BUILD b/gnome2-apps/pan/PRE_BUILD
index a1eeb06..88ca91f 100755
--- a/gnome2-apps/pan/PRE_BUILD
+++ b/gnome2-apps/pan/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p0 < $SCRIPT_DIRECTORY/glib.patch &&
+if [ "$REL" != "cvs" ]; then
+patch -p0 < $SCRIPT_DIRECTORY/glib.patch
+fi &&
if [ "$REL" == "cvs" ]; then
NOCONFIGURE=Y ./autogen.sh
fi
More information about the SM-Commit
mailing list