Skip to contentSkip to conversation

icu: update to 64.1

PATCH In review Alexander Kanavin 3 participants 9 messages Apr 18, 2019 – Apr 29, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 icu: update to 64.1

License-update: copyright years changed.

Drop upstreamed/backported patches.

Add a patch to fix big endian build failure.

---
 .../icu/icu/0001-Fix-big-endian-build.patch   | 28 +++++++++
 .../icu/icu/0002-Add-ARC-support.patch        | 27 --------
 .../icu/icu/CVE-2018-18928.patch              | 63 -------------------
 .../icu/{icu_63.1.bb => icu_64.1.bb}          |  9 ++-
 4 files changed, 32 insertions(+), 95 deletions(-)
 create mode 100644 meta/recipes-support/icu/icu/0001-Fix-big-endian-build.patch
 delete mode 100644 meta/recipes-support/icu/icu/0002-Add-ARC-support.patch
 delete mode 100644 meta/recipes-support/icu/icu/CVE-2018-18928.patch
 rename meta/recipes-support/icu/{icu_63.1.bb => icu_64.1.bb} (70%)
meta/recipes-support/icu/icu/0001-Fix-big-endian-build.patch new file +28 -0
new file mode 100644
index 00000000000..efb27ae4e31
@@ -0,0 +1,28 @@
+From 9be0b489a94b57419202c552022f25cb95bfac51 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Wed, 17 Apr 2019 16:41:58 +0200
+Subject: [PATCH] Fix big-endian build
+
+Bug-report: https://unicode-org.atlassian.net/browse/ICU-20533
+Patch taken from: https://bugs.gentoo.org/682170
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ data/Makefile.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/source/data/Makefile.in b/source/data/Makefile.in
+index 778b6c7..67203e7 100644
+--- a/data/Makefile.in
++++ b/data/Makefile.in
+@@ -148,7 +148,8 @@ ICUDATA_ARCHIVE = $(firstword $(wildcard $(srcdir)/in/$(ICUDATA_BASENAME_VERSION
+ # and convert it to the current type.
+ ifneq ($(ICUDATA_ARCHIVE),)
+ ICUDATA_SOURCE_ARCHIVE = $(OUTDIR)/$(ICUDATA_PLATFORM_NAME).dat
+-$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE) $(OUTDIR)
++$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE)
++	$(MKINSTALLDIRS) $(OUTDIR)
+ 	$(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(ICUDATA_ARCHIVE) $(ICUDATA_SOURCE_ARCHIVE)
+ endif
+ else
meta/recipes-support/icu/icu/0002-Add-ARC-support.patch deleted +0 -27
deleted file mode 100644
index 20e3d8356c4..00000000000
@@ -1,27 +0,0 @@
-From fcfd57105b4bdb30d906df152ef01748fa95daff Mon Sep 17 00:00:00 2001
-From: Alexey Brodkin <[email protected]>
-Date: Thu, 13 Sep 2018 17:13:20 +0300
-Subject: [PATCH] icu: Add ARC support
-
-Signed-off-by: Alexey Brodkin <[email protected]>
-
-Upstream-Status: Submitted [ https://github.com/unicode-org/icu/pull/149 ]
----
- i18n/double-conversion-utils.h                 | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/i18n/double-conversion-utils.h b/i18n/double-conversion-utils.h
-index 57fc49b231a3..0bd3e8340673 100644
---- a/i18n/double-conversion-utils.h
-+++ b/i18n/double-conversion-utils.h
-@@ -86,7 +86,7 @@ inline void abort_noreturn() { abort(); }
-     defined(__SH4__) || defined(__alpha__) || \
-     defined(_MIPS_ARCH_MIPS32R2) || \
-     defined(__AARCH64EL__) || defined(__aarch64__) || \
--    defined(__riscv)
-+    defined(__riscv) || defined(__arc__)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(__mc68000__)
- #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS
-2.17.1
-
meta/recipes-support/icu/icu/CVE-2018-18928.patch deleted +0 -63

63 lines not on this page · raw message

meta/recipes-support/icu/icu_64.1.bb renamed from meta/recipes-support/icu/icu_63.1.bb +4 -5
similarity index 70%
rename from meta/recipes-support/icu/icu_63.1.bb
rename to meta/recipes-support/icu/icu_64.1.bb
index 961f022ad7a..9a5f8a3b09a 100644
@@ -1,6 +1,6 @@
 require icu.inc
 
-LIC_FILES_CHKSUM = "file://../LICENSE;md5=63752c57bd0b365c9af9f427ef79c819"
+LIC_FILES_CHKSUM = "file://../LICENSE;md5=8bc5d32052a96f214cbdd1e53dfc935d"
 
 def icu_download_version(d):
     pvsplit = d.getVar('PV').split('.')
@@ -16,15 +16,14 @@ BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV
 SRC_URI = "${BASE_SRC_URI} \
            file://icu-pkgdata-large-cmd.patch \
            file://fix-install-manx.patch \
-           file://0002-Add-ARC-support.patch \
-           file://CVE-2018-18928.patch \
+           file://0001-Fix-big-endian-build.patch \
            "
 
 SRC_URI_append_class-target = "\
            file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
           "
-SRC_URI[md5sum] = "9e40f6055294284df958200e308bce50"
-SRC_URI[sha256sum] = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d"
+SRC_URI[md5sum] = "f150be2231c13bb45206d79e0242372b"
+SRC_URI[sha256sum] = "92f1b7b9d51b396679c17f35a2112423361b8da3c1b9de00aa94fd768ae296e6"
 
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
 UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/"
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/5 epiphany: update to 3.32.1.2

Drop an option no longer provided by upstream.

---
 .../epiphany/{epiphany_3.30.3.bb => epiphany_3.32.1.2.bb}   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
 rename meta/recipes-gnome/epiphany/{epiphany_3.30.3.bb => epiphany_3.32.1.2.bb} (80%)
meta/recipes-gnome/epiphany/epiphany_3.32.1.2.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.30.3.bb +2 -4
similarity index 80%
rename from meta/recipes-gnome/epiphany/epiphany_3.30.3.bb
rename to meta/recipes-gnome/epiphany/epiphany_3.32.1.2.bb
index a64c82f48bf..ba2e851bb6f 100644
@@ -13,10 +13,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl"
 SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
            file://0002-help-meson.build-disable-the-use-of-yelp.patch \
            "
-SRC_URI[archive.md5sum] = "fd05702b1c9bcb6a0633de54c4a6ccd2"
-SRC_URI[archive.sha256sum] = "76cdb8db6af2da8c3371a73e2dfd5ba64867b5f1e65fa9621f35348a42ff0d17"
-
-EXTRA_OEMESON += " -Ddistributor_name=${DISTRO}"
+SRC_URI[archive.md5sum] = "93faec353e9f62519859e6164350fd5d"
+SRC_URI[archive.sha256sum] = "a8284fb9bbc8b7914a154a8eac1598c8b59ae421e0d685146fb48198427926be"
 
 FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo"
 RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"
Signature · 1 line
2.17.1
#2 lore raw

Re: [PATCH 2/5] epiphany: update to 3.32.1.2

FWIW Fails on rpi3
https://errors.yoctoproject.org/Errors/Details/238639/

Quoted 37 lines · Alexander Kanavin

Drop an option no longer provided by upstream.

---
 .../epiphany/{epiphany_3.30.3.bb => epiphany_3.32.1.2.bb}   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
 rename meta/recipes-gnome/epiphany/{epiphany_3.30.3.bb => epiphany_3.32.1.2.bb} (80%)
meta/recipes-gnome/epiphany/epiphany_3.32.1.2.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.30.3.bb +2 -5
similarity index 80%
rename from meta/recipes-gnome/epiphany/epiphany_3.30.3.bb
rename to meta/recipes-gnome/epiphany/epiphany_3.32.1.2.bb
index a64c82f48bf..ba2e851bb6f 100644
@@ -13,10 +13,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl"
 SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
            file://0002-help-meson.build-disable-the-use-of-yelp.patch \
            "
-SRC_URI[archive.md5sum] = "fd05702b1c9bcb6a0633de54c4a6ccd2"
-SRC_URI[archive.sha256sum] = "76cdb8db6af2da8c3371a73e2dfd5ba64867b5f1e65fa9621f35348a42ff0d17"
-
-EXTRA_OEMESON += " -Ddistributor_name=${DISTRO}"
+SRC_URI[archive.md5sum] = "93faec353e9f62519859e6164350fd5d"
+SRC_URI[archive.sha256sum] = "a8284fb9bbc8b7914a154a8eac1598c8b59ae421e0d685146fb48198427926be"
 
 FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo"
 RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"
--

2.17.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#3 lore raw

Re: [PATCH 2/5] epiphany: update to 3.32.1.2

"../epiphany-3.32.1.2/lib/ephy-web-app-utils.c:391:5: error: cannot jump from this goto statement to its label"

Huh? :)

Alex

Quoted 43 lines · Khem Raj

FWIW Fails on rpi3
https://errors.yoctoproject.org/Errors/Details/238639/

Quoted 37 lines · Alexander Kanavin

Drop an option no longer provided by upstream.

---
 .../epiphany/{epiphany_3.30.3.bb => epiphany_3.32.1.2.bb}   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
 rename meta/recipes-gnome/epiphany/{epiphany_3.30.3.bb => epiphany_3.32.1.2.bb} (80%)
meta/recipes-gnome/epiphany/epiphany_3.32.1.2.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.30.3.bb +2 -5
similarity index 80%
rename from meta/recipes-gnome/epiphany/epiphany_3.30.3.bb
rename to meta/recipes-gnome/epiphany/epiphany_3.32.1.2.bb
index a64c82f48bf..ba2e851bb6f 100644
@@ -13,10 +13,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl"
 SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
            file://0002-help-meson.build-disable-the-use-of-yelp.patch \
            "
-SRC_URI[archive.md5sum] = "fd05702b1c9bcb6a0633de54c4a6ccd2"
-SRC_URI[archive.sha256sum] = "76cdb8db6af2da8c3371a73e2dfd5ba64867b5f1e65fa9621f35348a42ff0d17"
-
-EXTRA_OEMESON += " -Ddistributor_name=${DISTRO}"
+SRC_URI[archive.md5sum] = "93faec353e9f62519859e6164350fd5d"
+SRC_URI[archive.sha256sum] = "a8284fb9bbc8b7914a154a8eac1598c8b59ae421e0d685146fb48198427926be"
 
 FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo"
 RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"
--

2.17.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#4 lore raw

PATCH 3/5 python3: add another multilib fix

In reply to Alexander Kanavin
---
 ...-fix-another-place-where-lib-is-hard.patch | 31 +++++++++++++++++++
 meta/recipes-devtools/python/python3_3.7.3.bb |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch
meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch new file +31 -0
new file mode 100644
index 00000000000..b97583682a6
@@ -0,0 +1,31 @@
+From a21f4f8fa5e5c0601898740b4ac08ec84f41e190 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Thu, 18 Apr 2019 17:11:06 +0200
+Subject: [PATCH] Lib/sysconfig.py: fix another place where 'lib' is hardcoded
+ as the library path
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ Lib/sysconfig.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
+index d15cec8..87fa5e6 100644
+--- a/Lib/sysconfig.py
++++ b/Lib/sysconfig.py
+@@ -20,10 +20,10 @@ __all__ = [
+ 
+ _INSTALL_SCHEMES = {
+     'posix_prefix': {
+-        'stdlib': '{installed_base}/lib/python{py_version_short}',
+-        'platstdlib': '{platbase}/lib/python{py_version_short}',
+-        'purelib': '{base}/lib/python{py_version_short}/site-packages',
+-        'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
++        'stdlib': '{LIBDEST}',
++        'platstdlib': '{LIBDEST}',
++        'purelib': '{LIBDEST}/site-packages',
++        'platlib': '{LIBDEST}/site-packages',
+         'include':
+             '{installed_base}/include/python{py_version_short}{abiflags}',
+         'platinclude':
meta/recipes-devtools/python/python3_3.7.3.bb +1 -0
index ea46b0535b9..3a1c8f5be6f 100644
@@ -22,6 +22,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
            file://0002-Don-t-do-runtime-test-to-get-float-byte-order.patch \
            file://0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \
            file://ptesthack.patch \
+           file://0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch \
            "
 
 SRC_URI_append_class-native = " \
Signature · 1 line
2.17.1
#5 lore raw

PATCH 4/5 meson: do not try to substitute the prefix in python supplied paths

In reply to Alexander Kanavin

The prefix should be correct in the first place, and substitution breaks with our custom patched Python.

---
 meta/recipes-devtools/meson/meson.inc         |  1 +
 .../0001-Make-CPU-family-warnings-fatal.patch |  6 +--
 ...y-do-not-substitute-python-s-install.patch | 44 +++++++++++++++++++
 ...pport-building-allarch-recipes-again.patch |  4 +-
 4 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch
meta/recipes-devtools/meson/meson.inc +1 -0
index 6d743fbe142..21d34da6adf 100644
@@ -16,6 +16,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
            file://0001-environment.py-detect-windows-also-if-the-system-str.patch \
            file://0001-mesonbuild-environment.py-do-not-determine-whether-a.patch \
            file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
+           file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
            "
 SRC_URI[sha256sum] = "2a1bc42dda58206fb922cda5e1ca95cc03ad126321d26acc47d3493ec4e7021f"
 SRC_URI[md5sum] = "433483107fda4616eaf33de7e7083a84"
meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +3 -3
index 2580b1e366e..9e90b72f313 100644
@@ -1,4 +1,4 @@
-From f76d2bf09f7ffd871d068c4ac4c4be083f5fb07f Mon Sep 17 00:00:00 2001
+From 1ec44c955f45f3787aaf92edd70dec5bcf03f665 Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Tue, 3 Jul 2018 13:59:09 +0100
 Subject: [PATCH] Make CPU family warnings fatal
@@ -12,7 +12,7 @@ Signed-off-by: Ross Burton <[email protected]>
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index f2510c1..b9841fe 100644
+index 5309ef4..3f0a399 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
 @@ -178,7 +178,7 @@ class MachineInfo:
@@ -25,7 +25,7 @@ index f2510c1..b9841fe 100644
          endian = literal['endian']
          if endian not in ('little', 'big'):
 diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 4c1c5ac..a5a7461 100644
+index 3031a82..ecd18d0 100644
 --- a/mesonbuild/environment.py
 +++ b/mesonbuild/environment.py
 @@ -242,9 +242,7 @@ def detect_cpu_family(compilers):
meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch new file +44 -0

44 lines not on this page · raw message

meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +2 -2
index f0ea61bac55..323e21d8f6e 100644
@@ -1,4 +1,4 @@
-From 755902910ad124095c671b3c7f057e6513d9c0c6 Mon Sep 17 00:00:00 2001
+From a4bce582c1f13f48b329526aa81710405c4c691e Mon Sep 17 00:00:00 2001
 From: Peter Kjellerstedt <[email protected]>
 Date: Thu, 26 Jul 2018 16:32:49 +0200
 Subject: [PATCH] Support building allarch recipes again
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <[email protected]>
  1 file changed, 1 insertion(+)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index b9841fe..9c0487e 100644
+index 3f0a399..4509e09 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
 @@ -34,6 +34,7 @@ from . import mlog
Signature · 1 line
2.17.1
#6 lore raw

PATCH 5/5 python3-pygobject: update to 3.32.0

In reply to Alexander Kanavin

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.

---
 .../0001-Do-not-build-tests.patch             | 26 +++++++++++++++++++
 ..._3.28.3.bb => python3-pygobject_3.32.0.bb} | 10 ++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-devtools/python/python3-pygobject/0001-Do-not-build-tests.patch
 rename meta/recipes-devtools/python/{python3-pygobject_3.28.3.bb => python3-pygobject_3.32.0.bb} (68%)
meta/recipes-devtools/python/python3-pygobject/0001-Do-not-build-tests.patch new file +26 -0
new file mode 100644
index 00000000000..626a82cb095
@@ -0,0 +1,26 @@
+From c125a806de951359ab7e302b0584f7c92fa451ad Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+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 <[email protected]>
+---
+ 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
+
meta/recipes-devtools/python/python3-pygobject_3.32.0.bb renamed from meta/recipes-devtools/python/python3-pygobject_3.28.3.bb +7 -3
similarity index 68%
rename from meta/recipes-devtools/python/python3-pygobject_3.28.3.bb
rename to meta/recipes-devtools/python/python3-pygobject_3.32.0.bb
index 313af227b62..c2676b35022 100644
@@ -3,6 +3,7 @@ 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"
@@ -10,10 +11,13 @@ 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[md5sum] = "3bac63c86bb963aa401f97859464aa90"
-SRC_URI[sha256sum] = "3dd3e21015d06e00482ea665fc1733b77e754a6ab656a5db5d7f7bfaf31ad0b0"
+UNKNOWN_CONFIGURE_WHITELIST = "introspection"
+
+SRC_URI[md5sum] = "6e39bca1d19a27cde4435061dd59578a"
+SRC_URI[sha256sum] = "83f4d7e59fde6bc6b0d39c5e5208574802f759bc525a4cb8e7265dfcba45ef29"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
@@ -21,7 +25,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', [ 'directfb', 'wa
 
 # 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"
+PACKAGECONFIG[cairo] = "-Dpycairo=true,-Dpycairo=false, cairo python3-pycairo, python3-pycairo"
 
 RDEPENDS_${PN} += "python3-setuptools"
 
Signature · 1 line
2.17.1
#7 lore raw

Re: [PATCH 5/5] python3-pygobject: update to 3.32.0

Quoted 16 lines · Alexander Kanavin

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.

---
 .../0001-Do-not-build-tests.patch             | 26
+++++++++++++++++++
 ..._3.28.3.bb => python3-pygobject_3.32.0.bb} | 10 ++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-devtools/python/python3-
pygobject/0001-Do-not-build-tests.patch
 rename meta/recipes-devtools/python/{python3-pygobject_3.28.3.bb =>
Quoted 1 line

python3-pygobject_3.32.0.bb} (68%)

This merged but I think it is still causing some QA errors which somehow got skipped in the previous tests:

https://autobuilder.yoctoproject.org/typhoon/#/builders/20/builds/765

(in the native case we may need to do something with the whitelist too?)

Cheers,

Richard

#8 lore raw

Re: [PATCH 5/5] python3-pygobject: update to 3.32.0

I'm only seeing g-i-native issues in the log, and nothing python-gobject related? (g-i-native will be fixed separately)

Alex

Quoted 32 lines · Richard Purdie
Quoted 16 lines · Alexander Kanavin

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.

---
 .../0001-Do-not-build-tests.patch             | 26
+++++++++++++++++++
 ..._3.28.3.bb => python3-pygobject_3.32.0.bb} | 10 ++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-devtools/python/python3-
pygobject/0001-Do-not-build-tests.patch
 rename meta/recipes-devtools/python/{python3-pygobject_3.28.3.bb =>
Quoted 1 line

python3-pygobject_3.32.0.bb} (68%)

This merged but I think it is still causing some QA errors which somehow got skipped in the previous tests:

https://autobuilder.yoctoproject.org/typhoon/#/builders/20/builds/765

(in the native case we may need to do something with the whitelist too?)

Cheers,

Richard