[arch-commits] Commit in python/repos (4 files)

[Allan McRae]

    Date: Monday, October 27, 2008 @ 09:12:14
  Author: allan
Revision: 17265

Merged revisions 17263 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/python/trunk

........
  r17263 | allan | 2008-10-27 11:17:42 +0000 (Mon, 27 Oct 2008) | 1 line
  
  upgpkg: python 2.6-2
........

Added:
  python/repos/testing-x86_64/ChangeLog
    (from rev 17263, python/trunk/ChangeLog)
  python/repos/testing-x86_64/python-2.6-internal-expat.patch
    (from rev 17263, python/trunk/python-2.6-internal-expat.patch)
Modified:
  python/repos/testing-x86_64/	(properties)
  python/repos/testing-x86_64/PKGBUILD

---------------------------------+
 ChangeLog                       |    3 +++
 PKGBUILD                        |    8 ++++++--
 python-2.6-internal-expat.patch |   33 +++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 2 deletions(-)


Property changes on: python/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /python/trunk:1-16934
   + /python/trunk:1-17264

Copied: python/repos/testing-x86_64/ChangeLog (from rev 17263, python/trunk/ChangeLog)
===================================================================
--- testing-x86_64/ChangeLog	                        (rev 0)
+++ testing-x86_64/ChangeLog	2008-10-27 13:12:14 UTC (rev 17265)
@@ -0,0 +1,3 @@
+2008-10-27  Allan McRae <allan at archlinux.org>
+	* python 2.6-2
+	* patched to use internal expat
\ No newline at end of file

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-10-27 11:19:06 UTC (rev 17264)
+++ testing-x86_64/PKGBUILD	2008-10-27 13:12:14 UTC (rev 17265)
@@ -4,7 +4,7 @@
 
 pkgname=python
 pkgver=2.6
-pkgrel=1
+pkgrel=2
 _pybasever=2.6
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
@@ -16,15 +16,19 @@
 provides=('python-elementtree' 'python-ctypes')
 replaces=('python-elementtree' 'python-ctypes')
 source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2
+	python-2.6-internal-expat.patch
 	modulator-launcher
 	pynche-launcher)
 md5sums=('1b3c31fc54be2250ed18eb089b4d2779'
+         '993800dbcc0c4f199c1ceee998a06e71'
          'faa0d4b947bfe67fc8684b5c464f46f2'
          '60a44af1d8af276274e20c564c0f3d8b')
 
 build() {
-  cd ${startdir}/src/Python-${pkgver}
+  cd ${srcdir}/Python-${pkgver}
 
+  patch -Np0 -i ${srcdir}/python-2.6-internal-expat.patch
+
   ./configure --prefix=/usr --enable-shared --with-threads --enable-unicode
   
   # temporary backwards compatibility stuff...

Copied: python/repos/testing-x86_64/python-2.6-internal-expat.patch (from rev 17263, python/trunk/python-2.6-internal-expat.patch)
===================================================================
--- testing-x86_64/python-2.6-internal-expat.patch	                        (rev 0)
+++ testing-x86_64/python-2.6-internal-expat.patch	2008-10-27 13:12:14 UTC (rev 17265)
@@ -0,0 +1,33 @@
+--- setup.py    2008-04-22 12:12:24.613554757 +0300
++++ setup.py    2008-04-22 12:13:09.276544063 +0300
+@@ -1035,18 +1035,15 @@
+         #
+         # More information on Expat can be found at www.libexpat.org.
+         #
+-        expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')
+-        define_macros = [
+-            ('HAVE_EXPAT_CONFIG_H', '1'),
+-        ]
++        # Use system expat
++        expatinc = '/usr/include'
++        define_macros = []
+
+         exts.append(Extension('pyexpat',
+                               define_macros = define_macros,
+                               include_dirs = [expatinc],
++                              libraries = ['expat'],
+                               sources = ['pyexpat.c',
+-                                         'expat/xmlparse.c',
+-                                         'expat/xmlrole.c',
+-                                         'expat/xmltok.c',
+                                          ],
+                               ))
+
+@@ -1058,6 +1055,7 @@
+             exts.append(Extension('_elementtree',
+                                   define_macros = define_macros,
+                                   include_dirs = [expatinc],
++                                  libraries = ['expat'],
+                                   sources = ['_elementtree.c'],
+                                   ))
+