[PATCH 0/2] pycairo & pygobject updates

[PATCH 0/2] pycairo & pygobject updates

[Jose Lamego]

python3-pycairo and python3-pygobject recipes must be updated to latest
stable release.
Being python3-cairo a dependency for python3-pygobject, the former must
be updated before the latter, due to version requirements.

Changes are detailed in each commit message.

Jose Lamego (2):
  python3-pycairo: update to 1.15.3
  python3-pygobject: update to 3.26.0

 .../python/python3-pycairo_1.10.0.bb               | 42 ----------------------
 .../python/python3-pycairo_1.15.3.bb               | 30 ++++++++++++++++
 ...bject_3.24.1.bb => python3-pygobject_3.26.0.bb} |  6 ++--
 3 files changed, 32 insertions(+), 46 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3-pycairo_1.10.0.bb
 create mode 100644 meta/recipes-devtools/python/python3-pycairo_1.15.3.bb
 rename meta/recipes-devtools/python/{python3-pygobject_3.24.1.bb => python3-pygobject_3.26.0.bb} (76%)

-- 
2.7.4

[PATCH 1/2] python3-pycairo: update to 1.15.3

[Jose Lamego]

python3-pycairo needs to be updated to latest stable release.

Changes in this update:
 SRC_URI updated to new GitHub repository.
 LICENSE updated to LGPLv2.1 & MPLv1.1.
 LICENSE_FILES_CHkSUM updated accordingly to new License.
 inherit distutils3 replaced with setuptools3.
 waf-related instructions dropped due to use of setuptools3.
 py3cairo header file copied to "includedir" where it is assumed
 to be located by some dependencies.

This change was tested in qemux86 running core-image-minimal

Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.com>
---
 .../python/python3-pycairo_1.10.0.bb               | 42 ----------------------
 .../python/python3-pycairo_1.15.3.bb               | 30 ++++++++++++++++
 2 files changed, 30 insertions(+), 42 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3-pycairo_1.10.0.bb
 create mode 100644 meta/recipes-devtools/python/python3-pycairo_1.15.3.bb

diff --git a/meta/recipes-devtools/python/python3-pycairo_1.10.0.bb b/meta/recipes-devtools/python/python3-pycairo_1.10.0.bb
deleted file mode 100644
index 9258ba1..0000000
--- a/meta/recipes-devtools/python/python3-pycairo_1.10.0.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-SUMMARY = "Python bindings for the Cairo canvas library"
-HOMEPAGE = "http://cairographics.org/pycairo"
-BUGTRACKER = "http://bugs.freedesktop.org"
-SECTION = "python-devel"
-LICENSE = "LGPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02"
-
-# cairo >= 1.8.8
-DEPENDS = "cairo"
-PR = "r2"
-
-SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.bz2"
-
-SRC_URI[md5sum] = "e6fd3f2f1e6a72e0db0868c4985669c5"
-SRC_URI[sha256sum] = "9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be"
-
-S = "${WORKDIR}/pycairo-${PV}"
-
-inherit distutils3 pkgconfig
-
-CFLAGS += "-fPIC"
-
-BBCLASSEXTEND = "native"
-
-do_configure() {
-	PYTHON=${PYTHON} ./waf configure --prefix=${D}${prefix} --libdir=${D}${libdir}
-}
-
-do_compile() {
-	./waf build ${PARALLEL_MAKE}
-}
-
-do_install() {
-	./waf install
-	sed \
-		-e 's:@prefix@:${prefix}:' \
-		-e 's:@VERSION@:${PV}:' \
-		-e 's:@includedir@:${includedir}:' \
-		py3cairo.pc.in > py3cairo.pc
-	install -m 0644 py3cairo.pc ${D}${libdir}/pkgconfig/
-}
diff --git a/meta/recipes-devtools/python/python3-pycairo_1.15.3.bb b/meta/recipes-devtools/python/python3-pycairo_1.15.3.bb
new file mode 100644
index 0000000..7863ad2
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-pycairo_1.15.3.bb
@@ -0,0 +1,30 @@
+SUMMARY = "Python bindings for the Cairo canvas library"
+HOMEPAGE = "http://cairographics.org/pycairo"
+BUGTRACKER = "http://bugs.freedesktop.org"
+SECTION = "python-devel"
+LICENSE = "LGPLv2.1 & MPLv1.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421 \
+                    file://COPYING-LGPL-2.1;md5=fad9b3332be894bab9bc501572864b29 \
+                    file://COPYING-MPL-1.1;md5=bfe1f75d606912a4111c90743d6c7325"
+
+# cairo >= 1.14
+DEPENDS = "cairo"
+
+SRC_URI = "https://github.com/pygobject/pycairo/releases/download/v${PV}/pycairo-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "7390cd413271fe5569f6eef73d72bf7a"
+SRC_URI[sha256sum] = "8642e36cef66acbfc02760d2b40c716f5f183d073fb063ba28fd29a14044719d"
+
+S = "${WORKDIR}/pycairo-${PV}"
+
+inherit setuptools3 pkgconfig
+
+CFLAGS += "-fPIC"
+
+BBCLASSEXTEND = "native"
+
+do_install_append() {
+    install -d ${D}${includedir}/pycairo/
+    install -m 0644 ${D}${datadir}/include/pycairo/py3cairo.h ${D}${includedir}/pycairo/
+}
+FILES_${PN} += "${datadir}/include/pycairo/py3cairo.h"
-- 
2.7.4

[PATCH 2/2] python3-pygobject: update to 3.26.0

[Jose Lamego]

python3-pygobject needs to be updated to latest stable branch.

This change was tested in qemux86 running core-image-minimal.

Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.com>
---
 .../{python3-pygobject_3.24.1.bb => python3-pygobject_3.26.0.bb}    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/python/{python3-pygobject_3.24.1.bb => python3-pygobject_3.26.0.bb} (76%)

diff --git a/meta/recipes-devtools/python/python3-pygobject_3.24.1.bb b/meta/recipes-devtools/python/python3-pygobject_3.26.0.bb
similarity index 76%
rename from meta/recipes-devtools/python/python3-pygobject_3.24.1.bb
rename to meta/recipes-devtools/python/python3-pygobject_3.26.0.bb
index 9d10af2..f368e6c 100644
--- a/meta/recipes-devtools/python/python3-pygobject_3.24.1.bb
+++ b/meta/recipes-devtools/python/python3-pygobject_3.26.0.bb
@@ -10,12 +10,10 @@ DEPENDS += "python3 glib-2.0"
 SRCNAME="pygobject"
 SRC_URI = " \
     http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \
-    file://0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch \
-    file://0001-configure.ac-Don-t-use-gnome-common-macros.patch \
 "
 
-SRC_URI[md5sum] = "69a843311d0f0385dff376e11a2d83d2"
-SRC_URI[sha256sum] = "a628a95aa0909e13fb08230b1b98fc48adef10b220932f76d62f6821b3fdbffd"
+SRC_URI[md5sum] = "1c1719b1798cc8bf1cb97777c41c83d1"
+SRC_URI[sha256sum] = "7411acd600c8cb6f00d2125afa23303f2104e59b83e0a4963288dbecc3b029fa"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-- 
2.7.4