Skip to contentSkip to conversation

python3-pycairo: update to version 1.16.3

PATCH In review Derek Straka 2 participants 2 messages Mar 24, 2018 – Mar 26, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 python3-pycairo: update to version 1.16.3

Update to the latest stable release

Changes in this update:
Add the .pc file to the list of -dev files
Move py3cairo header to -dev package
Added a comment for why the .pc and .h file are re-installed

Verified native build and dependency builds (python3-pygobject and bootchart2) Tested in qemux86-64 running core-image-minimal

---
 ...ython3-pycairo_1.15.6.bb => python3-pycairo_1.16.3.bb} | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/python/{python3-pycairo_1.15.6.bb => python3-pycairo_1.16.3.bb} (58%)
meta/recipes-devtools/python/python3-pycairo_1.16.3.bb renamed from meta/recipes-devtools/python/python3-pycairo_1.15.6.bb +11 -4
similarity index 58%
rename from meta/recipes-devtools/python/python3-pycairo_1.15.6.bb
rename to meta/recipes-devtools/python/python3-pycairo_1.16.3.bb
index 5c3e1e6..85f3752 100644
@@ -13,8 +13,8 @@ DEPENDS = "cairo"
 SRC_URI = "https://github.com/pygobject/pycairo/releases/download/v${PV}/pycairo-${PV}.tar.gz"
 UPSTREAM_CHECK_URI = "https://github.com/pygobject/pycairo/releases/"
 
-SRC_URI[md5sum] = "3ff210c34e7b052590e15fd0fb147766"
-SRC_URI[sha256sum] = "ad150ea637860836b66705e0513b8e59494538f0b80497ad3462051368755016"
+SRC_URI[md5sum] = "d2a115037ccd128219f43d5ed3df7926"
+SRC_URI[sha256sum] = "5bb321e5d4f8b3a51f56fc6a35c143f1b72ce0d748b43d8b623596e8215f01f7"
 
 S = "${WORKDIR}/pycairo-${PV}"
 
@@ -25,7 +25,14 @@ CFLAGS += "-fPIC"
 BBCLASSEXTEND = "native"
 
 do_install_append() {
-    install -d ${D}${includedir}/pycairo/
+    # setup.py uses --install-data which points to a non-standard datadir  to install the header and .pc files
+    # Fix the paths here to install in the standard locations as well
+    install -d ${D}${includedir}/pycairo/ -d ${D}${nonarch_libdir}/pkgconfig
     install -m 0644 ${D}${datadir}/include/pycairo/py3cairo.h ${D}${includedir}/pycairo/
+    install -m 0644 ${D}${datadir}/lib/pkgconfig/py3cairo.pc ${D}${nonarch_libdir}/pkgconfig/
 }
-FILES_${PN} += "${datadir}/include/pycairo/py3cairo.h"
+
+FILES_${PN}-dev += " \
+    ${datadir}/include/pycairo/py3cairo.h \
+    ${datadir}/lib/pkgconfig/py3cairo.pc \
+"
Signature · 1 line
2.7.4
#1 lore raw

Doesnt work correctly in multilib environments:

| Writing /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-multilib/build/build/tmp/work/core2-64-poky-linux/python3-pycairo/1.16.3-r0/image/usr/lib64/python3.5/site-packages/pycairo-1.16.3-py3.5.egg-info | install: cannot stat '/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-multilib/build/build/tmp/work/core2-64-poky-linux/python3-pycairo/1.16.3-r0/image/usr/share/lib/pkgconfig/py3cairo.pc':
No such file or directory
| WARNING: exit code 1 from a shell command.

Ross