pygobject: Update to 3.11.90

This commit is contained in:
Alexpux
2014-03-23 19:00:37 +04:00
parent 9be5645d9b
commit f0e5d26107
6 changed files with 76 additions and 83 deletions

View File

@@ -0,0 +1,31 @@
--- pygobject-3.11.90/tests/Makefile.am.orig 2014-02-01 07:34:44.000000000 +0000
+++ pygobject-3.11.90/tests/Makefile.am 2014-02-20 19:41:27.832534900 +0000
@@ -4,7 +4,7 @@
nodist_libgimarshallingtests_la_SOURCES = $(GI_DATADIR)/tests/gimarshallingtests.c $(GI_DATADIR)/tests/gimarshallingtests.h
libgimarshallingtests_la_CFLAGS = $(GLIB_CFLAGS)
-libgimarshallingtests_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
+libgimarshallingtests_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS) -no-undefined
# This is a hack to make sure a shared library is built
libgimarshallingtests.la: $(libgimarshallingtests_la_OBJECTS) $(libgimarshallingtests_la_DEPENDENCIES)
@@ -55,7 +55,7 @@
check_LTLIBRARIES += testhelper.la
testhelper_la_CFLAGS = -I$(top_srcdir)/gi $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
-testhelper_la_LDFLAGS = -module -avoid-version
+testhelper_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LIBS)
testhelper_la_LIBADD = $(GLIB_LIBS)
testhelper_la_SOURCES = \
testhelpermodule.c \
--- pygobject-3.11.90/tests/Makefile.am.orig 2014-02-21 06:40:32.106019900 +0000
+++ pygobject-3.11.90/tests/Makefile.am 2014-02-21 07:11:54.409042000 +0000
@@ -27,7 +27,7 @@
test_typelibs += Regress-1.0.typelib
nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h
libregress_la_CFLAGS = $(GIO_CFLAGS) $(CAIRO_CFLAGS)
-libregress_la_LDFLAGS = -module -avoid-version $(GIO_LIBS) $(CAIRO_LIBS)
+libregress_la_LDFLAGS = -module -avoid-version $(GIO_LIBS) $(CAIRO_LIBS) -no-undefined
libregress.la: $(libregress_la_OBJECTS) $(libregress_la_DEPENDENCIES)
$(AM_V_GEN) $(LINK) -rpath $(pkgpyexecdir) $(libregress_la_LDFLAGS) $(libregress_la_OBJECTS) $(libregress_la_LIBADD) $(LIBS)

View File

@@ -0,0 +1,34 @@
--- pygobject-3.11.90/tests/Makefile.am.orig 2014-02-20 19:41:27.832534900 +0000
+++ pygobject-3.11.90/tests/Makefile.am 2014-02-20 19:42:47.013589600 +0000
@@ -68,11 +68,11 @@
$(AM_V_GEN) $(LINK) -rpath $(pkgpyexecdir) $(testhelper_la_LDFLAGS) $(testhelper_la_OBJECTS) $(testhelper_la_LIBADD) $(LIBS)
-.la.so:
+.la.dll:
test -L $@ || $(LN_S) .libs/$@ $@
-all: $(check_LTLIBRARIES:.la=.so)
+all: $(check_LTLIBRARIES)
EXTRA_DIST = \
compathelper.py \
@@ -118,7 +118,7 @@
$(NULL)
clean-local:
- rm -f $(check_LTLIBRARIES:.la=.so) file.txt~
+ rm -f $(check_LTLIBRARIES:.la=.dll) file.txt~
DBUS_LAUNCH=$(shell which dbus-launch)
RUN_TESTS_ENV_VARS= \
@@ -133,7 +133,7 @@
# pygtkcompat tests need to be run in a separate process as they
# clobber global name space
-check-local: $(check_LTLIBRARIES:.la=.so) $(test_typelibs) gschemas.compiled
+check-local: $(check_LTLIBRARIES) $(test_typelibs) gschemas.compiled
export `$(DBUS_LAUNCH)` && \
$(RUN_TESTS_ENV_VARS) $(EXEC_NAME) $(PYTHON) -Wd $(srcdir)/runtests.py; rc=$$?; \
[ "$$rc" -ne 0 ] || [ -n "$$TEST_NAMES" ] || { TEST_NAMES=compat_test_pygtk $(RUN_TESTS_ENV_VARS) $(EXEC_NAME) $(PYTHON) -Wd -Werror::PendingDeprecationWarning -Werror::DeprecationWarning -Werror::RuntimeWarning $(srcdir)/runtests.py; rc=$$?; }; \

View File

@@ -3,8 +3,8 @@
_realname=pygobject
_mingw_suff=mingw-w64-${CARCH}
pkgname=("${_mingw_suff}-python2-gobject" "${_mingw_suff}-python3-gobject" "${_mingw_suff}-pygobject-devel")
pkgver=3.11.5
pkgrel=2
pkgver=3.11.90
pkgrel=1
pkgdesc="Allows you to load glade interface files in a program at runtime (mingw-w64)"
arch=(any)
url="http://www.pygtk.org"
@@ -13,19 +13,19 @@ groups=("${_mingw_suff}")
makedepends=("${_mingw_suff}-python2" "${_mingw_suff}-python3" "${_mingw_suff}-gobject-introspection" "${_mingw_suff}-gnome-common")
options=('staticlibs' 'strip')
source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/${_realname}-${pkgver}.tar.xz
Werror-format-remove.patch
no-undefined.patch
python-m4.patch)
md5sums=('f4129a9cd6f2fe3ae15d1e63c8c7818f'
'97364096214dcf2c43f731d4fc3c1d1f'
'bf2b0ec3e4c50fc75eed72c7e577e07b'
0002-no-undefined-on.mingw.patch
0003-dll.mingw.patch
0004-python-m4.patch)
md5sums=('1eb0cd63c5ee58ff58b47b2fdc3ace7e'
'147cb1ce51e82d1912493d17326908ff'
'2bb8ab70eb2418b524aea04d4d996b91'
'bb9a4f77ae6f5bdad1b93f9199c31509')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"
patch -p1 -i ${srcdir}/Werror-format-remove.patch
patch -p1 -i ${srcdir}/no-undefined.patch
patch -p1 -i ${srcdir}/python-m4.patch
patch -p1 -i ${srcdir}/0002-no-undefined-on.mingw.patch
patch -p1 -i ${srcdir}/0003-dll.mingw.patch
patch -p1 -i ${srcdir}/0004-python-m4.patch
autoreconf -fi
#WANT_AUTOMAKE=latest ./autogen.sh
}

