Date: Friday, September 2, 2011 @ 07:31:09 Author: ibiru Revision: 136844
archrelease: copy trunk to extra-i686, extra-x86_64 Added: pygobject2/repos/extra-i686/PKGBUILD (from rev 136843, pygobject2/trunk/PKGBUILD) pygobject2/repos/extra-i686/python3-fix-build.patch (from rev 136843, pygobject2/trunk/python3-fix-build.patch) pygobject2/repos/extra-i686/python3-fix-maketrans.patch (from rev 136843, pygobject2/trunk/python3-fix-maketrans.patch) pygobject2/repos/extra-x86_64/PKGBUILD (from rev 136843, pygobject2/trunk/PKGBUILD) pygobject2/repos/extra-x86_64/python3-fix-build.patch (from rev 136843, pygobject2/trunk/python3-fix-build.patch) pygobject2/repos/extra-x86_64/python3-fix-maketrans.patch (from rev 136843, pygobject2/trunk/python3-fix-maketrans.patch) Deleted: pygobject2/repos/extra-i686/PKGBUILD pygobject2/repos/extra-i686/python3-fix-build.patch pygobject2/repos/extra-i686/python3-fix-maketrans.patch pygobject2/repos/extra-x86_64/PKGBUILD pygobject2/repos/extra-x86_64/python3-fix-build.patch pygobject2/repos/extra-x86_64/python3-fix-maketrans.patch ------------------------------------------+ extra-i686/PKGBUILD | 172 +++++++++++++++-------------- extra-i686/python3-fix-build.patch | 68 +++++------ extra-i686/python3-fix-maketrans.patch | 72 ++++++------ extra-x86_64/PKGBUILD | 172 +++++++++++++++-------------- extra-x86_64/python3-fix-build.patch | 68 +++++------ extra-x86_64/python3-fix-maketrans.patch | 72 ++++++------ 6 files changed, 318 insertions(+), 306 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-09-02 11:28:12 UTC (rev 136843) +++ extra-i686/PKGBUILD 2011-09-02 11:31:09 UTC (rev 136844) @@ -1,83 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgbase=pygobject -pkgname=(pygobject py3gobject pygobject-devel) -pkgver=2.28.6 -pkgrel=1 -arch=('i686' 'x86_64') -license=('LGPL') -depends=('glib2' 'gobject-introspection') -makedepends=(python python2 python-cairo python2-cairo) -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz - python3-fix-build.patch - python3-fix-maketrans.patch) -options=('!libtool') -url="http://www.pygtk.org/" -sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8' - 'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca' - '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a') - -build() { - cd "${srcdir}" - cp -a "${pkgbase}-${pkgver}" python2-build - mkdir devel - - ( - cd python2-build - export PYTHON=/usr/bin/python2 - ./configure --prefix=/usr - make - ) - - ( - cd "${pkgbase}-${pkgver}" - #patches available in 2.28 branch but unreleased. - patch -Np1 -i "${srcdir}/python3-fix-build.patch" - patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch" - - ./configure --prefix=/usr - make - ) -} - -package_pygobject() { - pkgdesc="Python 2 bindings for GObject" - depends+=('python2' 'python2-cairo' 'pygobject-devel') - - cd "${srcdir}/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/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}} \ - "$srcdir/devel/" -} - -package_py3gobject() { - pkgdesc="Python 3 bindings for GObject" - depends+=('python' 'python-cairo' 'pygobject-devel') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # Delete devel stuff - rm -r "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}} -} - -package_pygobject-devel() { - pkgdesc="Development files for the pygobject bindings" - depends=(python2) - - cd "${srcdir}/devel" - mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject/2.0} - - mv bin "$pkgdir/usr/" - mv include "$pkgdir/usr/" - mv pkgconfig "$pkgdir/usr/lib/" - mv gtk-doc "$pkgdir/usr/share/" - mv codegen "$pkgdir/usr/share/pygobject/2.0/" - mv xsl "$pkgdir/usr/share/pygobject/" -} Copied: pygobject2/repos/extra-i686/PKGBUILD (from rev 136843, pygobject2/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2011-09-02 11:31:09 UTC (rev 136844) @@ -0,0 +1,89 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgbase=pygobject2 +pkgname=(python-gobject2 python2-gobject2 pygobject2-devel) +pkgver=2.28.6 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.pygtk.org/" +license=('LGPL') +depends=('glib2' 'gobject-introspection') +makedepends=(python python2 python-cairo python2-cairo) +source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz + python3-fix-build.patch + python3-fix-maketrans.patch) +options=('!libtool') +sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8' + 'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca' + '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a') + +build() { + cd "${srcdir}" + cp -a "pygobject-${pkgver}" python2-build + mkdir devel + + ( + cd python2-build + export PYTHON=/usr/bin/python2 + ./configure --prefix=/usr + make + ) + + ( + cd "pygobject-${pkgver}" + #patches available in 2.28 branch but unreleased. + patch -Np1 -i "${srcdir}/python3-fix-build.patch" + patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch" + + ./configure --prefix=/usr + make + ) +} + +package_python-gobject2() { + pkgdesc="Python 3 bindings for GObject2" + depends+=('python' 'python-cairo' 'pygobject2-devel') + replaces=py3gobject + provides=py3gobject + + cd "${srcdir}/pygobject-${pkgver}" + make DESTDIR="${pkgdir}" install + + # Delete devel stuff + rm -r "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}} +} + +package_python2-gobject2() { + pkgdesc="Python 2 bindings for GObject2" + depends+=('python2' 'python2-cairo' 'pygobject2-devel') + replaces=pygobject + provides=pygobject + + cd "${srcdir}/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/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}} \ + "$srcdir/devel/" +} + +package_pygobject2-devel() { + pkgdesc="Development files for the pygobject bindings" + depends=(python2) + replaces=pygobject-devel + provides=pygobject-devel + + cd "${srcdir}/devel" + mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject/2.0} + + mv bin "$pkgdir/usr/" + mv include "$pkgdir/usr/" + mv pkgconfig "$pkgdir/usr/lib/" + mv gtk-doc "$pkgdir/usr/share/" + mv codegen "$pkgdir/usr/share/pygobject/2.0/" + mv xsl "$pkgdir/usr/share/pygobject/" +} Deleted: extra-i686/python3-fix-build.patch =================================================================== --- extra-i686/python3-fix-build.patch 2011-09-02 11:28:12 UTC (rev 136843) +++ extra-i686/python3-fix-build.patch 2011-09-02 11:31:09 UTC (rev 136844) @@ -1,34 +0,0 @@ -From e2dc4ac346a16b6976b92e84819c7203629beb4a Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro <i...@gnome.org> -Date: Thu, 21 Apr 2011 14:52:20 +0000 -Subject: [python3] fix build. PYcairo_IMPORT doesn't exists anymore - ---- -diff --git a/gi/pygi-foreign-cairo.c b/gi/pygi-foreign-cairo.c -index 81b9865..edf52d7 100644 ---- a/gi/pygi-foreign-cairo.c -+++ b/gi/pygi-foreign-cairo.c -@@ -30,7 +30,7 @@ - #include <pycairo/py3cairo.h> - #endif - --Pycairo_CAPI_t *Pycairo_CAPI; -+static Pycairo_CAPI_t *Pycairo_CAPI; - - #include "pygi-foreign.h" - -@@ -117,7 +117,12 @@ cairo_surface_release (GIBaseInfo *base_info, - static PyMethodDef _gi_cairo_functions[] = {0,}; - PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo") - { -+#if PY_VERSION_HEX < 0x03000000 - Pycairo_IMPORT; -+#else -+ Pycairo_CAPI = (Pycairo_CAPI_t*) PyCObject_Import("cairo", "CAPI"); -+#endif -+ - if (Pycairo_CAPI == NULL) - return PYGLIB_MODULE_ERROR_RETURN; - --- -cgit v0.9 Copied: pygobject2/repos/extra-i686/python3-fix-build.patch (from rev 136843, pygobject2/trunk/python3-fix-build.patch) =================================================================== --- extra-i686/python3-fix-build.patch (rev 0) +++ extra-i686/python3-fix-build.patch 2011-09-02 11:31:09 UTC (rev 136844) @@ -0,0 +1,34 @@ +From e2dc4ac346a16b6976b92e84819c7203629beb4a Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro <i...@gnome.org> +Date: Thu, 21 Apr 2011 14:52:20 +0000 +Subject: [python3] fix build. PYcairo_IMPORT doesn't exists anymore + +--- +diff --git a/gi/pygi-foreign-cairo.c b/gi/pygi-foreign-cairo.c +index 81b9865..edf52d7 100644 +--- a/gi/pygi-foreign-cairo.c ++++ b/gi/pygi-foreign-cairo.c +@@ -30,7 +30,7 @@ + #include <pycairo/py3cairo.h> + #endif + +-Pycairo_CAPI_t *Pycairo_CAPI; ++static Pycairo_CAPI_t *Pycairo_CAPI; + + #include "pygi-foreign.h" + +@@ -117,7 +117,12 @@ cairo_surface_release (GIBaseInfo *base_info, + static PyMethodDef _gi_cairo_functions[] = {0,}; + PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo") + { ++#if PY_VERSION_HEX < 0x03000000 + Pycairo_IMPORT; ++#else ++ Pycairo_CAPI = (Pycairo_CAPI_t*) PyCObject_Import("cairo", "CAPI"); ++#endif ++ + if (Pycairo_CAPI == NULL) + return PYGLIB_MODULE_ERROR_RETURN; + +-- +cgit v0.9 Deleted: extra-i686/python3-fix-maketrans.patch =================================================================== --- extra-i686/python3-fix-maketrans.patch 2011-09-02 11:28:12 UTC (rev 136843) +++ extra-i686/python3-fix-maketrans.patch 2011-09-02 11:31:09 UTC (rev 136844) @@ -1,36 +0,0 @@ -From 667bec76ccbc85cc1d54a0e68977dbda241c028c Mon Sep 17 00:00:00 2001 -From: Martin Pitt <martin.p...@ubuntu.com> -Date: Wed, 13 Jul 2011 06:42:22 +0000 -Subject: [python3] Fix maketrans import - -Python3 moved the maketrans() function from the string module to a str method. -This unbreaks gi/module.py for Python 3 again. ---- -diff --git a/gi/module.py b/gi/module.py -index 70df76c..d56bdaf 100644 ---- a/gi/module.py -+++ b/gi/module.py -@@ -24,7 +24,11 @@ from __future__ import absolute_import - - import os - import gobject --import string -+try: -+ maketrans = ''.maketrans -+except AttributeError: -+ # fallback for Python 2 -+ from string import maketrans - - import gi - from .overrides import registry -@@ -124,7 +128,7 @@ class IntrospectionModule(object): - # Don't use upper() here to avoid locale specific - # identifier conversion (e. g. in Turkish 'i'.upper() == 'i') - # see https://bugzilla.gnome.org/show_bug.cgi?id=649165 -- ascii_upper_trans = string.maketrans( -+ ascii_upper_trans = maketrans( - 'abcdefgjhijklmnopqrstuvwxyz', - 'ABCDEFGJHIJKLMNOPQRSTUVWXYZ') - for value_info in info.get_values(): --- -cgit v0.9 Copied: pygobject2/repos/extra-i686/python3-fix-maketrans.patch (from rev 136843, pygobject2/trunk/python3-fix-maketrans.patch) =================================================================== --- extra-i686/python3-fix-maketrans.patch (rev 0) +++ extra-i686/python3-fix-maketrans.patch 2011-09-02 11:31:09 UTC (rev 136844) @@ -0,0 +1,36 @@ +From 667bec76ccbc85cc1d54a0e68977dbda241c028c Mon Sep 17 00:00:00 2001 +From: Martin Pitt <martin.p...@ubuntu.com> +Date: Wed, 13 Jul 2011 06:42:22 +0000 +Subject: [python3] Fix maketrans import + +Python3 moved the maketrans() function from the string module to a str method. +This unbreaks gi/module.py for Python 3 again. +--- +diff --git a/gi/module.py b/gi/module.py +index 70df76c..d56bdaf 100644 +--- a/gi/module.py ++++ b/gi/module.py +@@ -24,7 +24,11 @@ from __future__ import absolute_import + + import os + import gobject +-import string ++try: ++ maketrans = ''.maketrans ++except AttributeError: ++ # fallback for Python 2 ++ from string import maketrans + + import gi + from .overrides import registry +@@ -124,7 +128,7 @@ class IntrospectionModule(object): + # Don't use upper() here to avoid locale specific + # identifier conversion (e. g. in Turkish 'i'.upper() == 'i') + # see https://bugzilla.gnome.org/show_bug.cgi?id=649165 +- ascii_upper_trans = string.maketrans( ++ ascii_upper_trans = maketrans( + 'abcdefgjhijklmnopqrstuvwxyz', + 'ABCDEFGJHIJKLMNOPQRSTUVWXYZ') + for value_info in info.get_values(): +-- +cgit v0.9 Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2011-09-02 11:28:12 UTC (rev 136843) +++ extra-x86_64/PKGBUILD 2011-09-02 11:31:09 UTC (rev 136844) @@ -1,83 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgbase=pygobject -pkgname=(pygobject py3gobject pygobject-devel) -pkgver=2.28.6 -pkgrel=1 -arch=('i686' 'x86_64') -license=('LGPL') -depends=('glib2' 'gobject-introspection') -makedepends=(python python2 python-cairo python2-cairo) -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz - python3-fix-build.patch - python3-fix-maketrans.patch) -options=('!libtool') -url="http://www.pygtk.org/" -sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8' - 'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca' - '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a') - -build() { - cd "${srcdir}" - cp -a "${pkgbase}-${pkgver}" python2-build - mkdir devel - - ( - cd python2-build - export PYTHON=/usr/bin/python2 - ./configure --prefix=/usr - make - ) - - ( - cd "${pkgbase}-${pkgver}" - #patches available in 2.28 branch but unreleased. - patch -Np1 -i "${srcdir}/python3-fix-build.patch" - patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch" - - ./configure --prefix=/usr - make - ) -} - -package_pygobject() { - pkgdesc="Python 2 bindings for GObject" - depends+=('python2' 'python2-cairo' 'pygobject-devel') - - cd "${srcdir}/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/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}} \ - "$srcdir/devel/" -} - -package_py3gobject() { - pkgdesc="Python 3 bindings for GObject" - depends+=('python' 'python-cairo' 'pygobject-devel') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # Delete devel stuff - rm -r "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}} -} - -package_pygobject-devel() { - pkgdesc="Development files for the pygobject bindings" - depends=(python2) - - cd "${srcdir}/devel" - mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject/2.0} - - mv bin "$pkgdir/usr/" - mv include "$pkgdir/usr/" - mv pkgconfig "$pkgdir/usr/lib/" - mv gtk-doc "$pkgdir/usr/share/" - mv codegen "$pkgdir/usr/share/pygobject/2.0/" - mv xsl "$pkgdir/usr/share/pygobject/" -} Copied: pygobject2/repos/extra-x86_64/PKGBUILD (from rev 136843, pygobject2/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2011-09-02 11:31:09 UTC (rev 136844) @@ -0,0 +1,89 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgbase=pygobject2 +pkgname=(python-gobject2 python2-gobject2 pygobject2-devel) +pkgver=2.28.6 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.pygtk.org/" +license=('LGPL') +depends=('glib2' 'gobject-introspection') +makedepends=(python python2 python-cairo python2-cairo) +source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz + python3-fix-build.patch + python3-fix-maketrans.patch) +options=('!libtool') +sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8' + 'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca' + '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a') + +build() { + cd "${srcdir}" + cp -a "pygobject-${pkgver}" python2-build + mkdir devel + + ( + cd python2-build + export PYTHON=/usr/bin/python2 + ./configure --prefix=/usr + make + ) + + ( + cd "pygobject-${pkgver}" + #patches available in 2.28 branch but unreleased. + patch -Np1 -i "${srcdir}/python3-fix-build.patch" + patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch" + + ./configure --prefix=/usr + make + ) +} + +package_python-gobject2() { + pkgdesc="Python 3 bindings for GObject2" + depends+=('python' 'python-cairo' 'pygobject2-devel') + replaces=py3gobject + provides=py3gobject + + cd "${srcdir}/pygobject-${pkgver}" + make DESTDIR="${pkgdir}" install + + # Delete devel stuff + rm -r "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}} +} + +package_python2-gobject2() { + pkgdesc="Python 2 bindings for GObject2" + depends+=('python2' 'python2-cairo' 'pygobject2-devel') + replaces=pygobject + provides=pygobject + + cd "${srcdir}/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/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}} \ + "$srcdir/devel/" +} + +package_pygobject2-devel() { + pkgdesc="Development files for the pygobject bindings" + depends=(python2) + replaces=pygobject-devel + provides=pygobject-devel + + cd "${srcdir}/devel" + mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject/2.0} + + mv bin "$pkgdir/usr/" + mv include "$pkgdir/usr/" + mv pkgconfig "$pkgdir/usr/lib/" + mv gtk-doc "$pkgdir/usr/share/" + mv codegen "$pkgdir/usr/share/pygobject/2.0/" + mv xsl "$pkgdir/usr/share/pygobject/" +} Deleted: extra-x86_64/python3-fix-build.patch =================================================================== --- extra-x86_64/python3-fix-build.patch 2011-09-02 11:28:12 UTC (rev 136843) +++ extra-x86_64/python3-fix-build.patch 2011-09-02 11:31:09 UTC (rev 136844) @@ -1,34 +0,0 @@ -From e2dc4ac346a16b6976b92e84819c7203629beb4a Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro <i...@gnome.org> -Date: Thu, 21 Apr 2011 14:52:20 +0000 -Subject: [python3] fix build. PYcairo_IMPORT doesn't exists anymore - ---- -diff --git a/gi/pygi-foreign-cairo.c b/gi/pygi-foreign-cairo.c -index 81b9865..edf52d7 100644 ---- a/gi/pygi-foreign-cairo.c -+++ b/gi/pygi-foreign-cairo.c -@@ -30,7 +30,7 @@ - #include <pycairo/py3cairo.h> - #endif - --Pycairo_CAPI_t *Pycairo_CAPI; -+static Pycairo_CAPI_t *Pycairo_CAPI; - - #include "pygi-foreign.h" - -@@ -117,7 +117,12 @@ cairo_surface_release (GIBaseInfo *base_info, - static PyMethodDef _gi_cairo_functions[] = {0,}; - PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo") - { -+#if PY_VERSION_HEX < 0x03000000 - Pycairo_IMPORT; -+#else -+ Pycairo_CAPI = (Pycairo_CAPI_t*) PyCObject_Import("cairo", "CAPI"); -+#endif -+ - if (Pycairo_CAPI == NULL) - return PYGLIB_MODULE_ERROR_RETURN; - --- -cgit v0.9 Copied: pygobject2/repos/extra-x86_64/python3-fix-build.patch (from rev 136843, pygobject2/trunk/python3-fix-build.patch) =================================================================== --- extra-x86_64/python3-fix-build.patch (rev 0) +++ extra-x86_64/python3-fix-build.patch 2011-09-02 11:31:09 UTC (rev 136844) @@ -0,0 +1,34 @@ +From e2dc4ac346a16b6976b92e84819c7203629beb4a Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro <i...@gnome.org> +Date: Thu, 21 Apr 2011 14:52:20 +0000 +Subject: [python3] fix build. PYcairo_IMPORT doesn't exists anymore + +--- +diff --git a/gi/pygi-foreign-cairo.c b/gi/pygi-foreign-cairo.c +index 81b9865..edf52d7 100644 +--- a/gi/pygi-foreign-cairo.c ++++ b/gi/pygi-foreign-cairo.c +@@ -30,7 +30,7 @@ + #include <pycairo/py3cairo.h> + #endif + +-Pycairo_CAPI_t *Pycairo_CAPI; ++static Pycairo_CAPI_t *Pycairo_CAPI; + + #include "pygi-foreign.h" + +@@ -117,7 +117,12 @@ cairo_surface_release (GIBaseInfo *base_info, + static PyMethodDef _gi_cairo_functions[] = {0,}; + PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo") + { ++#if PY_VERSION_HEX < 0x03000000 + Pycairo_IMPORT; ++#else ++ Pycairo_CAPI = (Pycairo_CAPI_t*) PyCObject_Import("cairo", "CAPI"); ++#endif ++ + if (Pycairo_CAPI == NULL) + return PYGLIB_MODULE_ERROR_RETURN; + +-- +cgit v0.9 Deleted: extra-x86_64/python3-fix-maketrans.patch =================================================================== --- extra-x86_64/python3-fix-maketrans.patch 2011-09-02 11:28:12 UTC (rev 136843) +++ extra-x86_64/python3-fix-maketrans.patch 2011-09-02 11:31:09 UTC (rev 136844) @@ -1,36 +0,0 @@ -From 667bec76ccbc85cc1d54a0e68977dbda241c028c Mon Sep 17 00:00:00 2001 -From: Martin Pitt <martin.p...@ubuntu.com> -Date: Wed, 13 Jul 2011 06:42:22 +0000 -Subject: [python3] Fix maketrans import - -Python3 moved the maketrans() function from the string module to a str method. -This unbreaks gi/module.py for Python 3 again. ---- -diff --git a/gi/module.py b/gi/module.py -index 70df76c..d56bdaf 100644 ---- a/gi/module.py -+++ b/gi/module.py -@@ -24,7 +24,11 @@ from __future__ import absolute_import - - import os - import gobject --import string -+try: -+ maketrans = ''.maketrans -+except AttributeError: -+ # fallback for Python 2 -+ from string import maketrans - - import gi - from .overrides import registry -@@ -124,7 +128,7 @@ class IntrospectionModule(object): - # Don't use upper() here to avoid locale specific - # identifier conversion (e. g. in Turkish 'i'.upper() == 'i') - # see https://bugzilla.gnome.org/show_bug.cgi?id=649165 -- ascii_upper_trans = string.maketrans( -+ ascii_upper_trans = maketrans( - 'abcdefgjhijklmnopqrstuvwxyz', - 'ABCDEFGJHIJKLMNOPQRSTUVWXYZ') - for value_info in info.get_values(): --- -cgit v0.9 Copied: pygobject2/repos/extra-x86_64/python3-fix-maketrans.patch (from rev 136843, pygobject2/trunk/python3-fix-maketrans.patch) =================================================================== --- extra-x86_64/python3-fix-maketrans.patch (rev 0) +++ extra-x86_64/python3-fix-maketrans.patch 2011-09-02 11:31:09 UTC (rev 136844) @@ -0,0 +1,36 @@ +From 667bec76ccbc85cc1d54a0e68977dbda241c028c Mon Sep 17 00:00:00 2001 +From: Martin Pitt <martin.p...@ubuntu.com> +Date: Wed, 13 Jul 2011 06:42:22 +0000 +Subject: [python3] Fix maketrans import + +Python3 moved the maketrans() function from the string module to a str method. +This unbreaks gi/module.py for Python 3 again. +--- +diff --git a/gi/module.py b/gi/module.py +index 70df76c..d56bdaf 100644 +--- a/gi/module.py ++++ b/gi/module.py +@@ -24,7 +24,11 @@ from __future__ import absolute_import + + import os + import gobject +-import string ++try: ++ maketrans = ''.maketrans ++except AttributeError: ++ # fallback for Python 2 ++ from string import maketrans + + import gi + from .overrides import registry +@@ -124,7 +128,7 @@ class IntrospectionModule(object): + # Don't use upper() here to avoid locale specific + # identifier conversion (e. g. in Turkish 'i'.upper() == 'i') + # see https://bugzilla.gnome.org/show_bug.cgi?id=649165 +- ascii_upper_trans = string.maketrans( ++ ascii_upper_trans = maketrans( + 'abcdefgjhijklmnopqrstuvwxyz', + 'ABCDEFGJHIJKLMNOPQRSTUVWXYZ') + for value_info in info.get_values(): +-- +cgit v0.9