diff options
Diffstat (limited to 'meta/recipes-gnome')
18 files changed, 100 insertions, 81 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch index 3d685db774..24edda8102 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4bfb696fd125f044e3df9f6983c4ad518d9552c7 Mon Sep 17 00:00:00 2001 | 1 | From 325a4cde99a00b84116ab7111d27e6973f3c5026 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Thu, 26 Jan 2023 20:29:46 +0100 | 3 | Date: Thu, 26 Jan 2023 20:29:46 +0100 |
4 | Subject: [PATCH] meson.build: allow (a subset of) tests in cross compile | 4 | Subject: [PATCH] meson.build: allow (a subset of) tests in cross compile |
@@ -19,7 +19,7 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de> | |||
19 | 2 files changed, 9 insertions(+), 7 deletions(-) | 19 | 2 files changed, 9 insertions(+), 7 deletions(-) |
20 | 20 | ||
21 | diff --git a/meson.build b/meson.build | 21 | diff --git a/meson.build b/meson.build |
22 | index 78f3683..e0feaee 100644 | 22 | index 3eb3fcc..dc7e790 100644 |
23 | --- a/meson.build | 23 | --- a/meson.build |
24 | +++ b/meson.build | 24 | +++ b/meson.build |
25 | @@ -390,10 +390,10 @@ subdir('gdk-pixbuf') | 25 | @@ -390,10 +390,10 @@ subdir('gdk-pixbuf') |
@@ -37,7 +37,7 @@ index 78f3683..e0feaee 100644 | |||
37 | endif | 37 | endif |
38 | 38 | ||
39 | diff --git a/tests/meson.build b/tests/meson.build | 39 | diff --git a/tests/meson.build b/tests/meson.build |
40 | index 78d0ad9..0c9e64e 100644 | 40 | index 3781066..911b5fb 100644 |
41 | --- a/tests/meson.build | 41 | --- a/tests/meson.build |
42 | +++ b/tests/meson.build | 42 | +++ b/tests/meson.build |
43 | @@ -4,7 +4,7 @@ | 43 | @@ -4,7 +4,7 @@ |
@@ -49,7 +49,7 @@ index 78d0ad9..0c9e64e 100644 | |||
49 | # Resources; we cannot use gnome.compile_resources() here, because we need to | 49 | # Resources; we cannot use gnome.compile_resources() here, because we need to |
50 | # override the environment in order to use the utilities we just built instead | 50 | # override the environment in order to use the utilities we just built instead |
51 | # of the system ones | 51 | # of the system ones |
52 | @@ -172,9 +172,11 @@ endif | 52 | @@ -164,9 +164,11 @@ endif |
53 | test_deps = gdk_pixbuf_deps + [ gdkpixbuf_dep, ] | 53 | test_deps = gdk_pixbuf_deps + [ gdkpixbuf_dep, ] |
54 | test_args = [ '-k' ] | 54 | test_args = [ '-k' ] |
55 | test_env = environment() | 55 | test_env = environment() |
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch index 80c93e2166..3b4bf62861 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9b4f5738f8ac30f393b6163dcc84757976683d9b Mon Sep 17 00:00:00 2001 | 1 | From f78ab4edaee5f62663a9a4bcfa56e5c524da4474 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Tue, 1 Apr 2014 17:23:36 +0100 | 3 | Date: Tue, 1 Apr 2014 17:23:36 +0100 |
4 | Subject: [PATCH] gdk-pixbuf: add an option so that loader errors are fatal | 4 | Subject: [PATCH] gdk-pixbuf: add an option so that loader errors are fatal |
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.11.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.12.bb index ef0f23f8f7..9f825a68ef 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.11.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.12.bb | |||
@@ -22,7 +22,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ | |||
22 | file://0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch \ | 22 | file://0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch \ |
23 | " | 23 | " |
24 | 24 | ||
25 | SRC_URI[sha256sum] = "49dcb402388708647e8c321d56b6fb30f21e51e515d0c5a942268d23052a2f00" | 25 | SRC_URI[sha256sum] = "b9505b3445b9a7e48ced34760c3bcb73e966df3ac94c95a148cb669ab748e3c7" |
26 | 26 | ||
27 | inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gi-docgen lib_package | 27 | inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gi-docgen lib_package |
28 | 28 | ||
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch index c9e1afffd0..510bc426d1 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From aeb5532f8be42d42f4e8725ca42e239b36983a4d Mon Sep 17 00:00:00 2001 | 1 | From 4e1aa0ddbc43403ff24f644b4c4912b737290c41 Mon Sep 17 00:00:00 2001 |
2 | From: Sascha Silbe <x-yo17@se-silbe.de> | 2 | From: Sascha Silbe <x-yo17@se-silbe.de> |
3 | Date: Fri, 8 Jun 2018 13:55:10 +0200 | 3 | Date: Fri, 8 Jun 2018 13:55:10 +0200 |
4 | Subject: [PATCH] Relocate the repository directory for native builds | 4 | Subject: [PATCH] Relocate the repository directory for native builds |
@@ -14,14 +14,13 @@ cache or sstate mirror). | |||
14 | 14 | ||
15 | Upstream-Status: Inappropriate | 15 | Upstream-Status: Inappropriate |
16 | Signed-off-by: Sascha Silbe <x-yo17@se-silbe.de> | 16 | Signed-off-by: Sascha Silbe <x-yo17@se-silbe.de> |
17 | |||
18 | --- | 17 | --- |
19 | girepository/girepository.c | 15 +++++++++++++-- | 18 | girepository/girepository.c | 15 +++++++++++++-- |
20 | girepository/meson.build | 2 +- | 19 | girepository/meson.build | 2 +- |
21 | 2 files changed, 14 insertions(+), 3 deletions(-) | 20 | 2 files changed, 14 insertions(+), 3 deletions(-) |
22 | 21 | ||
23 | diff --git a/girepository/girepository.c b/girepository/girepository.c | 22 | diff --git a/girepository/girepository.c b/girepository/girepository.c |
24 | index a0754f4..2d456f9 100644 | 23 | index 12eaf36..876382c 100644 |
25 | --- a/girepository/girepository.c | 24 | --- a/girepository/girepository.c |
26 | +++ b/girepository/girepository.c | 25 | +++ b/girepository/girepository.c |
27 | @@ -21,6 +21,8 @@ | 26 | @@ -21,6 +21,8 @@ |
@@ -42,7 +41,7 @@ index a0754f4..2d456f9 100644 | |||
42 | /** | 41 | /** |
43 | * SECTION:girepository | 42 | * SECTION:girepository |
44 | * @short_description: GObject Introspection repository manager | 43 | * @short_description: GObject Introspection repository manager |
45 | @@ -215,9 +219,16 @@ init_globals (void) | 44 | @@ -222,9 +226,16 @@ init_globals (void) |
46 | g_free (custom_dirs); | 45 | g_free (custom_dirs); |
47 | } | 46 | } |
48 | 47 | ||
@@ -62,10 +61,10 @@ index a0754f4..2d456f9 100644 | |||
62 | typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir); | 61 | typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir); |
63 | 62 | ||
64 | diff --git a/girepository/meson.build b/girepository/meson.build | 63 | diff --git a/girepository/meson.build b/girepository/meson.build |
65 | index 786749a..15cf2a9 100644 | 64 | index 5ced59e..a580d9b 100644 |
66 | --- a/girepository/meson.build | 65 | --- a/girepository/meson.build |
67 | +++ b/girepository/meson.build | 66 | +++ b/girepository/meson.build |
68 | @@ -45,7 +45,7 @@ girepo_internals_lib = static_library('girepository-internals', | 67 | @@ -47,7 +47,7 @@ girepo_internals_lib = static_library('girepository-internals', |
69 | ], | 68 | ], |
70 | c_args: gi_hidden_visibility_cflags + custom_c_args, | 69 | c_args: gi_hidden_visibility_cflags + custom_c_args, |
71 | include_directories : configinc, | 70 | include_directories : configinc, |
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.78.1.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.80.1.bb index 05a08a50e0..582ac248fd 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.78.1.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.80.1.bb | |||
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ | |||
16 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ | 16 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ |
17 | " | 17 | " |
18 | 18 | ||
19 | SRC_URI[sha256sum] = "bd7babd99af7258e76819e45ba4a6bc399608fe762d83fde3cac033c50841bb4" | 19 | SRC_URI[sha256sum] = "a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8" |
20 | 20 | ||
21 | SRC_URI:append:class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" | 21 | SRC_URI:append:class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" |
22 | 22 | ||
@@ -26,7 +26,9 @@ GTKDOC_MESON_OPTION = "gtk_doc" | |||
26 | 26 | ||
27 | MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" | 27 | MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" |
28 | 28 | ||
29 | DEPENDS += " libffi zlib glib-2.0 python3 flex-native bison-native" | 29 | DEPENDS += " libffi zlib python3 flex-native bison-native" |
30 | DEPENDS:append:class-native = " glib-2.0" | ||
31 | DEPENDS:append:class-target = " glib-2.0-initial" | ||
30 | 32 | ||
31 | # target build needs qemu to run temporary introspection binaries created | 33 | # target build needs qemu to run temporary introspection binaries created |
32 | # on the fly by g-ir-scanner and a native version of itself to run | 34 | # on the fly by g-ir-scanner and a native version of itself to run |
@@ -189,6 +191,6 @@ FILES:${PN}-dbg += "${libdir}/gobject-introspection/giscanner/.debug/" | |||
189 | FILES:${PN}-staticdev += "${libdir}/gobject-introspection/giscanner/*.a" | 191 | FILES:${PN}-staticdev += "${libdir}/gobject-introspection/giscanner/*.a" |
190 | 192 | ||
191 | # setuptools can be removed when upstream removes all uses of distutils | 193 | # setuptools can be removed when upstream removes all uses of distutils |
192 | RDEPENDS:${PN} = "python3-pickle python3-xml python3-setuptools" | 194 | RDEPENDS:${PN} = "python3-pickle python3-xml python3-setuptools glib-2.0" |
193 | 195 | ||
194 | BBCLASSEXTEND = "native" | 196 | BBCLASSEXTEND = "native" |
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.41.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.42.bb index 17e90c59f0..61cecce4d1 100644 --- a/meta/recipes-gnome/gtk+/gtk+3_3.24.41.bb +++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.42.bb | |||
@@ -5,7 +5,7 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" | |||
5 | SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ | 5 | SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ |
6 | file://opengl.patch \ | 6 | file://opengl.patch \ |
7 | " | 7 | " |
8 | SRC_URI[sha256sum] = "47da61487af3087a94bc49296fd025ca0bc02f96ef06c556e7c8988bd651b6fa" | 8 | SRC_URI[sha256sum] = "50f89f615092d4dd01bbd759719f8bd380e5f149f6fd78a94725e2de112377e2" |
9 | 9 | ||
10 | S = "${WORKDIR}/gtk+-${PV}" | 10 | S = "${WORKDIR}/gtk+-${PV}" |
11 | 11 | ||
@@ -14,4 +14,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ | |||
14 | file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ | 14 | file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ |
15 | file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1" | 15 | file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1" |
16 | 16 | ||
17 | CVE_PRODUCT = "gnome:gtk" | 17 | CVE_PRODUCT = "gnome:gtk gtk:gtk\+" |
diff --git a/meta/recipes-gnome/gtk+/gtk4_4.14.2.bb b/meta/recipes-gnome/gtk+/gtk4_4.14.4.bb index 282e81f048..cda0552f7c 100644 --- a/meta/recipes-gnome/gtk+/gtk4_4.14.2.bb +++ b/meta/recipes-gnome/gtk+/gtk4_4.14.4.bb | |||
@@ -37,7 +37,7 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" | |||
37 | UPSTREAM_CHECK_REGEX = "gtk-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar.xz" | 37 | UPSTREAM_CHECK_REGEX = "gtk-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar.xz" |
38 | 38 | ||
39 | SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk/${MAJ_VER}/gtk-${PV}.tar.xz" | 39 | SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk/${MAJ_VER}/gtk-${PV}.tar.xz" |
40 | SRC_URI[sha256sum] = "22604cef2898a79e5f2143bb7aee2b7d1fa2eb946989a9d1338ecf9c8ae0e072" | 40 | SRC_URI[sha256sum] = "443518b97e8348f9f6430ac435b1010f9a6c5207f4dc6a7cd5d24e3820cee633" |
41 | 41 | ||
42 | S = "${WORKDIR}/gtk-${PV}" | 42 | S = "${WORKDIR}/gtk-${PV}" |
43 | 43 | ||
@@ -76,6 +76,10 @@ PACKAGECONFIG[gstreamer] = "-Dmedia-gstreamer=enabled,-Dmedia-gstreamer=disabled | |||
76 | PACKAGECONFIG[tracker] = "-Dtracker=enabled,-Dtracker=disabled,tracker,tracker-miners" | 76 | PACKAGECONFIG[tracker] = "-Dtracker=enabled,-Dtracker=disabled,tracker,tracker-miners" |
77 | PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled, vulkan-loader vulkan-headers shaderc-native" | 77 | PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled, vulkan-loader vulkan-headers shaderc-native" |
78 | 78 | ||
79 | # Disable int-conversion warning as error until [1] is fixed | ||
80 | # [1] https://gitlab.gnome.org/GNOME/gtk/-/issues/6033 | ||
81 | CFLAGS:append = " -Wno-error=int-conversion" | ||
82 | |||
79 | LIBV = "4.0.0" | 83 | LIBV = "4.0.0" |
80 | 84 | ||
81 | FILES:${PN}:append = " \ | 85 | FILES:${PN}:append = " \ |
diff --git a/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch b/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch index 99ae4d4417..ee1acda401 100644 --- a/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch +++ b/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 8b7fbbb405959f2868ad6eadd7dd00018758a8a5 Mon Sep 17 00:00:00 2001 | 1 | From 50d3b9d3ca0e1ff47c8e7559303855530e58839a Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 7 Sep 2016 14:52:04 +0300 | 3 | Date: Wed, 7 Sep 2016 14:52:04 +0300 |
4 | Subject: [PATCH] Do not error out if xsltproc is not found. | 4 | Subject: [PATCH] Do not error out if xsltproc is not found. |
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/configure.ac b/configure.ac | 16 | diff --git a/configure.ac b/configure.ac |
17 | index b0c88d7..2a61d6e 100644 | 17 | index 8725074..0491090 100644 |
18 | --- a/configure.ac | 18 | --- a/configure.ac |
19 | +++ b/configure.ac | 19 | +++ b/configure.ac |
20 | @@ -58,7 +58,7 @@ dnl Check for xsltproc | 20 | @@ -37,7 +37,7 @@ dnl Check for xsltproc |
21 | dnl | 21 | dnl |
22 | AC_PATH_PROG([XSLTPROC], [xsltproc]) | 22 | AC_PATH_PROG([XSLTPROC], [xsltproc]) |
23 | if test -z "$XSLTPROC"; then | 23 | if test -z "$XSLTPROC"; then |
@@ -26,6 +26,3 @@ index b0c88d7..2a61d6e 100644 | |||
26 | fi | 26 | fi |
27 | 27 | ||
28 | dnl | 28 | dnl |
29 | -- | ||
30 | 2.9.3 | ||
31 | |||
diff --git a/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch b/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch index 19e05f1b99..f329539fa8 100644 --- a/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch +++ b/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 80e6aff72affa6d92f5abd7ff6353dfc4a7bff38 Mon Sep 17 00:00:00 2001 | 1 | From 64163565f8d6853b02e53308a6e6ba23d9d96299 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 31 Aug 2016 16:44:46 +0300 | 3 | Date: Wed, 31 Aug 2016 16:44:46 +0300 |
4 | Subject: [PATCH] Do not hardocode paths to perl/python in scripts. | 4 | Subject: [PATCH] Do not hardocode paths to perl/python in scripts. |
@@ -9,7 +9,6 @@ on targets either. | |||
9 | 9 | ||
10 | Upstream-Status: Inappropriate [oe-core specific] | 10 | Upstream-Status: Inappropriate [oe-core specific] |
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
12 | |||
13 | --- | 12 | --- |
14 | gtkdoc-check.in | 2 +- | 13 | gtkdoc-check.in | 2 +- |
15 | gtkdoc-depscan.in | 2 +- | 14 | gtkdoc-depscan.in | 2 +- |
@@ -25,7 +24,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
25 | 11 files changed, 11 insertions(+), 11 deletions(-) | 24 | 11 files changed, 11 insertions(+), 11 deletions(-) |
26 | 25 | ||
27 | diff --git a/gtkdoc-check.in b/gtkdoc-check.in | 26 | diff --git a/gtkdoc-check.in b/gtkdoc-check.in |
28 | index 8c8e917..f6a25f6 100755 | 27 | index d9e2ad5..9ec526d 100755 |
29 | --- a/gtkdoc-check.in | 28 | --- a/gtkdoc-check.in |
30 | +++ b/gtkdoc-check.in | 29 | +++ b/gtkdoc-check.in |
31 | @@ -1,4 +1,4 @@ | 30 | @@ -1,4 +1,4 @@ |
@@ -35,7 +34,7 @@ index 8c8e917..f6a25f6 100755 | |||
35 | # | 34 | # |
36 | # gtk-doc - GTK DocBook documentation generator. | 35 | # gtk-doc - GTK DocBook documentation generator. |
37 | diff --git a/gtkdoc-depscan.in b/gtkdoc-depscan.in | 36 | diff --git a/gtkdoc-depscan.in b/gtkdoc-depscan.in |
38 | index 9bfaf30..aadc952 100755 | 37 | index c43317c..200837c 100755 |
39 | --- a/gtkdoc-depscan.in | 38 | --- a/gtkdoc-depscan.in |
40 | +++ b/gtkdoc-depscan.in | 39 | +++ b/gtkdoc-depscan.in |
41 | @@ -1,4 +1,4 @@ | 40 | @@ -1,4 +1,4 @@ |
@@ -45,7 +44,7 @@ index 9bfaf30..aadc952 100755 | |||
45 | from __future__ import print_function | 44 | from __future__ import print_function |
46 | 45 | ||
47 | diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in | 46 | diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in |
48 | index 44f6bd1..26fbd93 100755 | 47 | index f9c4905..ed2ead1 100755 |
49 | --- a/gtkdoc-fixxref.in | 48 | --- a/gtkdoc-fixxref.in |
50 | +++ b/gtkdoc-fixxref.in | 49 | +++ b/gtkdoc-fixxref.in |
51 | @@ -1,4 +1,4 @@ | 50 | @@ -1,4 +1,4 @@ |
@@ -55,7 +54,7 @@ index 44f6bd1..26fbd93 100755 | |||
55 | # | 54 | # |
56 | # gtk-doc - GTK DocBook documentation generator. | 55 | # gtk-doc - GTK DocBook documentation generator. |
57 | diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in | 56 | diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in |
58 | index 42d5731..3a56d56 100755 | 57 | index 641f3c4..35e95fb 100755 |
59 | --- a/gtkdoc-mkdb.in | 58 | --- a/gtkdoc-mkdb.in |
60 | +++ b/gtkdoc-mkdb.in | 59 | +++ b/gtkdoc-mkdb.in |
61 | @@ -1,4 +1,4 @@ | 60 | @@ -1,4 +1,4 @@ |
@@ -65,7 +64,7 @@ index 42d5731..3a56d56 100755 | |||
65 | # | 64 | # |
66 | # gtk-doc - GTK DocBook documentation generator. | 65 | # gtk-doc - GTK DocBook documentation generator. |
67 | diff --git a/gtkdoc-mkhtml.in b/gtkdoc-mkhtml.in | 66 | diff --git a/gtkdoc-mkhtml.in b/gtkdoc-mkhtml.in |
68 | index 0d0a15d..914ff55 100755 | 67 | index b09f7a9..8d45966 100755 |
69 | --- a/gtkdoc-mkhtml.in | 68 | --- a/gtkdoc-mkhtml.in |
70 | +++ b/gtkdoc-mkhtml.in | 69 | +++ b/gtkdoc-mkhtml.in |
71 | @@ -1,4 +1,4 @@ | 70 | @@ -1,4 +1,4 @@ |
@@ -75,7 +74,7 @@ index 0d0a15d..914ff55 100755 | |||
75 | # | 74 | # |
76 | # gtk-doc - GTK DocBook documentation generator. | 75 | # gtk-doc - GTK DocBook documentation generator. |
77 | diff --git a/gtkdoc-mkman.in b/gtkdoc-mkman.in | 76 | diff --git a/gtkdoc-mkman.in b/gtkdoc-mkman.in |
78 | index c5445cd..65db71a 100755 | 77 | index 8f7b018..9bac0b6 100755 |
79 | --- a/gtkdoc-mkman.in | 78 | --- a/gtkdoc-mkman.in |
80 | +++ b/gtkdoc-mkman.in | 79 | +++ b/gtkdoc-mkman.in |
81 | @@ -1,4 +1,4 @@ | 80 | @@ -1,4 +1,4 @@ |
@@ -85,7 +84,7 @@ index c5445cd..65db71a 100755 | |||
85 | # | 84 | # |
86 | # gtk-doc - GTK DocBook documentation generator. | 85 | # gtk-doc - GTK DocBook documentation generator. |
87 | diff --git a/gtkdoc-mkpdf.in b/gtkdoc-mkpdf.in | 86 | diff --git a/gtkdoc-mkpdf.in b/gtkdoc-mkpdf.in |
88 | index e8c0c03..f807236 100755 | 87 | index 7dca4b0..808f92d 100755 |
89 | --- a/gtkdoc-mkpdf.in | 88 | --- a/gtkdoc-mkpdf.in |
90 | +++ b/gtkdoc-mkpdf.in | 89 | +++ b/gtkdoc-mkpdf.in |
91 | @@ -1,4 +1,4 @@ | 90 | @@ -1,4 +1,4 @@ |
@@ -95,7 +94,7 @@ index e8c0c03..f807236 100755 | |||
95 | # | 94 | # |
96 | # gtk-doc - GTK DocBook documentation generator. | 95 | # gtk-doc - GTK DocBook documentation generator. |
97 | diff --git a/gtkdoc-rebase.in b/gtkdoc-rebase.in | 96 | diff --git a/gtkdoc-rebase.in b/gtkdoc-rebase.in |
98 | index 17a71c2..ec3fd28 100755 | 97 | index e8b0bf5..a960d8f 100755 |
99 | --- a/gtkdoc-rebase.in | 98 | --- a/gtkdoc-rebase.in |
100 | +++ b/gtkdoc-rebase.in | 99 | +++ b/gtkdoc-rebase.in |
101 | @@ -1,4 +1,4 @@ | 100 | @@ -1,4 +1,4 @@ |
@@ -105,7 +104,7 @@ index 17a71c2..ec3fd28 100755 | |||
105 | # | 104 | # |
106 | # gtk-doc - GTK DocBook documentation generator. | 105 | # gtk-doc - GTK DocBook documentation generator. |
107 | diff --git a/gtkdoc-scan.in b/gtkdoc-scan.in | 106 | diff --git a/gtkdoc-scan.in b/gtkdoc-scan.in |
108 | index 954c811..f461504 100755 | 107 | index 7893ebc..b7eb83d 100755 |
109 | --- a/gtkdoc-scan.in | 108 | --- a/gtkdoc-scan.in |
110 | +++ b/gtkdoc-scan.in | 109 | +++ b/gtkdoc-scan.in |
111 | @@ -1,4 +1,4 @@ | 110 | @@ -1,4 +1,4 @@ |
@@ -115,7 +114,7 @@ index 954c811..f461504 100755 | |||
115 | # | 114 | # |
116 | # gtk-doc - GTK DocBook documentation generator. | 115 | # gtk-doc - GTK DocBook documentation generator. |
117 | diff --git a/gtkdoc-scangobj.in b/gtkdoc-scangobj.in | 116 | diff --git a/gtkdoc-scangobj.in b/gtkdoc-scangobj.in |
118 | index 4cbe130..52c2c24 100755 | 117 | index 7660c70..c6ff072 100755 |
119 | --- a/gtkdoc-scangobj.in | 118 | --- a/gtkdoc-scangobj.in |
120 | +++ b/gtkdoc-scangobj.in | 119 | +++ b/gtkdoc-scangobj.in |
121 | @@ -1,4 +1,4 @@ | 120 | @@ -1,4 +1,4 @@ |
diff --git a/meta/recipes-gnome/gtk-doc/files/0001-Don-t-use-docdir-from-environment.patch b/meta/recipes-gnome/gtk-doc/files/0001-Don-t-use-docdir-from-environment.patch deleted file mode 100644 index f40124877c..0000000000 --- a/meta/recipes-gnome/gtk-doc/files/0001-Don-t-use-docdir-from-environment.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | From 72dfeec0e49478b0bfb471c4155044391bad8e6c Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Fri, 8 Dec 2023 10:35:25 +0000 | ||
4 | Subject: [PATCH] Don't use docdir from environment | ||
5 | |||
6 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gtk-doc/-/merge_requests/73] | ||
7 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
8 | --- | ||
9 | buildsystems/autotools/gtkdocize.in | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/buildsystems/autotools/gtkdocize.in b/buildsystems/autotools/gtkdocize.in | ||
13 | index 83127bf..76dcbfd 100755 | ||
14 | --- a/buildsystems/autotools/gtkdocize.in | ||
15 | +++ b/buildsystems/autotools/gtkdocize.in | ||
16 | @@ -39,7 +39,7 @@ set - $args | ||
17 | |||
18 | # assume working directory if srcdir is not set | ||
19 | test "$srcdir" || srcdir=. | ||
20 | -test "$docdir" || docdir="$srcdir" | ||
21 | +docdir="$srcdir" | ||
22 | |||
23 | # detect configure script | ||
24 | no_configure_found=0 | ||
diff --git a/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch b/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch index 21c2db7826..55cae34b46 100644 --- a/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch +++ b/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch | |||
@@ -1,23 +1,22 @@ | |||
1 | From 78bbf185934147a69ceb4b617d424e12e70997bf Mon Sep 17 00:00:00 2001 | 1 | From 9aa9230a305e964b2417daea2b51e43b2dee607c Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Tue, 27 Jun 2017 21:00:58 +0100 | 3 | Date: Tue, 27 Jun 2017 21:00:58 +0100 |
4 | Subject: [PATCH 3/3] gtk-doc: Handle floating gtk-doc dependency | 4 | Subject: [PATCH] gtk-doc: Handle floating gtk-doc dependency |
5 | 5 | ||
6 | Allow the tests to be explicitly disabled to avoid floating dependnecy | 6 | Allow the tests to be explicitly disabled to avoid floating dependnecy |
7 | issues. This is not really an issue with RSS but is on previous releases. | 7 | issues. This is not really an issue with RSS but is on previous releases. |
8 | 8 | ||
9 | RP 2017/6/27 | 9 | RP 2017/6/27 |
10 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
11 | |||
12 | --- | 11 | --- |
13 | configure.ac | 10 ++++++++++ | 12 | configure.ac | 10 ++++++++++ |
14 | 1 file changed, 10 insertions(+) | 13 | 1 file changed, 10 insertions(+) |
15 | 14 | ||
16 | diff --git a/configure.ac b/configure.ac | 15 | diff --git a/configure.ac b/configure.ac |
17 | index 684e2d1..e5e3aab 100644 | 16 | index 0491090..4270c88 100644 |
18 | --- a/configure.ac | 17 | --- a/configure.ac |
19 | +++ b/configure.ac | 18 | +++ b/configure.ac |
20 | @@ -146,6 +146,11 @@ if test "x$GCC" = "xyes"; then | 19 | @@ -82,6 +82,11 @@ if test "x$GCC" = "xyes"; then |
21 | fi | 20 | fi |
22 | fi | 21 | fi |
23 | 22 | ||
@@ -29,7 +28,7 @@ index 684e2d1..e5e3aab 100644 | |||
29 | dnl if glib is available we can enable the tests | 28 | dnl if glib is available we can enable the tests |
30 | PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0], | 29 | PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0], |
31 | [ glib_prefix="`$PKG_CONFIG --variable=prefix glib-2.0`" | 30 | [ glib_prefix="`$PKG_CONFIG --variable=prefix glib-2.0`" |
32 | @@ -156,6 +161,11 @@ PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0], | 31 | @@ -92,6 +97,11 @@ PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0], |
33 | build_tests="no" | 32 | build_tests="no" |
34 | ] | 33 | ] |
35 | ) | 34 | ) |
@@ -41,6 +40,3 @@ index 684e2d1..e5e3aab 100644 | |||
41 | AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL" -a x$gtk_doc_use_libtool = xyes ) | 40 | AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL" -a x$gtk_doc_use_libtool = xyes ) |
42 | dnl this enables the rule in test/Makefile.am | 41 | dnl this enables the rule in test/Makefile.am |
43 | AM_CONDITIONAL(BUILD_TESTS, test x$build_tests = xyes) | 42 | AM_CONDITIONAL(BUILD_TESTS, test x$build_tests = xyes) |
44 | -- | ||
45 | 2.14.1 | ||
46 | |||
diff --git a/meta/recipes-gnome/gtk-doc/files/no-clobber.patch b/meta/recipes-gnome/gtk-doc/files/no-clobber.patch index d1695479dc..90207d6c12 100644 --- a/meta/recipes-gnome/gtk-doc/files/no-clobber.patch +++ b/meta/recipes-gnome/gtk-doc/files/no-clobber.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 8bc4c1f169f89bc5531da5b7e892b8f20e0f9a18 Mon Sep 17 00:00:00 2001 | 1 | From fa5e31e02b9d3c6c5ec3cdc1f34dd6c179520fd0 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Wed, 21 Mar 2018 14:47:29 +0000 | 3 | Date: Wed, 21 Mar 2018 14:47:29 +0000 |
4 | Subject: [PATCH] gtk-doc: don't regenerate gtk-doc in do_install | 4 | Subject: [PATCH] gtk-doc: don't regenerate gtk-doc in do_install |
@@ -20,16 +20,15 @@ files which don't already exist. | |||
20 | 20 | ||
21 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=794571] | 21 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=794571] |
22 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 22 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
23 | |||
24 | --- | 23 | --- |
25 | buildsystems/autotools/gtk-doc.make | 2 +- | 24 | buildsystems/autotools/gtk-doc.make | 2 +- |
26 | 1 file changed, 1 insertion(+), 1 deletion(-) | 25 | 1 file changed, 1 insertion(+), 1 deletion(-) |
27 | 26 | ||
28 | diff --git a/buildsystems/autotools/gtk-doc.make b/buildsystems/autotools/gtk-doc.make | 27 | diff --git a/buildsystems/autotools/gtk-doc.make b/buildsystems/autotools/gtk-doc.make |
29 | index 7d9a27f..8cb336d 100644 | 28 | index fb2e7e2..4f6fe2b 100644 |
30 | --- a/buildsystems/autotools/gtk-doc.make | 29 | --- a/buildsystems/autotools/gtk-doc.make |
31 | +++ b/buildsystems/autotools/gtk-doc.make | 30 | +++ b/buildsystems/autotools/gtk-doc.make |
32 | @@ -111,7 +111,7 @@ setup-build.stamp: | 31 | @@ -112,7 +112,7 @@ setup-build.stamp: |
33 | destdir=`dirname $(abs_builddir)/$$file`; \ | 32 | destdir=`dirname $(abs_builddir)/$$file`; \ |
34 | test -d "$$destdir" || mkdir -p "$$destdir"; \ | 33 | test -d "$$destdir" || mkdir -p "$$destdir"; \ |
35 | test -f $(abs_srcdir)/$$file && \ | 34 | test -f $(abs_srcdir)/$$file && \ |
diff --git a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch index 1d260aa72b..1b5c190f56 100644 --- a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch +++ b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch | |||
@@ -1,11 +1,10 @@ | |||
1 | From ebb0f7313a0931f646e86badce2627eff2fa37a8 Mon Sep 17 00:00:00 2001 | 1 | From c11fba9bcb8d55568067e626bd959841c05081e5 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Mon, 5 Sep 2016 22:25:44 +0100 | 3 | Date: Mon, 5 Sep 2016 22:25:44 +0100 |
4 | Subject: [PATCH] Use native pkg-config when looking for gtk-doc. | 4 | Subject: [PATCH] Use native pkg-config when looking for gtk-doc. |
5 | 5 | ||
6 | Upstream-Status: Inappropriate | 6 | Upstream-Status: Inappropriate |
7 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 7 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
8 | |||
9 | --- | 8 | --- |
10 | buildsystems/autotools/gtk-doc.m4 | 7 ++++++- | 9 | buildsystems/autotools/gtk-doc.m4 | 7 ++++++- |
11 | 1 file changed, 6 insertions(+), 1 deletion(-) | 10 | 1 file changed, 6 insertions(+), 1 deletion(-) |
diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.34.0.bb index 4fd5a6e925..693ae427e0 100644 --- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb +++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.34.0.bb | |||
@@ -21,12 +21,11 @@ PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0" | |||
21 | 21 | ||
22 | CACHED_CONFIGUREVARS += "ac_cv_path_XSLTPROC=xsltproc" | 22 | CACHED_CONFIGUREVARS += "ac_cv_path_XSLTPROC=xsltproc" |
23 | 23 | ||
24 | SRC_URI[archive.sha256sum] = "cc1b709a20eb030a278a1f9842a362e00402b7f834ae1df4c1998a723152bf43" | 24 | SRC_URI[archive.sha256sum] = "b20b72b32a80bc18c7f975c9d4c16460c2276566a0b50f87d6852dff3aa7861c" |
25 | SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \ | 25 | SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \ |
26 | file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \ | 26 | file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \ |
27 | file://conditionaltests.patch \ | 27 | file://conditionaltests.patch \ |
28 | file://no-clobber.patch \ | 28 | file://no-clobber.patch \ |
29 | file://0001-Don-t-use-docdir-from-environment.patch \ | ||
30 | " | 29 | " |
31 | SRC_URI:append:class-native = " file://pkg-config-native.patch" | 30 | SRC_URI:append:class-native = " file://pkg-config-native.patch" |
32 | 31 | ||
diff --git a/meta/recipes-gnome/libadwaita/libadwaita_1.5.0.bb b/meta/recipes-gnome/libadwaita/libadwaita_1.5.1.bb index b0b1e4502a..6cb67c0db0 100644 --- a/meta/recipes-gnome/libadwaita/libadwaita_1.5.0.bb +++ b/meta/recipes-gnome/libadwaita/libadwaita_1.5.1.bb | |||
@@ -3,7 +3,6 @@ HOMEPAGE = "https://gitlab.gnome.org/GNOME/libadwaita" | |||
3 | LICENSE="LGPL-2.1-or-later" | 3 | LICENSE="LGPL-2.1-or-later" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" |
5 | 5 | ||
6 | |||
7 | DEPENDS = " \ | 6 | DEPENDS = " \ |
8 | gtk4 \ | 7 | gtk4 \ |
9 | appstream \ | 8 | appstream \ |
@@ -11,7 +10,7 @@ DEPENDS = " \ | |||
11 | 10 | ||
12 | inherit gnomebase gobject-introspection gi-docgen vala features_check | 11 | inherit gnomebase gobject-introspection gi-docgen vala features_check |
13 | 12 | ||
14 | SRC_URI[archive.sha256sum] = "fd92287df9bb95c963654fb6e70d3e082e2bcb37b147e0e3c905567167993783" | 13 | SRC_URI[archive.sha256sum] = "7f144c5887d6dd2d99517c00fd42395ee20abc13ce55958a4fda64e6d7e473f8" |
15 | 14 | ||
16 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 15 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
17 | REQUIRED_DISTRO_FEATURES = "opengl" | 16 | REQUIRED_DISTRO_FEATURES = "opengl" |
diff --git a/meta/recipes-gnome/libportal/files/0001-meson.build-fix-build-race-when-building-GTK-vapi-fi.patch b/meta/recipes-gnome/libportal/files/0001-meson.build-fix-build-race-when-building-GTK-vapi-fi.patch new file mode 100644 index 0000000000..fb015d3632 --- /dev/null +++ b/meta/recipes-gnome/libportal/files/0001-meson.build-fix-build-race-when-building-GTK-vapi-fi.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From 26f96a178f8a0afded00bdd7238728c0b6e42a6b Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Thu, 9 May 2024 18:44:41 +0000 | ||
4 | Subject: [PATCH] meson.build: fix build race when building GTK vapi files | ||
5 | |||
6 | There's a build race when building the GTK vapi files: | ||
7 | |||
8 | FAILED: libportal/libportal-gtk4.vapi | ||
9 | error: Package `libportal' not found in specified Vala API directories or GObject-Introspection GIR directories | ||
10 | |||
11 | This can be verified by adding "sleep 10;" to the command for the | ||
12 | libportal/libportal.vapi target in the generated build.ninja file. | ||
13 | |||
14 | The GTK vapi files need to have access to the generic libportal.vapi file, | ||
15 | but there is no explicit dependency. Switch the dependency name 'libportal' | ||
16 | to the dependency object libportal_vapi so that Meson generates the | ||
17 | dependency correctly. | ||
18 | |||
19 | Upstream-Status: Backport | ||
20 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
21 | --- | ||
22 | libportal/meson.build | 4 ++-- | ||
23 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
24 | |||
25 | diff --git a/libportal/meson.build b/libportal/meson.build | ||
26 | index fff7603..4e67f40 100644 | ||
27 | --- a/libportal/meson.build | ||
28 | +++ b/libportal/meson.build | ||
29 | @@ -168,7 +168,7 @@ if gtk3_dep.found() | ||
30 | if vapi | ||
31 | libportal_gtk3_vapi = gnome.generate_vapi('libportal-gtk3', | ||
32 | sources: libportal_gtk3_gir[0], | ||
33 | - packages: ['gio-2.0', 'gtk+-3.0', 'libportal'], | ||
34 | + packages: ['gio-2.0', 'gtk+-3.0', libportal_vapi], | ||
35 | gir_dirs: [meson.current_build_dir()], | ||
36 | vapi_dirs: [meson.current_build_dir()], | ||
37 | install: true, | ||
38 | @@ -227,7 +227,7 @@ if gtk4_dep.found() | ||
39 | if vapi | ||
40 | libportal_gtk4_vapi = gnome.generate_vapi('libportal-gtk4', | ||
41 | sources: libportal_gtk4_gir[0], | ||
42 | - packages: ['gio-2.0', 'gtk4', 'libportal'], | ||
43 | + packages: ['gio-2.0', 'gtk4', libportal_vapi], | ||
44 | gir_dirs: [meson.current_build_dir()], | ||
45 | vapi_dirs: [meson.current_build_dir()], | ||
46 | install: true, | ||
47 | -- | ||
48 | 2.34.1 | ||
49 | |||
diff --git a/meta/recipes-gnome/libportal/libportal_0.7.1.bb b/meta/recipes-gnome/libportal/libportal_0.7.1.bb index 22e45559c9..6ddfef76d3 100644 --- a/meta/recipes-gnome/libportal/libportal_0.7.1.bb +++ b/meta/recipes-gnome/libportal/libportal_0.7.1.bb | |||
@@ -6,7 +6,8 @@ BUGTRACKER = "https://github.com/flatpak/libportal/issues" | |||
6 | LICENSE = "LGPL-3.0-only" | 6 | LICENSE = "LGPL-3.0-only" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" |
8 | 8 | ||
9 | SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=main" | 9 | SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=main \ |
10 | file://0001-meson.build-fix-build-race-when-building-GTK-vapi-fi.patch" | ||
10 | SRCREV = "e9ed3a50cdde321eaf42361212480a66eb94a57a" | 11 | SRCREV = "e9ed3a50cdde321eaf42361212480a66eb94a57a" |
11 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
12 | 13 | ||
diff --git a/meta/recipes-gnome/libxmlb/libxmlb_0.3.18.bb b/meta/recipes-gnome/libxmlb/libxmlb_0.3.19.bb index 10ceab0721..de8d860d00 100644 --- a/meta/recipes-gnome/libxmlb/libxmlb_0.3.18.bb +++ b/meta/recipes-gnome/libxmlb/libxmlb_0.3.19.bb | |||
@@ -8,7 +8,7 @@ SRC_URI = " \ | |||
8 | file://0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch \ | 8 | file://0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch \ |
9 | file://run-ptest \ | 9 | file://run-ptest \ |
10 | " | 10 | " |
11 | SRCREV = "59cf2e0bf3c4d0905a32e32828d6100784993621" | 11 | SRCREV = "4393955fb7c8bbcb6a2c65ff54f16c39dc165e59" |
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
14 | DEPENDS = "glib-2.0 xz zstd" | 14 | DEPENDS = "glib-2.0 xz zstd" |