[arch-commits] Commit in pygobject/trunk (3 files)
Ionut Biru
ibiru at archlinux.org
Fri Sep 2 11:55:50 UTC 2011
Date: Friday, September 2, 2011 @ 07:55:50
Author: ibiru
Revision: 136849
update to 2.90.3
Modified:
pygobject/trunk/PKGBUILD
Deleted:
pygobject/trunk/python3-fix-build.patch
pygobject/trunk/python3-fix-maketrans.patch
-----------------------------+
PKGBUILD | 61 +++++++++---------------------------------
python3-fix-build.patch | 34 -----------------------
python3-fix-maketrans.patch | 36 ------------------------
3 files changed, 14 insertions(+), 117 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-09-02 11:44:37 UTC (rev 136848)
+++ PKGBUILD 2011-09-02 11:55:50 UTC (rev 136849)
@@ -1,27 +1,22 @@
# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
pkgbase=pygobject
-pkgname=(pygobject py3gobject pygobject-devel)
-pkgver=2.28.6
+pkgname=(python-gobject python2-gobject)
+pkgver=2.90.3
pkgrel=1
arch=('i686' 'x86_64')
+url="https://live.gnome.org/PyGObject"
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)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
options=('!libtool')
-url="http://www.pygtk.org/"
-sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8'
- 'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca'
- '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a')
+sha256sums=('8e14f8db0780ad26a8ce6583da30313463ca40519b35f5cda8780f02bd6ddca4')
build() {
cd "${srcdir}"
cp -a "${pkgbase}-${pkgver}" python2-build
- mkdir devel
(
cd python2-build
@@ -32,52 +27,24 @@
(
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() {
+package_python-gobject() {
pkgdesc="Python 3 bindings for GObject"
- depends+=('python' 'python-cairo' 'pygobject-devel')
+ depends+=('python' 'python-cairo')
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)
+package_python2-gobject() {
+ pkgdesc="Python 2 bindings for GObject"
+ depends+=('python2' 'python2-cairo')
+ conflicts=('python-gobject')
- 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/"
+ cd "${srcdir}/python2-build"
+ make DESTDIR="${pkgdir}" install
}
Deleted: python3-fix-build.patch
===================================================================
--- python3-fix-build.patch 2011-09-02 11:44:37 UTC (rev 136848)
+++ python3-fix-build.patch 2011-09-02 11:55:50 UTC (rev 136849)
@@ -1,34 +0,0 @@
-From e2dc4ac346a16b6976b92e84819c7203629beb4a Mon Sep 17 00:00:00 2001
-From: Ignacio Casal Quinteiro <icq at 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: python3-fix-maketrans.patch
===================================================================
--- python3-fix-maketrans.patch 2011-09-02 11:44:37 UTC (rev 136848)
+++ python3-fix-maketrans.patch 2011-09-02 11:55:50 UTC (rev 136849)
@@ -1,36 +0,0 @@
-From 667bec76ccbc85cc1d54a0e68977dbda241c028c Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt at 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
More information about the arch-commits
mailing list