Skip to contentSkip to conversation

python3-pycairo: update to 1.18.1

PATCH New Alexander Kanavin 1 participant 2 messages Apr 30, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 python3-pycairo: update to 1.18.1

Switch over to meson build, as it does not attempt to install headers into /usr/share and pkg-config files into /usr/share/$libdir.

---
 ...pycairo_1.15.6.bb => python3-pycairo_1.18.1.bb} | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)
 rename meta/recipes-devtools/python/{python3-pycairo_1.15.6.bb => python3-pycairo_1.18.1.bb} (63%)
meta/recipes-devtools/python/python3-pycairo_1.18.1.bb renamed from meta/recipes-devtools/python/python3-pycairo_1.15.6.bb +5 -9
similarity index 63%
rename from meta/recipes-devtools/python/python3-pycairo_1.15.6.bb
rename to meta/recipes-devtools/python/python3-pycairo_1.18.1.bb
index 5c3e1e6f03b..5aaa01a00a5 100644
@@ -8,24 +8,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421 \
                     file://COPYING-MPL-1.1;md5=bfe1f75d606912a4111c90743d6c7325"
 
 # cairo >= 1.14
-DEPENDS = "cairo"
+DEPENDS = "cairo python3"
 
 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] = "7610da8a40a7bed548991aa3416431d1"
+SRC_URI[sha256sum] = "70172e58b6bad7572a3518c26729b074acdde15e6fee6cbab6d3528ad552b786"
 
 S = "${WORKDIR}/pycairo-${PV}"
 
-inherit setuptools3 pkgconfig
+inherit meson 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"
+FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR}/*"
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 maintainers.inc: take over as perl maintainer

Ross requested; I agreed :-)

---
 meta/conf/distro/include/maintainers.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/conf/distro/include/maintainers.inc +2 -2
index 41c2a95d534..8c4548f2399 100644
@@ -556,8 +556,8 @@ RECIPE_MAINTAINER_pn-pbzip2 = "Denys Dmytriyenko <[email protected]>"
 RECIPE_MAINTAINER_pn-pciutils = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-pcmanfm = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-perf = "Bruce Ashfield <[email protected]>"
-RECIPE_MAINTAINER_pn-perl = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-perl-native = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-perl = "Alexander Kanavin <[email protected]>"
+RECIPE_MAINTAINER_pn-perl-native = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-piglit = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-pigz = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-pinentry = "Armin Kuster <[email protected]>"
Signature · 1 line
2.17.1