python-gobject: 2.12.3 -> 2.16.0

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

2 files changed, 18 insertions, 23 deletions

diff --git a/meta/packages/python/python-pygobject/generate-constants.patch b/meta/packages/python/python-pygobject/generate-constants.patch
new file mode 100644
index 0000000000..57a9380620
--- /dev/null
+++ b/meta/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/meta/packages/python/python-pygobject/python-path.patch b/meta/packages/python/python-pygobject/python-path.patch
deleted file mode 100644
index 2ab7bdce6e..0000000000
--- a/meta/packages/python/python-pygobject/python-path.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: pygobject-2.12.3/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 @@
- [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)
-+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
-   PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
- fi
-+fi
- AC_SUBST(PYTHON_INCLUDES)
- dnl check if the headers exist:
- save_CPPFLAGS="$CPPFLAGS"