From 66ecad10aea3b8b1e66ecbb495be6142aa638371 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 18 Apr 2019 17:59:18 +0200 Subject: python3-pygobject: update to 3.32.0 Switch to meson build system. Add a patch to disable tests. Add "introspection" to unknown configure option whitelist, as this recipe needs g-i unconditionally. (From OE-Core rev: 890a460d2ad9bce8f6a1df055e040f334f958673) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../0001-Do-not-build-tests.patch | 26 +++++++++++++++++ .../python/python3-pygobject_3.28.3.bb | 29 ------------------- .../python/python3-pygobject_3.32.0.bb | 33 ++++++++++++++++++++++ 3 files changed, 59 insertions(+), 29 deletions(-) create mode 100644 meta/recipes-devtools/python/python3-pygobject/0001-Do-not-build-tests.patch delete mode 100644 meta/recipes-devtools/python/python3-pygobject_3.28.3.bb create mode 100644 meta/recipes-devtools/python/python3-pygobject_3.32.0.bb (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/python/python3-pygobject/0001-Do-not-build-tests.patch b/meta/recipes-devtools/python/python3-pygobject/0001-Do-not-build-tests.patch new file mode 100644 index 0000000000..626a82cb09 --- /dev/null +++ b/meta/recipes-devtools/python/python3-pygobject/0001-Do-not-build-tests.patch @@ -0,0 +1,26 @@ +From c125a806de951359ab7e302b0584f7c92fa451ad Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 12 Apr 2019 16:25:58 +0200 +Subject: [PATCH] Do not build tests + +They require installing tests from g-i, which we do not do. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index a63d771..b3925d0 100644 +--- a/meson.build ++++ b/meson.build +@@ -174,4 +174,4 @@ configure_file(input : 'PKG-INFO.in', + + subdir('gi') + subdir('pygtkcompat') +-subdir('tests') ++#subdir('tests') +-- +2.17.1 + diff --git a/meta/recipes-devtools/python/python3-pygobject_3.28.3.bb b/meta/recipes-devtools/python/python3-pygobject_3.28.3.bb deleted file mode 100644 index 313af227b6..0000000000 --- a/meta/recipes-devtools/python/python3-pygobject_3.28.3.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Python GObject bindings" -SECTION = "devel/python" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" - -inherit gnomebase distutils3-base gobject-introspection upstream-version-is-even - -DEPENDS += "python3 glib-2.0" - -SRCNAME="pygobject" -SRC_URI = " \ - http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \ -" - -SRC_URI[md5sum] = "3bac63c86bb963aa401f97859464aa90" -SRC_URI[sha256sum] = "3dd3e21015d06e00482ea665fc1733b77e754a6ab656a5db5d7f7bfaf31ad0b0" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', [ 'directfb', 'wayland', 'x11' ], 'cairo', '', d)}" - -# python3-pycairo is checked on configuration -> DEPENDS -# we don't link against python3-pycairo -> RDEPENDS -PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo python3-pycairo, python3-pycairo" - -RDEPENDS_${PN} += "python3-setuptools" - -BBCLASSEXTEND = "native" -PACKAGECONFIG_class-native = "" diff --git a/meta/recipes-devtools/python/python3-pygobject_3.32.0.bb b/meta/recipes-devtools/python/python3-pygobject_3.32.0.bb new file mode 100644 index 0000000000..c2676b3502 --- /dev/null +++ b/meta/recipes-devtools/python/python3-pygobject_3.32.0.bb @@ -0,0 +1,33 @@ +SUMMARY = "Python GObject bindings" +SECTION = "devel/python" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase distutils3-base gobject-introspection upstream-version-is-even + +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-Do-not-build-tests.patch \ +" + +UNKNOWN_CONFIGURE_WHITELIST = "introspection" + +SRC_URI[md5sum] = "6e39bca1d19a27cde4435061dd59578a" +SRC_URI[sha256sum] = "83f4d7e59fde6bc6b0d39c5e5208574802f759bc525a4cb8e7265dfcba45ef29" + +S = "${WORKDIR}/${SRCNAME}-${PV}" + +PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', [ 'directfb', 'wayland', 'x11' ], 'cairo', '', d)}" + +# python3-pycairo is checked on configuration -> DEPENDS +# we don't link against python3-pycairo -> RDEPENDS +PACKAGECONFIG[cairo] = "-Dpycairo=true,-Dpycairo=false, cairo python3-pycairo, python3-pycairo" + +RDEPENDS_${PN} += "python3-setuptools" + +BBCLASSEXTEND = "native" +PACKAGECONFIG_class-native = "" -- cgit v1.2.3-54-g00ecf