Update to py-gobject3-3.4.0.
This commit is contained in:
ajacoutot
parent
21e9b8e67e
commit
14438555fe
@ -1,10 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.10 2012/07/20 07:14:12 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.11 2012/09/27 08:43:51 ajacoutot Exp $
|
||||
|
||||
COMMENT= Python bindings for glib2 gobject
|
||||
|
||||
GNOME_PROJECT= pygobject
|
||||
GNOME_VERSION= 3.2.2
|
||||
REVISION= 0
|
||||
GNOME_VERSION= 3.4.0
|
||||
|
||||
PKGNAME= py-gobject3-${GNOME_VERSION}
|
||||
|
||||
@ -25,8 +24,8 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB += GL X11 Xau Xdamage Xdmcp Xext Xfixes Xrender Xxf86vm
|
||||
WANTLIB += cairo drm expat ffi fontconfig freetype gio-2.0 girepository-1.0
|
||||
WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 m pcre
|
||||
WANTLIB += pixman-1 png pthread-stubs stdc++ xcb xcb-render xcb-shm
|
||||
WANTLIB += z
|
||||
WANTLIB += pixman-1 png pthread pthread-stubs stdc++ xcb xcb-render
|
||||
WANTLIB += xcb-shm z
|
||||
|
||||
MODULES= devel/gettext \
|
||||
lang/python \
|
||||
@ -34,7 +33,7 @@ MODULES= devel/gettext \
|
||||
|
||||
BUILD_DEPENDS= ${RUN_DEPENDS}
|
||||
RUN_DEPENDS= graphics/py-cairo
|
||||
LIB_DEPENDS= devel/gobject-introspection>=1.31.20
|
||||
LIB_DEPENDS= devel/gobject-introspection>=1.34.0
|
||||
|
||||
CONFIGURE_STYLE=gnu
|
||||
CONFIGURE_ARGS= --enable-cairo
|
||||
@ -43,6 +42,7 @@ REGRESS_DEPENDS= ${FULLPKGNAME}:${BUILD_PKGPATH}
|
||||
REGRESS_IS_INTERACTIVE= x11
|
||||
|
||||
post-install:
|
||||
rm ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/gi/{,_glib,_gobject}/*.{a,la}
|
||||
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
|
||||
${PREFIX}/share/pygobject/2.0/codegen
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (pygobject-3.2.2.tar.xz) = RlN5C6r/AXb9gUuIz7U3jEWQahILJdAb4lVPQjtybrA=
|
||||
SIZE (pygobject-3.2.2.tar.xz) = 564712
|
||||
SHA256 (pygobject-3.4.0.tar.xz) = vH8XsjqqawqF9fCQ9/+mFrWWvKufSB9G/bnQ0tVbFrs=
|
||||
SIZE (pygobject-3.4.0.tar.xz) = 607804
|
||||
|
||||
@ -1,54 +0,0 @@
|
||||
$OpenBSD: patch-gi_pygi-info_c,v 1.1 2012/07/20 07:14:12 ajacoutot Exp $
|
||||
|
||||
From 16280d6985f2cf4db9cf062e857650e620fd9da8 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Pitt <martinpitt@gnome.org>
|
||||
Date: Mon, 25 Jun 2012 07:40:38 +0000
|
||||
Subject: Escape identifiers which are Python keywords
|
||||
|
||||
--- gi/pygi-info.c.orig Mon May 14 18:49:12 2012
|
||||
+++ gi/pygi-info.c Wed Jul 18 17:41:11 2012
|
||||
@@ -95,7 +95,43 @@ PYGLIB_DEFINE_TYPE("gi.BaseInfo", PyGIBaseInfo_Type, P
|
||||
static PyObject *
|
||||
_wrap_g_base_info_get_name (PyGIBaseInfo *self)
|
||||
{
|
||||
- return PYGLIB_PyUnicode_FromString (g_base_info_get_name (self->info));
|
||||
+ /* It may be better to use keyword.iskeyword(); keep in sync with
|
||||
+ * python -c 'import keyword; print(keyword.kwlist)' */
|
||||
+#if PY_VERSION_HEX < 0x03000000
|
||||
+ /* Python 2.x */
|
||||
+ static const gchar* keywords[] = {"and", "as", "assert", "break", "class",
|
||||
+ "continue", "def", "del", "elif", "else", "except", "exec", "finally",
|
||||
+ "for", "from", "global", "if", "import", "in", "is", "lambda", "not",
|
||||
+ "or", "pass", "print", "raise", "return", "try", "while", "with",
|
||||
+ "yield", NULL};
|
||||
+#elif PY_VERSION_HEX < 0x04000000
|
||||
+ /* Python 3.x; note that we explicitly keep "print"; it is not a keyword
|
||||
+ * any more, but we do not want to break API between Python versions */
|
||||
+ static const gchar* keywords[] = {"False", "None", "True", "and", "as",
|
||||
+ "assert", "break", "class", "continue", "def", "del", "elif", "else",
|
||||
+ "except", "finally", "for", "from", "global", "if", "import", "in",
|
||||
+ "is", "lambda", "nonlocal", "not", "or", "pass", "raise", "return",
|
||||
+ "try", "while", "with", "yield",
|
||||
+ "print", NULL};
|
||||
+#else
|
||||
+ #error Need keyword list for this major Python version
|
||||
+#endif
|
||||
+
|
||||
+ const gchar *name, **i;
|
||||
+
|
||||
+ name = g_base_info_get_name (self->info);
|
||||
+
|
||||
+ /* escape keywords */
|
||||
+ for (i = keywords; *i != NULL; ++i) {
|
||||
+ if (strcmp (name, *i) == 0) {
|
||||
+ gchar *escaped = g_strconcat (name, "_", NULL);
|
||||
+ PyObject *obj = PYGLIB_PyUnicode_FromString (escaped);
|
||||
+ g_free (escaped);
|
||||
+ return obj;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ return PYGLIB_PyUnicode_FromString (name);
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.2 2012/03/29 06:30:10 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.3 2012/09/27 08:43:51 ajacoutot Exp $
|
||||
@conflict py-gtk2-2.8.6*
|
||||
@conflict py-gobject-<2.28.6p2v0
|
||||
include/pygobject-3.0/
|
||||
@ -11,18 +11,12 @@ lib/python${MODPY_VERSION}/site-packages/gi/
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/__init__.py
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/__init__.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/__init__.pyo
|
||||
@comment lib/python${MODPY_VERSION}/site-packages/gi/_gi.a
|
||||
@comment lib/python${MODPY_VERSION}/site-packages/gi/_gi.la
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/_gi.so
|
||||
@comment lib/python${MODPY_VERSION}/site-packages/gi/_gi_cairo.a
|
||||
@comment lib/python${MODPY_VERSION}/site-packages/gi/_gi_cairo.la
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/_gi_cairo.so
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/_glib/
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/_glib/__init__.py
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/_glib/__init__.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/_glib/__init__.pyo
|
||||
@comment lib/python${MODPY_VERSION}/site-packages/gi/_glib/_glib.a
|
||||
@comment lib/python${MODPY_VERSION}/site-packages/gi/_glib/_glib.la
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/_glib/_glib.so
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/_glib/option.py
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/_glib/option.pyc
|
||||
@ -31,8 +25,6 @@ lib/python${MODPY_VERSION}/site-packages/gi/_gobject/
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/_gobject/__init__.py
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/_gobject/__init__.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/_gobject/__init__.pyo
|
||||
@comment lib/python${MODPY_VERSION}/site-packages/gi/_gobject/_gobject.a
|
||||
@comment lib/python${MODPY_VERSION}/site-packages/gi/_gobject/_gobject.la
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/_gobject/_gobject.so
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/_gobject/constants.py
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/_gobject/constants.pyc
|
||||
@ -40,6 +32,9 @@ lib/python${MODPY_VERSION}/site-packages/gi/_gobject/constants.pyo
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/_gobject/propertyhelper.py
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/_gobject/propertyhelper.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/_gobject/propertyhelper.pyo
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/_gobject/signalhelper.py
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/_gobject/signalhelper.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/_gobject/signalhelper.pyo
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/importer.py
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/importer.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/gi/importer.pyo
|
||||
|
||||
Loading…
Reference in New Issue
Block a user