diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-06-22 11:50:28 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-06-22 11:50:28 +0000 |
| commit | 7e053e1b25a0e71ce01fe7239a7da53f4d99e87f (patch) | |
| tree | f86215bcf49fbd58872dfd641c9aab39979649dd /packages/python/python-pygobject | |
| parent | ccbb1d82c6328d73e410fc8133f494077a5c58dc (diff) | |
python-pygobject[-native] 2.12.3: update to 2.14.2, adjust patches and -native package
Diffstat (limited to 'packages/python/python-pygobject')
| -rw-r--r-- | packages/python/python-pygobject/generate-constants.patch | 18 | ||||
| -rw-r--r-- | packages/python/python-pygobject/python-path.patch | 37 |
2 files changed, 48 insertions, 7 deletions
diff --git a/packages/python/python-pygobject/generate-constants.patch b/packages/python/python-pygobject/generate-constants.patch new file mode 100644 index 0000000000..57a9380620 --- /dev/null +++ b/packages/python/python-pygobject/generate-constants.patch @@ -0,0 +1,18 @@ +Index: pygobject-2.14.2/gobject/Makefile.am +=================================================================== +--- pygobject-2.14.2.orig/gobject/Makefile.am ++++ pygobject-2.14.2/gobject/Makefile.am +@@ -21,11 +21,11 @@ if PLATFORM_WIN32 + common_ldflags += -no-undefined + endif + +-constants.py: generate-constants$(EXEEXT) constants.py.in ++constants.py: constants.py.in + rm -f constants.py + cp $(srcdir)/constants.py.in constants.py + chmod 644 constants.py +- $(top_builddir)/gobject/generate-constants$(EXEEXT) >> constants.py ++ gobject-generate-constants$(EXEEXT) >> constants.py + chmod 444 constants.py + + generate_constants_CFLAGS = $(GLIB_CFLAGS) diff --git a/packages/python/python-pygobject/python-path.patch b/packages/python/python-pygobject/python-path.patch index 2ab7bdce6e..d7907703f5 100644 --- a/packages/python/python-pygobject/python-path.patch +++ b/packages/python/python-pygobject/python-path.patch @@ -1,23 +1,46 @@ -Index: pygobject-2.12.3/m4/python.m4 +Index: pygobject-2.14.2/m4/python.m4 =================================================================== ---- pygobject-2.12.3.orig/m4/python.m4 2007-03-02 15:00:20.945635455 +0100 -+++ pygobject-2.12.3/m4/python.m4 2007-03-02 15:00:43.532189734 +0100 -@@ -43,12 +43,18 @@ +--- pygobject-2.14.2.orig/m4/python.m4 ++++ pygobject-2.14.2/m4/python.m4 +@@ -43,6 +43,11 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS], [AC_REQUIRE([AM_PATH_PYTHON]) AC_MSG_CHECKING(for headers required to compile python extensions) dnl deduce PYTHON_INCLUDES +AC_ARG_WITH(python-includes, -+ [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) ++ [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) +if test x$py_exec_prefix != x; then +PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}" +else py_prefix=`$PYTHON -c "import sys; print sys.prefix"` py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` - PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" - if test "$py_prefix" != "$py_exec_prefix"; then + if test -x "$PYTHON-config"; then +@@ -53,6 +58,7 @@ if test "$py_prefix" != "$py_exec_prefix PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" fi + fi +fi AC_SUBST(PYTHON_INCLUDES) dnl check if the headers exist: save_CPPFLAGS="$CPPFLAGS" +Index: pygobject-2.14.2/configure.ac +=================================================================== +--- pygobject-2.14.2.orig/configure.ac ++++ pygobject-2.14.2/configure.ac +@@ -71,9 +71,6 @@ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(c + + AC_MSG_CHECKING([for PySignal_SetWakeupFd in Python.h]) + py_prefix=`$PYTHON -c "import sys; print sys.prefix"` +-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" +-old_CPPFLAGS=$CPPFLAGS +-CPPFLAGS="-Wall -Werror $PYTHON_INCLUDES" + AC_TRY_COMPILE([#include <Python.h>], + [PySignal_SetWakeupFd(0);], + setwakeupfd_ok=yes, +@@ -83,7 +80,6 @@ if test "x$setwakeupfd_ok" != xno; then + AC_DEFINE(HAVE_PYSIGNAL_SETWAKEUPFD, 1, + [Define to 1 if PySignal_SetWakeupFd is available]) + fi +-CPPFLAGS=$old_CPPFLAGS + + PLATFORM=`$PYTHON -c "from distutils import util; print util.get_platform()"` + AC_SUBST(PLATFORM) |