sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to test grimoire by Robin Cook

From: Robin Cook <scm AT mail.sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to test grimoire by Robin Cook
Date: Thu, 4 May 2006 23:50:39 -0500

GIT changes to test grimoire by Robin Cook <rcook AT wyrms.net>:

dev/null |binary
libs/libxml2/DETAILS | 2
libs/libxml2/HISTORY | 4 +
libs/libxml2/PRE_BUILD | 4 +
libs/libxml2/libxml2-2.6.23.tar.gz.sig | 0
libs/libxml2/libxml2-2.6.24.tar.gz.sig |binary
libs/libxml2/python-fix.patch | 70
+++++++++++++++++++++++++++++++++
7 files changed, 79 insertions(+), 1 deletion(-)

New commits:
commit 62a6b556025572762be3333c88acee957edd27c4
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

libxml2: updated to 2.6.24 and patch to fix building python module.

diff --git a/libs/libxml2/DETAILS b/libs/libxml2/DETAILS
index f685086..ef341df 100755
--- a/libs/libxml2/DETAILS
+++ b/libs/libxml2/DETAILS
@@ -1,5 +1,5 @@
SPELL=libxml2
- VERSION=2.6.23
+ VERSION=2.6.24
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://xmlsoft.org/sources/$SOURCE
diff --git a/libs/libxml2/HISTORY b/libs/libxml2/HISTORY
index 967dbc8..072716b 100644
--- a/libs/libxml2/HISTORY
+++ b/libs/libxml2/HISTORY
@@ -1,3 +1,7 @@
+2006-05-02 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.6.24
+ * PRE_BUILD: added to apply python fix patch
+
2006-04-08 Robin Cook <rcook AT wyrms.net>
* SUB_DEPENDS, PRE_SUB_DEPENDS added for python by gnome-desktop
bug 10791
diff --git a/libs/libxml2/PRE_BUILD b/libs/libxml2/PRE_BUILD
new file mode 100755
index 0000000..8fd3f98
--- /dev/null
+++ b/libs/libxml2/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+patch -p1 < ${SCRIPT_DIRECTORY}/python-fix.patch
diff --git a/libs/libxml2/libxml2-2.6.23.tar.gz.sig
b/libs/libxml2/libxml2-2.6.23.tar.gz.sig
deleted file mode 100644
index 5b89b3a..0000000
Binary files a/libs/libxml2/libxml2-2.6.23.tar.gz.sig and /dev/null differ
diff --git a/libs/libxml2/libxml2-2.6.24.tar.gz.sig
b/libs/libxml2/libxml2-2.6.24.tar.gz.sig
new file mode 100644
index 0000000..6f39d1e
Binary files /dev/null and b/libs/libxml2/libxml2-2.6.24.tar.gz.sig differ
diff --git a/libs/libxml2/python-fix.patch b/libs/libxml2/python-fix.patch
new file mode 100644
index 0000000..c2b7f0f
--- /dev/null
+++ b/libs/libxml2/python-fix.patch
@@ -0,0 +1,70 @@
+--- 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 Robin Cook, Robin Cook, 05/05/2006
- <Possible follow-up(s)>
- [SM-Commit] GIT changes to test grimoire by Robin Cook, Robin Cook, 05/05/2006
- [SM-Commit] GIT changes to test grimoire by Robin Cook, Robin Cook, 05/06/2006
- [SM-Commit] GIT changes to test grimoire by Robin Cook, Robin Cook, 05/06/2006
- [SM-Commit] GIT changes to test grimoire by Robin Cook, Robin Cook, 05/06/2006
  - Re: [SM-Commit] GIT changes to test grimoire by Robin Cook, seth, 05/06/2006
    - Re: [SM-Commit] GIT changes to test grimoire by Robin Cook, Jeremy Blosser, 05/06/2006
- [SM-Commit] GIT changes to test grimoire by Robin Cook, Robin Cook, 05/07/2006
  - Re: [SM-Commit] GIT changes to test grimoire by Robin Cook, Jeremy Blosser, 05/07/2006
- [SM-Commit] GIT changes to test grimoire by Robin Cook, Robin Cook, 05/07/2006
  - Re: [SM-Commit] GIT changes to test grimoire by Robin Cook, Arwed von Merkatz, 05/07/2006