pygobject: update to version 3.13.90

This commit is contained in:
Ignacio Casal Quinteiro
2014-08-19 08:38:58 +02:00
parent e0c4ecfff6
commit 65e88c5094
6 changed files with 4 additions and 172 deletions

View File

@@ -1,31 +0,0 @@
--- 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

@@ -1,16 +0,0 @@
--- a/m4/python.m4.orig 2014-02-01 11:34:44.000000000 +0400
+++ b/m4/python.m4 2014-03-18 10:56:05.343200000 +0400
@@ -73,7 +73,12 @@
dnl deduce PYTHON_LIBS
py_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"`
if test "x$PYTHON_LIBS" = x; then
- PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION}"
+ PYTHON_CONFIG=`which $PYTHON`-config
+ if test -x "$PYTHON_CONFIG"; then
+ PYTHON_LIBS=`$PYTHON_CONFIG --ldflags 2>/dev/null`
+ else
+ PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION}"
+ fi
fi
if test "x$PYTHON_LIB_LOC" = x; then
PYTHON_LIB_LOC="${py_prefix}/lib"

View File

@@ -1,18 +0,0 @@
--- pygobject-3.12.0/gi/pygi-basictype.c.orig 2014-04-03 08:10:00.591200000 +0400
+++ pygobject-3.12.0/gi/pygi-basictype.c 2014-04-03 08:10:29.622800000 +0400
@@ -26,7 +26,6 @@
#include "pygi-private.h"
#ifdef G_OS_WIN32
-#ifdef _MSC_VER
#include <math.h>
#ifndef NAN
@@ -39,7 +38,6 @@
#endif
#endif
-#endif
/*

View File

@@ -1,12 +0,0 @@
--- pygobject-3.12.0/gi/Makefile.am.orig 2014-04-03 08:29:49.557600000 +0400
+++ pygobject-3.12.0/gi/Makefile.am 2014-04-03 08:29:57.154800000 +0400
@@ -126,7 +126,8 @@
_gi_la_LIBADD = \
$(extension_libadd) \
$(GLIB_LIBS) \
- $(GI_LIBS)
+ $(GI_LIBS) \
+ $(FFI_LIBS)
_gi_la_LDFLAGS = \
$(extension_ldflags) \
-export-symbols-regex "init_gi|PyInit__gi"

View File

@@ -1,76 +0,0 @@
From 18341f27a5a9770d8caf3192a75737ab2bc06b1e Mon Sep 17 00:00:00 2001
From: Ignacio Casal Quinteiro <icq@gnome.org>
Date: Wed, 6 Aug 2014 08:27:43 +0200
Subject: [PATCH] Generate .dll libraries on windows
https://bugzilla.gnome.org/show_bug.cgi?id=734288
---
configure.ac | 8 ++++++++
tests/Makefile.am | 8 ++++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index e6b8938..afe5140 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,14 +55,22 @@ AC_MSG_CHECKING([for some Win32 platform])
case "$host" in
*-*-mingw*|*-*-cygwin*)
platform_win32=yes
+ OS_EXT=dll
+ ;;
+ *-*-darwin*)
+ OS_EXT=dylib
;;
*)
platform_win32=no
+ OS_EXT=so
;;
esac
AC_MSG_RESULT([$platform_win32])
AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
+AC_SUBST(OS_EXT)
+AC_DEFINE_UNQUOTED(OS_EXT, "$OS_EXT", [Define shared library extension])
+
AC_MSG_CHECKING([for native Win32])
case "$host" in
*-*-mingw*)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2167edb..d382807 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -68,11 +68,11 @@ testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
$(AM_V_GEN) $(LINK) -rpath $(pkgpyexecdir) $(testhelper_la_LDFLAGS) $(testhelper_la_OBJECTS) $(testhelper_la_LIBADD) $(LIBS)
-.la.so:
+.la.$(OS_EXT):
test -L $@ || $(LN_S) .libs/$@ $@
-all: $(check_LTLIBRARIES:.la=.so)
+all: $(check_LTLIBRARIES:.la=.$(OS_EXT))
EXTRA_DIST = \
compathelper.py \
@@ -121,7 +121,7 @@ EXTRA_DIST = \
$(NULL)
clean-local:
- rm -f $(check_LTLIBRARIES:.la=.so) file.txt~
+ rm -f $(check_LTLIBRARIES:.la=.$(OS_EXT)) file.txt~
DBUS_LAUNCH=$(shell which dbus-launch)
RUN_TESTS_ENV_VARS= \
@@ -136,7 +136,7 @@ RUN_TESTS_ENV_VARS= \
# 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=.$(OS_EXT)) $(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=$$?; }; \
--
1.9.3

View File

@@ -3,8 +3,8 @@
_realname=pygobject
pkgname=("${MINGW_PACKAGE_PREFIX}-python2-gobject" "${MINGW_PACKAGE_PREFIX}-python3-gobject" "${MINGW_PACKAGE_PREFIX}-pygobject-devel")
pkgver=3.13.3
pkgrel=2
pkgver=3.13.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"
@@ -15,26 +15,11 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python2"
"${MINGW_PACKAGE_PREFIX}-gobject-introspection"
"${MINGW_PACKAGE_PREFIX}-gnome-common")
options=('staticlibs' 'strip')
source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/${_realname}-${pkgver}.tar.xz
0002-no-undefined-on.mingw.patch
Generate-dll-libraries-on-windows.patch
0004-python-m4.patch
0005-mingw-include-math.patch
0006-link-with-libffi.patch)
md5sums=('362938e1e152f3509d092e9fd1f30797'
'147cb1ce51e82d1912493d17326908ff'
'12f93b5d6b75543ef781eeb5e4eefce7'
'bb9a4f77ae6f5bdad1b93f9199c31509'
'554f9eaca27decf1395153b00abe2469'
'4d215b260d7caa9226d29896d21a93cb')
source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/${_realname}-${pkgver}.tar.xz)
md5sums=('268c1052f2f08d344aa41863bbef62a0')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"
patch -p1 -i ${srcdir}/0002-no-undefined-on.mingw.patch
patch -p1 -i ${srcdir}/Generate-dll-libraries-on-windows.patch
patch -p1 -i ${srcdir}/0004-python-m4.patch
patch -p1 -i ${srcdir}/0005-mingw-include-math.patch
patch -p1 -i ${srcdir}/0006-link-with-libffi.patch
autoreconf -fi
#WANT_AUTOMAKE=latest ./autogen.sh
}