6 files changed, 74 insertions, 54 deletions

diff --git a/meta/packages/python/python-pygobject-native_2.12.3.bb b/meta/packages/python/python-pygobject-native_2.12.3.bb
deleted file mode 100644
index cb879fdeb1..0000000000
--- a/meta/packages/python/python-pygobject-native_2.12.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require python-pygobject_${PV}.bb
-
-DEPENDS = "python-native glib-2.0-native"
-
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-${PV}.tar.bz2 "
-
-inherit native
diff --git a/meta/packages/python/python-pygobject-native_2.16.0.bb b/meta/packages/python/python-pygobject-native_2.16.0.bb
new file mode 100644
index 0000000000..a1c733334c
--- /dev/null
+++ b/meta/packages/python/python-pygobject-native_2.16.0.bb
@@ -0,0 +1,18 @@
+require python-pygobject_${PV}.bb
+
+DEPENDS = "python-native glib-2.0-native"
+PR = "r1"
+
+PARALLEL_MAKE = ""
+
+inherit native
+
+SRC_URI = "\
+  ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
+#  file://python-path.patch;patch=1 \
+"
+
+do_stage_append() {
+        install -d ${STAGING_BINDIR}
+        install -m 0755 gobject/generate-constants ${STAGING_BINDIR}/gobject-generate-constants
+}
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"
diff --git a/meta/packages/python/python-pygobject_2.12.3.bb b/meta/packages/python/python-pygobject_2.12.3.bb
deleted file mode 100644
index bfd04d569d..0000000000
--- a/meta/packages/python/python-pygobject_2.12.3.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Python GObject bindings"
-SECTION = "devel/python"
-LICENSE = "LGPL"
-DEPENDS = "python-pygobject-native"
-PR = "r3"
-
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-${PV}.tar.bz2 \
-           file://python-path.patch;patch=1"
-S = "${WORKDIR}/pygobject-${PV}"
-
-inherit autotools distutils-base pkgconfig
-
-EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
-
-do_stage() {
-        autotools_stage_all
-        install -d ${STAGING_LIBDIR}/../share/pygobject/
-        cp -dpfR docs/* ${STAGING_LIBDIR}/../share/pygobject/
-        install -d ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/
-        cp docs/style.css ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/
-}
-
-FILES_${PN} = "${libdir}/python*"
-FILES_${PN}-dev += "${datadir}/pygobject/xsl"
diff --git a/meta/packages/python/python-pygobject_2.16.0.bb b/meta/packages/python/python-pygobject_2.16.0.bb
new file mode 100644
index 0000000000..d7bd1c041f
--- /dev/null
+++ b/meta/packages/python/python-pygobject_2.16.0.bb
@@ -0,0 +1,38 @@
+DESCRIPTION = "Python GObject bindings"
+SECTION = "devel/python"
+LICENSE = "LGPL"
+DEPENDS = "python-pygobject-native-${PV}"
+PR = "ml2"
+
+MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+
+SRC_URI = "\
+  ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
+  file://generate-constants.patch;patch=1 \
+"
+S = "${WORKDIR}/pygobject-${PV}"
+
+FILESPATH = "${FILE_DIRNAME}/python-pygobject:${FILE_DIRNAME}/files"
+
+inherit autotools distutils-base pkgconfig
+
+# necessary to let the call for python-config succeed
+export BUILD_SYS
+export HOST_SYS
+
+do_stage() {
+        autotools_stage_all
+        install -d ${STAGING_LIBDIR}/../share/pygobject/
+        cp -dpfR docs/* ${STAGING_LIBDIR}/../share/pygobject/
+        install -d ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/
+        cp docs/style.css ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/
+}
+
+PACKAGES += "${PN}-lib"
+
+RDEPENDS_${PN} += "python-textutils"
+
+FILES_${PN} = "${libdir}/python*"
+FILES_${PN}-lib = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir} ${datadir}"
+FILES_${PN}-dbg += "${libdir}/.debug"