View File

@@ -1,10 +0,0 @@
--- a/aclocal.m4 2012-02-28 00:16:33.422552508 +0100
+++ b/aclocal.m4 2012-02-28 00:16:59.188018940 +0100
@@ -446,7 +446,6 @@
-Werror=pointer-arith \
-Werror=init-self \
-Werror=format-security \
- -Werror=format=2 \
-Werror=missing-include-dirs \
"

View File

@@ -1,62 +0,0 @@
--- pygobject-3.11.5/tests/Makefile.am.orig 2014-02-01 11:34:44.000000000 +0400
+++ pygobject-3.11.5/tests/Makefile.am 2014-02-22 23:24:13.645800000 +0400
@@ -4,7 +4,7 @@
nodist_libgimarshallingtests_la_SOURCES = $(GI_DATADIR)/tests/gimarshallingtests.c $(GI_DATADIR)/tests/gimarshallingtests.h
libgimarshallingtests_la_CFLAGS = $(GLIB_CFLAGS)
-libgimarshallingtests_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
+libgimarshallingtests_la_LDFLAGS = -module -avoid-version -shrext $(PYTHON_SO) -no-undefined $(GLIB_LIBS)
# This is a hack to make sure a shared library is built
libgimarshallingtests.la: $(libgimarshallingtests_la_OBJECTS) $(libgimarshallingtests_la_DEPENDENCIES)
@@ -27,7 +27,7 @@
test_typelibs += Regress-1.0.typelib
nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h
libregress_la_CFLAGS = $(GIO_CFLAGS) $(CAIRO_CFLAGS)
-libregress_la_LDFLAGS = -module -avoid-version $(GIO_LIBS) $(CAIRO_LIBS)
+libregress_la_LDFLAGS = -module -avoid-version -shrext $(PYTHON_SO) -no-undefined $(GIO_LIBS) $(CAIRO_LIBS)
libregress.la: $(libregress_la_OBJECTS) $(libregress_la_DEPENDENCIES)
$(AM_V_GEN) $(LINK) -rpath $(pkgpyexecdir) $(libregress_la_LDFLAGS) $(libregress_la_OBJECTS) $(libregress_la_LIBADD) $(LIBS)
@@ -55,7 +55,7 @@
check_LTLIBRARIES += testhelper.la
testhelper_la_CFLAGS = -I$(top_srcdir)/gi $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
-testhelper_la_LDFLAGS = -module -avoid-version
+testhelper_la_LDFLAGS = -module -avoid-version -shrext $(PYTHON_SO) -no-undefined $(PYTHON_LIBS)
testhelper_la_LIBADD = $(GLIB_LIBS)
testhelper_la_SOURCES = \
testhelpermodule.c \
@@ -68,11 +68,11 @@
$(AM_V_GEN) $(LINK) -rpath $(pkgpyexecdir) $(testhelper_la_LDFLAGS) $(testhelper_la_OBJECTS) $(testhelper_la_LIBADD) $(LIBS)
-.la.so:
- test -L $@ || $(LN_S) .libs/$@ $@
+%$(PYTHON_SO): %.la
+ $(LN_S) -f .libs/$@ $@
-all: $(check_LTLIBRARIES:.la=.so)
+all: $(check_LTLIBRARIES:.la=$(PYTHON_SO))
EXTRA_DIST = \
compathelper.py \
@@ -118,7 +118,7 @@
$(NULL)
clean-local:
- rm -f $(check_LTLIBRARIES:.la=.so) file.txt~
+ rm -f $(check_LTLIBRARIES:.la=$(PYTHON_SO)) file.txt~
DBUS_LAUNCH=$(shell which dbus-launch)
RUN_TESTS_ENV_VARS= \
@@ -133,7 +133,7 @@
# pygtkcompat tests need to be run in a separate process as they
# clobber global name space
-check-local: $(check_LTLIBRARIES:.la=.so) $(test_typelibs) gschemas.compiled
+check-local: $(check_LTLIBRARIES:.la=$(PYTHON_SO)) $(test_typelibs) gschemas.compiled
export `$(DBUS_LAUNCH)` && \
$(RUN_TESTS_ENV_VARS) $(EXEC_NAME) $(PYTHON) -Wd $(srcdir)/runtests.py; rc=$$?; \
[ "$$rc" -ne 0 ] || [ -n "$$TEST_NAMES" ] || { TEST_NAMES=compat_test_pygtk $(RUN_TESTS_ENV_VARS) $(EXEC_NAME) $(PYTHON) -Wd -Werror::PendingDeprecationWarning -Werror::DeprecationWarning -Werror::RuntimeWarning $(srcdir)/runtests.py; rc=$$?; }; \