summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2023-09-17 11:38:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-09-18 08:53:10 +0100
commit3dac429130c690abf9f092252e7935437d7908da (patch)
tree5686ea37bb0658ff1251a1c36880f2cdd1f88972
parent137cb1188e0febe8fafbb54e34582789c1b3de42 (diff)
downloadpoky-3dac429130c690abf9f092252e7935437d7908da.tar.gz
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 <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python3-pygobject/0001-Do-not-build-tests.patch30
-rw-r--r--meta/recipes-devtools/python/python3-pygobject_3.46.0.bb (renamed from meta/recipes-devtools/python/python3-pygobject_3.44.1.bb)8
2 files changed, 3 insertions, 35 deletions
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 @@
1From c125a806de951359ab7e302b0584f7c92fa451ad Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 12 Apr 2019 16:25:58 +0200
4Subject: [PATCH] Do not build tests
5
6They require installing tests from g-i, which we do not do.
7
8Upstream-Status: Inappropriate [oe-core specific]
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10---
11 meson.build | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/meson.build b/meson.build
15index 278fa16f..aacbd4a2 100644
16--- a/meson.build
17+++ b/meson.build
18@@ -175,6 +175,6 @@ configure_file(input : 'PKG-INFO.in',
19 subdir('gi')
20 subdir('pygtkcompat')
21 with_tests = get_option('tests')
22-if with_tests
23-subdir('tests')
24-endif
25+#if with_tests
26+#subdir('tests')
27+#endif
28--
292.17.1
30
diff --git a/meta/recipes-devtools/python/python3-pygobject_3.44.1.bb b/meta/recipes-devtools/python/python3-pygobject_3.46.0.bb
index 797a7cec8b..28129fd66a 100644
--- a/meta/recipes-devtools/python/python3-pygobject_3.44.1.bb
+++ b/meta/recipes-devtools/python/python3-pygobject_3.46.0.bb
@@ -19,11 +19,8 @@ DEPENDS += "python3 glib-2.0"
19 19
20SRCNAME="pygobject" 20SRCNAME="pygobject"
21 21
22SRC_URI = " \ 22SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz"
23 http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \ 23SRC_URI[sha256sum] = "426008b2dad548c9af1c7b03b59df0440fde5c33f38fb5406b103a43d653cafc"
24 file://0001-Do-not-build-tests.patch \
25"
26SRC_URI[sha256sum] = "3c6805d1321be90cc32e648215a562430e0d3d6edcda8f4c5e7a9daffcad5710"
27 24
28S = "${WORKDIR}/${SRCNAME}-${PV}" 25S = "${WORKDIR}/${SRCNAME}-${PV}"
29 26
@@ -37,6 +34,7 @@ RDEPENDS:${PN} += " \
37# python3-pycairo is checked on configuration -> DEPENDS 34# python3-pycairo is checked on configuration -> DEPENDS
38# we don't link against python3-pycairo -> RDEPENDS 35# we don't link against python3-pycairo -> RDEPENDS
39PACKAGECONFIG[cairo] = "-Dpycairo=enabled,-Dpycairo=disabled, cairo python3-pycairo, python3-pycairo" 36PACKAGECONFIG[cairo] = "-Dpycairo=enabled,-Dpycairo=disabled, cairo python3-pycairo, python3-pycairo"
37PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,"
40 38
41BBCLASSEXTEND = "native" 39BBCLASSEXTEND = "native"
42PACKAGECONFIG:class-native = "" 40PACKAGECONFIG:class-native = ""