From 3dac429130c690abf9f092252e7935437d7908da Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 17 Sep 2023 11:38:52 +0200 Subject: python3-pygobject: update 3.44.1 -> 3.46.0 Replace a patch with a recipe option. (From OE-Core rev: 84acec2fd882e42461031fc77247ddcdc4a9269a) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../0001-Do-not-build-tests.patch | 30 ---------------- .../python/python3-pygobject_3.44.1.bb | 42 ---------------------- .../python/python3-pygobject_3.46.0.bb | 40 +++++++++++++++++++++ 3 files changed, 40 insertions(+), 72 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-pygobject/0001-Do-not-build-tests.patch delete mode 100644 meta/recipes-devtools/python/python3-pygobject_3.44.1.bb create mode 100644 meta/recipes-devtools/python/python3-pygobject_3.46.0.bb (limited to 'meta') 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 deleted file mode 100644 index 0f2465bb52..0000000000 --- a/meta/recipes-devtools/python/python3-pygobject/0001-Do-not-build-tests.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 278fa16f..aacbd4a2 100644 ---- a/meson.build -+++ b/meson.build -@@ -175,6 +175,6 @@ configure_file(input : 'PKG-INFO.in', - subdir('gi') - subdir('pygtkcompat') - with_tests = get_option('tests') --if with_tests --subdir('tests') --endif -+#if with_tests -+#subdir('tests') -+#endif --- -2.17.1 - diff --git a/meta/recipes-devtools/python/python3-pygobject_3.44.1.bb b/meta/recipes-devtools/python/python3-pygobject_3.44.1.bb deleted file mode 100644 index 797a7cec8b..0000000000 --- a/meta/recipes-devtools/python/python3-pygobject_3.44.1.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Python GObject bindings" -HOMEPAGE = "https://gitlab.gnome.org/GNOME/pygobject" -DESCRIPTION = "PyGObject is a Python package which provides bindings for GObject based libraries such as GTK, GStreamer, WebKitGTK, GLib, GIO and many more." -SECTION = "devel/python" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" - -GNOMEBASEBUILDCLASS = "meson" -GIR_MESON_OPTION = "" - -inherit gnomebase setuptools3-base gobject-introspection upstream-version-is-even - -python() { - if d.getVar('CLASSOVERRIDE') == "class-target" and not bb.utils.to_boolean(d.getVar("GI_DATA_ENABLED")): - raise bb.parse.SkipRecipe("GI not available") -} - -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 \ -" -SRC_URI[sha256sum] = "3c6805d1321be90cc32e648215a562430e0d3d6edcda8f4c5e7a9daffcad5710" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', [ 'directfb', 'wayland', 'x11' ], 'cairo', '', d)}" - -RDEPENDS:${PN} += " \ - python3-io \ - python3-pkgutil \ -" - -# python3-pycairo is checked on configuration -> DEPENDS -# we don't link against python3-pycairo -> RDEPENDS -PACKAGECONFIG[cairo] = "-Dpycairo=enabled,-Dpycairo=disabled, cairo python3-pycairo, python3-pycairo" - -BBCLASSEXTEND = "native" -PACKAGECONFIG:class-native = "" diff --git a/meta/recipes-devtools/python/python3-pygobject_3.46.0.bb b/meta/recipes-devtools/python/python3-pygobject_3.46.0.bb new file mode 100644 index 0000000000..28129fd66a --- /dev/null +++ b/meta/recipes-devtools/python/python3-pygobject_3.46.0.bb @@ -0,0 +1,40 @@ +SUMMARY = "Python GObject bindings" +HOMEPAGE = "https://gitlab.gnome.org/GNOME/pygobject" +DESCRIPTION = "PyGObject is a Python package which provides bindings for GObject based libraries such as GTK, GStreamer, WebKitGTK, GLib, GIO and many more." +SECTION = "devel/python" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" + +GNOMEBASEBUILDCLASS = "meson" +GIR_MESON_OPTION = "" + +inherit gnomebase setuptools3-base gobject-introspection upstream-version-is-even + +python() { + if d.getVar('CLASSOVERRIDE') == "class-target" and not bb.utils.to_boolean(d.getVar("GI_DATA_ENABLED")): + raise bb.parse.SkipRecipe("GI not available") +} + +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[sha256sum] = "426008b2dad548c9af1c7b03b59df0440fde5c33f38fb5406b103a43d653cafc" + +S = "${WORKDIR}/${SRCNAME}-${PV}" + +PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', [ 'directfb', 'wayland', 'x11' ], 'cairo', '', d)}" + +RDEPENDS:${PN} += " \ + python3-io \ + python3-pkgutil \ +" + +# python3-pycairo is checked on configuration -> DEPENDS +# we don't link against python3-pycairo -> RDEPENDS +PACKAGECONFIG[cairo] = "-Dpycairo=enabled,-Dpycairo=disabled, cairo python3-pycairo, python3-pycairo" +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false," + +BBCLASSEXTEND = "native" +PACKAGECONFIG:class-native = "" -- cgit v1.2.3-54-g00ecf