sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to test grimoire by Arwed v. Merkatz

From: "Arwed v. Merkatz" <scm AT mail.sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to test grimoire by Arwed v. Merkatz
Date: Fri, 5 May 2006 04:49:53 -0500

GIT changes to test grimoire by Arwed v. Merkatz <v.merkatz AT gmx.net>:

libs/libxml2/HISTORY | 3 +
libs/libxml2/PRE_BUILD | 4 --
libs/libxml2/python-fix.patch | 70
------------------------------------------
3 files changed, 3 insertions(+), 74 deletions(-)

New commits:
commit d8a0f21b3f63611281c2a0a8c68b1076f4aec83d
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

Removed python-fix.patch as it breaks the compile instead of fixing it

diff --git a/libs/libxml2/HISTORY b/libs/libxml2/HISTORY
index 072716b..73b0e26 100644
--- a/libs/libxml2/HISTORY
+++ b/libs/libxml2/HISTORY
@@ -1,3 +1,6 @@
+2006-05-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, python-fix.patch: removed, breaks the compile
+
2006-05-02 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.6.24
* PRE_BUILD: added to apply python fix patch
diff --git a/libs/libxml2/PRE_BUILD b/libs/libxml2/PRE_BUILD
deleted file mode 100755
index 8fd3f98..0000000
--- a/libs/libxml2/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-
-patch -p1 < ${SCRIPT_DIRECTORY}/python-fix.patch
diff --git a/libs/libxml2/python-fix.patch b/libs/libxml2/python-fix.patch
deleted file mode 100644
index c2b7f0f..0000000
--- a/libs/libxml2/python-fix.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- libxml2-2.6.24-orig/configure 2006-05-04 23:14:58.000000000 -0500
-+++ libxml2-2.6.24/configure 2006-05-04 23:16:48.000000000 -0500
-@@ -26935,17 +26935,17 @@
- -d $with_python/lib/python$PYTHON_VERSION/site-packages
- then
- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
--
PYTHON_SITE_PACKAGES='$(libdir)/lib/python$(PYTHON_VERSION)/site-packages'
-+
PYTHON_SITE_PACKAGES='$libdir/lib/python$PYTHON_VERSION/site-packages'
- else
- if test -r $prefix/include/python$PYTHON_VERSION/Python.h
- then
- PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION
--
PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
-+
PYTHON_SITE_PACKAGES='$libdir/python$PYTHON_VERSION/site-packages'
- else
- if test -r /usr/include/python$PYTHON_VERSION/Python.h
- then
- PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION
--
PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
-+
PYTHON_SITE_PACKAGES='$libdir/python$PYTHON_VERSION/site-packages'
- else
- echo could not find python$PYTHON_VERSION/Python.h
- fi
-@@ -26958,9 +26958,9 @@
- fi
- if test "$with_python" != ""
- then
-- pythondir=$(PYTHON_SITE_PACKAGES)
-+ pythondir=$PYTHON_SITE_PACKAGES
- else
-- pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages'
-+ pythondir='$libdir/python$PYTHON_VERSION/site-packages'
- fi
- else
- PYTHON=
---- libxml2-2.6.24-orig/configure.in 2006-05-04 23:14:58.000000000 -0500
-+++ libxml2-2.6.24/configure.in 2006-05-04 23:28:06.000000000 -0500
-@@ -678,17 +678,17 @@
- -d $with_python/lib/python$PYTHON_VERSION/site-packages
- then
- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
--
PYTHON_SITE_PACKAGES='$(libdir)/lib/python$(PYTHON_VERSION)/site-packages'
-+
PYTHON_SITE_PACKAGES='$libdir/lib/python$PYTHON_VERSION/site-packages'
- else
- if test -r $prefix/include/python$PYTHON_VERSION/Python.h
- then
- PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION
--
PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
-+
PYTHON_SITE_PACKAGES='$libdir/python$PYTHON_VERSION/site-packages'
- else
- if test -r /usr/include/python$PYTHON_VERSION/Python.h
- then
- PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION
--
PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
-+
PYTHON_SITE_PACKAGES='$libdir/python$PYTHON_VERSION/site-packages'
- else
- echo could not find python$PYTHON_VERSION/Python.h
- fi
-@@ -701,9 +701,9 @@
- fi
- if test "$with_python" != ""
- then
-- pythondir=$(PYTHON_SITE_PACKAGES)
-+ pythondir=$PYTHON_SITE_PACKAGES
- else
-- pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages'
-+ pythondir='$libdir/python$PYTHON_VERSION/site-packages'
- fi
- else
- PYTHON=

[SM-Commit] GIT changes to test grimoire by Arwed v. Merkatz, Arwed v. Merkatz, 05/03/2006
- <Possible follow-up(s)>
- [SM-Commit] GIT changes to test grimoire by Arwed v. Merkatz, Arwed v. Merkatz, 05/05/2006
- [SM-Commit] GIT changes to test grimoire by Arwed v. Merkatz, Arwed v. Merkatz, 05/06/2006
- [SM-Commit] GIT changes to test grimoire by Arwed v. Merkatz, Arwed v. Merkatz, 05/19/2006
- [SM-Commit] GIT changes to test grimoire by Arwed v. Merkatz, Arwed v. Merkatz, 05/19/2006
- [SM-Commit] GIT changes to test grimoire by Arwed v. Merkatz, Arwed v. Merkatz, 05/20/2006
- [SM-Commit] GIT changes to test grimoire by Arwed v. Merkatz, Arwed v. Merkatz, 05/24/2006