Merge pull request #6021 from lazka/pygtk-build-fix

pygtk: fix the build with newer atk
This commit is contained in:
Christoph Reiter
2019-12-03 18:03:08 +01:00
committed by GitHub
2 changed files with 20 additions and 3 deletions

View File

@@ -0,0 +1,11 @@
--- pygtk-2.24.0/Makefile.am.orig 2011-04-01 12:37:24.000000000 +0200
+++ pygtk-2.24.0/Makefile.am 2019-12-03 16:57:58.928805200 +0100
@@ -69,7 +69,7 @@
EXTRA_DIST += $(ATK_DEFS) $(ATK_OVERRIDES)
atk.c: $(ATK_DEFS) $(ATK_OVERRIDES)
atk_la_CFLAGS = $(ATK_CFLAGS)
-atk_la_LIBADD = $(ATK_LIBS)
+atk_la_LIBADD = $(ATK_LIBS) $(GLIB_LIBS)
atk_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initatk
atk_la_SOURCES = atkmodule.c
nodist_atk_la_SOURCES = atk.c

View File

@@ -4,13 +4,16 @@ _realname=pygtk
pkgbase=mingw-w64-python2-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
pkgver=2.24.0
pkgrel=6
pkgrel=7
pkgdesc="Python bindings for the GTK widget set (mingw-w64)"
arch=('any')
url="http://www.pygtk.org"
license=('LGPL')
depends=("${MINGW_PACKAGE_PREFIX}-python2-cairo"
"${MINGW_PACKAGE_PREFIX}-python2-gobject2"
"${MINGW_PACKAGE_PREFIX}-atk"
"${MINGW_PACKAGE_PREFIX}-pango"
"${MINGW_PACKAGE_PREFIX}-gtk2"
"${MINGW_PACKAGE_PREFIX}-libglade")
makedepends=("${MINGW_PACKAGE_PREFIX}-python2-numpy")
options=('staticlibs' 'strip')
@@ -18,12 +21,14 @@ source=(https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname
001-python27.patch
002-no-undefined.patch
003-python-m4.patch
004-pygtk-demo.patch)
004-pygtk-demo.patch
005-atk-glib-libs.patch)
sha256sums=('cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912'
'39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682'
'365df388b238899d08acf1caf2ae4c1b1bb3b7a768aec3709b80aced155d226e'
'fed9d666c0bd3baa0a361a7cc9af8303e811921ccab849e770ff38fc50092d76'
'2430bc0f52f3ca0f76b51e0d959e223941ce7c8dec363f64fb65157180481ac9')
'2430bc0f52f3ca0f76b51e0d959e223941ce7c8dec363f64fb65157180481ac9'
'fb6db5409041099d6ef913dfcee3389e763605e28e345abeb7424f7d2f1a5302')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"
@@ -31,6 +36,7 @@ prepare() {
patch -p1 -i ${srcdir}/002-no-undefined.patch
patch -p1 -i ${srcdir}/003-python-m4.patch
patch -p1 -i ${srcdir}/004-pygtk-demo.patch
patch -p1 -i ${srcdir}/005-atk-glib-libs.patch
autoreconf -fi -I m4
#WANT_AUTOMAKE=latest ./autogen.sh