sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Pol Vinogradov (17e7728529f61d1984c50fe3c5ae88fbdcb34b0a)
- From: Pol Vinogradov <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (17e7728529f61d1984c50fe3c5ae88fbdcb34b0a)
- Date: Thu, 26 Jul 2012 12:35:25 -0500
GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:
xfce/xfburn/HISTORY | 3 +++
xfce/xfburn/PRE_BUILD | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 17e7728529f61d1984c50fe3c5ae88fbdcb34b0a
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>
xfce/xfburn: apply glib232.patch to stable branch only
diff --git a/xfce/xfburn/HISTORY b/xfce/xfburn/HISTORY
index 587ca27..e1f6e70 100644
--- a/xfce/xfburn/HISTORY
+++ b/xfce/xfburn/HISTORY
@@ -1,3 +1,6 @@
+2012-07-26 Pol Vinogradov <vin.public AT gmail.com>
+ * PRE_BUILD: apply glib232.patch to stable branch only
+
2012-07-26 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: added to apply the patch
* glib232.patch: added, to fix build with recent glib2
diff --git a/xfce/xfburn/PRE_BUILD b/xfce/xfburn/PRE_BUILD
index 3d6b9dd..595d651 100755
--- a/xfce/xfburn/PRE_BUILD
+++ b/xfce/xfburn/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-patch -p0 < "$SPELL_DIRECTORY/glib232.patch"
+if [[ $XFBURN_BRANCH != scm ]]; then
+ patch -p0 < "$SPELL_DIRECTORY/glib232.patch"
+fi
- [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (17e7728529f61d1984c50fe3c5ae88fbdcb34b0a), Pol Vinogradov, 07/26/2012
Archive powered by MHonArc 2.6.24.