summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/maintainers.inc1
-rw-r--r--meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch (renamed from meta/recipes-gnome/gcr/gcr/0001-gcr-meson.build-fix-one-parallel-build-failure.patch)0
-rw-r--r--meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch (renamed from meta/recipes-gnome/gcr/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch)0
-rw-r--r--meta/recipes-gnome/gcr/gcr3_3.40.0.bb (renamed from meta/recipes-gnome/gcr/gcr_3.40.0.bb)8
4 files changed, 7 insertions, 2 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 172cd8171e..66797db02c 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -188,6 +188,7 @@ RECIPE_MAINTAINER:pn-gcc-runtime = "Khem Raj <raj.khem@gmail.com>"
188RECIPE_MAINTAINER:pn-gcc-sanitizers = "Khem Raj <raj.khem@gmail.com>" 188RECIPE_MAINTAINER:pn-gcc-sanitizers = "Khem Raj <raj.khem@gmail.com>"
189RECIPE_MAINTAINER:pn-gcc-source-12.2.0 = "Khem Raj <raj.khem@gmail.com>" 189RECIPE_MAINTAINER:pn-gcc-source-12.2.0 = "Khem Raj <raj.khem@gmail.com>"
190RECIPE_MAINTAINER:pn-gconf = "Ross Burton <ross.burton@arm.com>" 190RECIPE_MAINTAINER:pn-gconf = "Ross Burton <ross.burton@arm.com>"
191RECIPE_MAINTAINER:pn-gcr3 = "Markus Volk <f_l_k@t-online.de>"
191RECIPE_MAINTAINER:pn-gcr = "Alexander Kanavin <alex.kanavin@gmail.com>" 192RECIPE_MAINTAINER:pn-gcr = "Alexander Kanavin <alex.kanavin@gmail.com>"
192RECIPE_MAINTAINER:pn-gdb = "Khem Raj <raj.khem@gmail.com>" 193RECIPE_MAINTAINER:pn-gdb = "Khem Raj <raj.khem@gmail.com>"
193RECIPE_MAINTAINER:pn-gdb-cross-${TARGET_ARCH} = "Khem Raj <raj.khem@gmail.com>" 194RECIPE_MAINTAINER:pn-gdb-cross-${TARGET_ARCH} = "Khem Raj <raj.khem@gmail.com>"
diff --git a/meta/recipes-gnome/gcr/gcr/0001-gcr-meson.build-fix-one-parallel-build-failure.patch b/meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch
index 81c4bdbbcc..81c4bdbbcc 100644
--- a/meta/recipes-gnome/gcr/gcr/0001-gcr-meson.build-fix-one-parallel-build-failure.patch
+++ b/meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch
diff --git a/meta/recipes-gnome/gcr/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch b/meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
index ae4e2ac1eb..ae4e2ac1eb 100644
--- a/meta/recipes-gnome/gcr/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
+++ b/meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
diff --git a/meta/recipes-gnome/gcr/gcr_3.40.0.bb b/meta/recipes-gnome/gcr/gcr3_3.40.0.bb
index 917be5938b..5318768db6 100644
--- a/meta/recipes-gnome/gcr/gcr_3.40.0.bb
+++ b/meta/recipes-gnome/gcr/gcr3_3.40.0.bb
@@ -20,11 +20,15 @@ GTKDOC_MESON_OPTION = "gtk_doc"
20inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg 20inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg
21UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>\d+\.(?!9\d+)(\d*[02468])+(\.\d+)+)\.tar" 21UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>\d+\.(?!9\d+)(\d*[02468])+(\.\d+)+)\.tar"
22 22
23SRC_URI += "file://0001-gcr-meson.build-fix-one-parallel-build-failure.patch \ 23SRC_URI = " \
24 file://b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch" 24 https://download.gnome.org/sources/gcr/3.40/gcr-${PV}.tar.xz;name=archive \
25 file://0001-gcr-meson.build-fix-one-parallel-build-failure.patch \
26 file://b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch"
25 27
26SRC_URI[archive.sha256sum] = "b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5" 28SRC_URI[archive.sha256sum] = "b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5"
27 29
30S = "${WORKDIR}/gcr-${PV}"
31
28PACKAGECONFIG ??= " \ 32PACKAGECONFIG ??= " \
29 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ 33 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
30 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'gtk', '', d)} \ 34 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'gtk', '', d)} \