Date: Saturday, October 20, 2012 @ 04:59:40 Author: heftig Revision: 169376
Actually apply that python2 patch Modified: pygobject2/trunk/PKGBUILD ----------+ PKGBUILD | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-10-20 08:42:34 UTC (rev 169375) +++ PKGBUILD 2012-10-20 08:59:40 UTC (rev 169376) @@ -4,7 +4,7 @@ pkgbase=pygobject2 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel) pkgver=2.28.6 -pkgrel=7 +pkgrel=8 arch=('i686' 'x86_64') url="http://www.pygtk.org/" license=('LGPL') @@ -20,9 +20,15 @@ '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a') build() { - cd "${srcdir}" + cd pygobject-$pkgver + + # patches available in 2.28 branch but unreleased. + patch -Np1 -i "${srcdir}/python2-fix-type.patch" + patch -Np1 -i "${srcdir}/python3-fix-build.patch" + patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch" + + cd .. cp -a "pygobject-${pkgver}" python2-build - mkdir devel ( cd python2-build @@ -33,11 +39,6 @@ ( cd "pygobject-${pkgver}" - #patches available in 2.28 branch but unreleased. - patch -Np1 -i "${srcdir}/python2-fix-type.patch" - patch -Np1 -i "${srcdir}/python3-fix-build.patch" - patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch" - ./configure --prefix=/usr --disable-introspection make ) @@ -49,7 +50,7 @@ replaces=('py3gobject') provides=("py3gobject=$pkgver") - cd "${srcdir}/pygobject-${pkgver}" + cd pygobject-${pkgver} make DESTDIR="${pkgdir}" install # Delete devel stuff @@ -62,25 +63,22 @@ replaces=('pygobject') provides=("pygobject=$pkgver") - cd "${srcdir}/python2-build" + cd python2-build make DESTDIR="${pkgdir}" install find "$pkgdir"/usr/share/pygobject -name '*.py' | \ xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" # Split devel stuff - mv "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}} \ - "$srcdir/devel/" + cd .. + mkdir -p devel/usr/{lib,share/pygobject} + mv {"$pkgdir",devel}/usr/include + mv {"$pkgdir",devel}/usr/lib/pkgconfig + mv {"$pkgdir",devel}/usr/share/gtk-doc + mv {"$pkgdir",devel}/usr/share/pygobject/xsl } package_pygobject2-devel() { pkgdesc="Development files for the pygobject bindings" - - cd "${srcdir}/devel" - mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject} - - mv include "$pkgdir/usr/" - mv pkgconfig "$pkgdir/usr/lib/" - mv gtk-doc "$pkgdir/usr/share/" - mv xsl "$pkgdir/usr/share/pygobject/" + mv devel/* "$pkgdir" }