summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-gnome
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-gnome')
-rw-r--r--meta-oe/recipes-gnome/atk/atkmm-2.36_2.36.3.bb (renamed from meta-oe/recipes-gnome/atk/atkmm-2.36_2.36.2.bb)4
-rw-r--r--meta-oe/recipes-gnome/gcab/gcab/0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch37
-rw-r--r--meta-oe/recipes-gnome/gcab/gcab_1.6.bb1
-rw-r--r--meta-oe/recipes-gnome/gcr/gcr3_3.41.2.bb2
-rw-r--r--meta-oe/recipes-gnome/gmime/gmime_3.2.15.bb (renamed from meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb)11
-rw-r--r--meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb5
-rw-r--r--meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.10.bb (renamed from meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.3.bb)5
-rw-r--r--meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb5
-rw-r--r--meta-oe/recipes-gnome/gtk+/gtk+/CVE-2024-6655.patch40
-rw-r--r--meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb5
-rw-r--r--meta-oe/recipes-gnome/libjcat/libjcat_0.2.3.bb (renamed from meta-oe/recipes-gnome/libjcat/libjcat_0.2.1.bb)5
-rw-r--r--meta-oe/recipes-gnome/libpeas/libpeas/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch82
-rw-r--r--meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb28
-rw-r--r--meta-oe/recipes-gnome/malcontent/malcontent-ui.bb49
-rw-r--r--meta-oe/recipes-gnome/malcontent/malcontent.bb35
-rw-r--r--meta-oe/recipes-gnome/malcontent/malcontent.inc3
-rw-r--r--meta-oe/recipes-gnome/pyxdg/pyxdg_0.28.bb1
17 files changed, 192 insertions, 126 deletions
diff --git a/meta-oe/recipes-gnome/atk/atkmm-2.36_2.36.2.bb b/meta-oe/recipes-gnome/atk/atkmm-2.36_2.36.3.bb
index fa47cbd48d..23e2ff7811 100644
--- a/meta-oe/recipes-gnome/atk/atkmm-2.36_2.36.2.bb
+++ b/meta-oe/recipes-gnome/atk/atkmm-2.36_2.36.3.bb
@@ -13,9 +13,9 @@ inherit gnomebase features_check
13 13
14ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" 14ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
15 15
16SRC_URI[archive.sha256sum] = "6f62dd99f746985e573605937577ccfc944368f606a71ca46342d70e1cdae079" 16SRC_URI[archive.sha256sum] = "6ec264eaa0c4de0adb7202c600170bde9a7fbe4d466bfbe940eaf7faaa6c5974"
17 17
18S = "${WORKDIR}/${GNOMEBN}-${PV}" 18S = "${UNPACKDIR}/${GNOMEBN}-${PV}"
19 19
20EXTRA_OEMESON = "-Dbuild-documentation=false" 20EXTRA_OEMESON = "-Dbuild-documentation=false"
21 21
diff --git a/meta-oe/recipes-gnome/gcab/gcab/0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch b/meta-oe/recipes-gnome/gcab/gcab/0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch
new file mode 100644
index 0000000000..dd6ae1b427
--- /dev/null
+++ b/meta-oe/recipes-gnome/gcab/gcab/0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch
@@ -0,0 +1,37 @@
1From 6fa1b6d3f72caf6d0cf61752b522dc19fb9933b7 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <martin.jansa@gmail.com>
3Date: Fri, 30 Aug 2024 10:44:17 +0200
4Subject: [PATCH] gcab-enums.c.etemplate: include @basename@ instead of full
5 path from @filename@
6
7* fixes:
8 ERROR: QA Issue: File /usr/src/debug/gcab/1.6/libgcab/gcab-enums.c in package gcab-src contains reference to TMPDIR [buildpaths]
9
10lib32-gcab/1.6/package $ grep -R styhead .
11./usr/src/debug/lib32-gcab/1.6/libgcab/gcab-enums.c:#include "WORKDIR/build/../gcab-1.6/libgcab/gcab-file.h"
12./usr/src/debug/lib32-gcab/1.6/libgcab/gcab-enums.c:#include "WORKDIR/build/../gcab-1.6/libgcab/gcab-folder.h"
13
14glib-mkenum supports also @basename@ since 2.22 which would avoid this QA issue
15 @filename@ name of current input file
16 @basename@ base name of the current input file (Since: 2.22)
17
18Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
19---
20Upstream-Status: Pending
21
22 libgcab/gcab-enums.c.etemplate | 2 +-
23 1 file changed, 1 insertion(+), 1 deletion(-)
24
25diff --git a/libgcab/gcab-enums.c.etemplate b/libgcab/gcab-enums.c.etemplate
26index 194b1e0..2e85824 100644
27--- a/libgcab/gcab-enums.c.etemplate
28+++ b/libgcab/gcab-enums.c.etemplate
29@@ -21,7 +21,7 @@
30 /*** END file-header ***/
31
32 /*** BEGIN file-production ***/
33-#include "@filename@"
34+#include "@basename@"
35 /*** END file-production ***/
36
37
diff --git a/meta-oe/recipes-gnome/gcab/gcab_1.6.bb b/meta-oe/recipes-gnome/gcab/gcab_1.6.bb
index 4278fc9453..503d25271f 100644
--- a/meta-oe/recipes-gnome/gcab/gcab_1.6.bb
+++ b/meta-oe/recipes-gnome/gcab/gcab_1.6.bb
@@ -7,6 +7,7 @@ DEPENDS = "glib-2.0"
7 7
8SRC_URI = "\ 8SRC_URI = "\
9 ${GNOME_MIRROR}/gcab/${PV}/gcab-${PV}.tar.xz \ 9 ${GNOME_MIRROR}/gcab/${PV}/gcab-${PV}.tar.xz \
10 file://0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch \
10 file://run-ptest \ 11 file://run-ptest \
11" 12"
12SRC_URI[sha256sum] = "2f0c9615577c4126909e251f9de0626c3ee7a152376c15b5544df10fc87e560b" 13SRC_URI[sha256sum] = "2f0c9615577c4126909e251f9de0626c3ee7a152376c15b5544df10fc87e560b"
diff --git a/meta-oe/recipes-gnome/gcr/gcr3_3.41.2.bb b/meta-oe/recipes-gnome/gcr/gcr3_3.41.2.bb
index 0fd30f7424..bb905265ee 100644
--- a/meta-oe/recipes-gnome/gcr/gcr3_3.41.2.bb
+++ b/meta-oe/recipes-gnome/gcr/gcr3_3.41.2.bb
@@ -25,7 +25,7 @@ SRC_URI = "https://download.gnome.org/sources/gcr/3.41/gcr-${PV}.tar.xz;name=arc
25SRC_URI += "file://0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch" 25SRC_URI += "file://0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch"
26SRC_URI[archive.sha256sum] = "bad10f3c553a0e1854649ab59c5b2434da22ca1a54ae6138f1f53961567e1ab7" 26SRC_URI[archive.sha256sum] = "bad10f3c553a0e1854649ab59c5b2434da22ca1a54ae6138f1f53961567e1ab7"
27 27
28S = "${WORKDIR}/gcr-${PV}" 28S = "${UNPACKDIR}/gcr-${PV}"
29 29
30PACKAGECONFIG ??= " \ 30PACKAGECONFIG ??= " \
31 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ 31 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
diff --git a/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb b/meta-oe/recipes-gnome/gmime/gmime_3.2.15.bb
index f51451d971..1f84c5e20a 100644
--- a/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb
+++ b/meta-oe/recipes-gnome/gmime/gmime_3.2.15.bb
@@ -11,13 +11,16 @@ inherit gnomebase gobject-introspection vala gtk-doc
11SRC_URI = "https://github.com/jstedfast/${BPN}/releases/download/${PV}/${BP}.tar.xz \ 11SRC_URI = "https://github.com/jstedfast/${BPN}/releases/download/${PV}/${BP}.tar.xz \
12 file://iconv-detect.h \ 12 file://iconv-detect.h \
13" 13"
14SRC_URI[sha256sum] = "2e10a54d4821daf8b16c019ad5d567e0fb8e766f8ffe5fec3d4c6a37373d6406" 14SRC_URI[sha256sum] = "84cd2a481a27970ec39b5c95f72db026722904a2ccf3fdbd57b280cf2d02b5c4"
15
16UPSTREAM_CHECK_URI = "https://github.com/jstedfast/gmime/releases"
17UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
15 18
16EXTRA_OECONF += "--enable-largefile" 19EXTRA_OECONF += "--enable-largefile"
17 20
18export ac_cv_have_iconv_detect_h="yes" 21export ac_cv_have_iconv_detect_h = "yes"
19export ac_cv_sys_file_offset_bits="64" 22export ac_cv_sys_file_offset_bits = "64"
20 23
21do_configure:append () { 24do_configure:append () {
22 cp ${WORKDIR}/iconv-detect.h ${S} 25 cp ${UNPACKDIR}/iconv-detect.h ${S}
23} 26}
diff --git a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
index db55f22398..f10537eca7 100644
--- a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
+++ b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
@@ -5,13 +5,16 @@ it requires libxml2 and python 2 at the same time, which can no longer be satisf
5LICENSE = "GPL-2.0-only & LGPL-2.1-only" 5LICENSE = "GPL-2.0-only & LGPL-2.1-only"
6LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \ 6LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \
7 file://${COREBASE}/meta/files/common-licenses/LGPL-2.1-only;md5=1a6d268fd218675ffea8be556788b780" 7 file://${COREBASE}/meta/files/common-licenses/LGPL-2.1-only;md5=1a6d268fd218675ffea8be556788b780"
8
8SRC_URI = "file://gnome-doc-utils.m4" 9SRC_URI = "file://gnome-doc-utils.m4"
9 10
11S = "${UNPACKDIR}"
12
10PROVIDES = "gnome-doc-utils" 13PROVIDES = "gnome-doc-utils"
11 14
12do_install:append() { 15do_install:append() {
13 install -d ${D}${datadir}/aclocal/ 16 install -d ${D}${datadir}/aclocal/
14 install ${WORKDIR}/gnome-doc-utils.m4 ${D}${datadir}/aclocal/ 17 install ${UNPACKDIR}/gnome-doc-utils.m4 ${D}${datadir}/aclocal/
15} 18}
16 19
17FILES:${PN} += "${datadir}" 20FILES:${PN} += "${datadir}"
diff --git a/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.3.bb b/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.10.bb
index 1ddc277651..70da55c137 100644
--- a/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.3.bb
+++ b/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.10.bb
@@ -8,9 +8,8 @@ DEPENDS = "sassc-native"
8 8
9inherit meson 9inherit meson
10 10
11SRC_URI = "git://github.com/lassekongo83/adw-gtk3.git;protocol=https;branch=main" 11SRC_URI = "git://github.com/lassekongo83/adw-gtk3.git;protocol=https;branch=main;tag=v${PV}"
12 12
13S = "${WORKDIR}/git" 13SRCREV = "c2e74c9d2a5c3895b8025ac1d4b9e4cced71fbe9"
14SRCREV = "22a3b9374369640993e4a7ab84f8acc72318e501"
15 14
16FILES:${PN} = "${datadir}/themes" 15FILES:${PN} = "${datadir}/themes"
diff --git a/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb b/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb
index 3456383c3a..61deceb7a3 100644
--- a/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb
+++ b/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb
@@ -1,5 +1,5 @@
1SUMMARY = "GTK+2 standard themes" 1SUMMARY = "GTK+2 standard themes"
2HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/sources/gnome-themes-standard/" 2HOMEPAGE = "https://download.gnome.org/sources/gnome-themes-standard/"
3BUGTRACKER = "https://bugzilla.gnome.org/" 3BUGTRACKER = "https://bugzilla.gnome.org/"
4SECTION = "x11/gnome" 4SECTION = "x11/gnome"
5 5
@@ -19,6 +19,9 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${PV}/${BPN}-${PV}.tar.xz;name=archive"
19SRC_URI[archive.md5sum] = "f9f2c6c521948da427f702372e16f826" 19SRC_URI[archive.md5sum] = "f9f2c6c521948da427f702372e16f826"
20SRC_URI[archive.sha256sum] = "7c4ba0bff001f06d8983cfc105adaac42df1d1267a2591798a780bac557a5819" 20SRC_URI[archive.sha256sum] = "7c4ba0bff001f06d8983cfc105adaac42df1d1267a2591798a780bac557a5819"
21 21
22UPSTREAM_CHECK_URI = "https://gitlab.gnome.org/Archive/gnome-themes-extra/-/tags"
23UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
24
22EXTRA_OECONF = "--disable-gtk2-engine" 25EXTRA_OECONF = "--disable-gtk2-engine"
23 26
24do_install:append() { 27do_install:append() {
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+/CVE-2024-6655.patch b/meta-oe/recipes-gnome/gtk+/gtk+/CVE-2024-6655.patch
new file mode 100644
index 0000000000..dfa54f2f31
--- /dev/null
+++ b/meta-oe/recipes-gnome/gtk+/gtk+/CVE-2024-6655.patch
@@ -0,0 +1,40 @@
1From 3bbf0b6176d42836d23c36a6ac410e807ec0a7a7 Mon Sep 17 00:00:00 2001
2From: Matthias Clasen <mclasen@redhat.com>
3Date: Sat, 15 Jun 2024 14:18:01 -0400
4Subject: [PATCH] Stop looking for modules in cwd
5
6This is just not a good idea. It is surprising, and can be misused.
7
8Fixes: #6786
9
10CVE: CVE-2024-6655
11
12Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gtk/-/commit/3bbf0b6176d42836d23c36a6ac410e807ec0a7a7]
13
14Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com>
15---
16 gtk/gtkmodules.c | 9 ++-------
17 1 file changed, 2 insertions(+), 7 deletions(-)
18
19diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
20index e09b583..e75810c 100644
21--- a/gtk/gtkmodules.c
22+++ b/gtk/gtkmodules.c
23@@ -225,13 +225,8 @@ find_module (const gchar *name)
24 gchar *module_name;
25
26 module_name = _gtk_find_module (name, "modules");
27- if (!module_name)
28- {
29- /* As last resort, try loading without an absolute path (using system
30- * library path)
31- */
32- module_name = g_module_build_path (NULL, name);
33- }
34+ if (module_name == NULL)
35+ return NULL;
36
37 module = g_module_open (module_name, G_MODULE_BIND_LOCAL | G_MODULE_BIND_LAZY);
38
39--
402.40.0
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb b/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb
index 5eac641cf3..2ca2bba0aa 100644
--- a/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb
+++ b/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb
@@ -4,13 +4,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
4 file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \ 4 file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \
5 file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \ 5 file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \
6 file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c" 6 file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c"
7SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \ 7SRC_URI = "${GNOME_MIRROR}/gtk+/2.24/gtk+-${PV}.tar.xz \
8 file://xsettings.patch \ 8 file://xsettings.patch \
9 file://toggle-font.diff;striplevel=0 \ 9 file://toggle-font.diff;striplevel=0 \
10 file://doc-fixes.patch \ 10 file://doc-fixes.patch \
11 file://strict-prototypes.patch \ 11 file://strict-prototypes.patch \
12 file://0001-Do-not-look-into-HOME-when-looking-for-gtk-modules.patch \ 12 file://0001-Do-not-look-into-HOME-when-looking-for-gtk-modules.patch \
13 file://0001-Fix-signature-of-create_menu-function.patch \ 13 file://0001-Fix-signature-of-create_menu-function.patch \
14 file://CVE-2024-6655.patch \
14 " 15 "
15 16
16SRC_URI[sha256sum] = "ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da" 17SRC_URI[sha256sum] = "ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da"
@@ -32,3 +33,5 @@ python populate_packages:prepend () {
32 if (d.getVar('DEBIAN_NAMES')): 33 if (d.getVar('DEBIAN_NAMES')):
33 d.setVar(d.expand('PKG:${PN}'), '${MLPREFIX}libgtk-2.0') 34 d.setVar(d.expand('PKG:${PN}'), '${MLPREFIX}libgtk-2.0')
34} 35}
36
37CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-gnome/libjcat/libjcat_0.2.1.bb b/meta-oe/recipes-gnome/libjcat/libjcat_0.2.3.bb
index 2d95e14447..6e31889b69 100644
--- a/meta-oe/recipes-gnome/libjcat/libjcat_0.2.1.bb
+++ b/meta-oe/recipes-gnome/libjcat/libjcat_0.2.3.bb
@@ -11,8 +11,7 @@ SRC_URI = "\
11 git://github.com/hughsie/libjcat.git;branch=main;protocol=https \ 11 git://github.com/hughsie/libjcat.git;branch=main;protocol=https \
12 file://run-ptest \ 12 file://run-ptest \
13" 13"
14SRCREV = "869e7cf4511b81897512a3f0adb627218e618112" 14SRCREV = "f284d18a694ed98f49ddb06e6920265781a30125"
15S = "${WORKDIR}/git"
16 15
17inherit gobject-introspection gtk-doc meson ptest-gnome vala lib_package 16inherit gobject-introspection gtk-doc meson ptest-gnome vala lib_package
18 17
@@ -32,3 +31,5 @@ GTKDOC_MESON_OPTION = "gtkdoc"
32RDEPENDS:${PN}:class-target = "\ 31RDEPENDS:${PN}:class-target = "\
33 ${@bb.utils.contains('PACKAGECONFIG', 'gpg', 'gnupg', '', d)} \ 32 ${@bb.utils.contains('PACKAGECONFIG', 'gpg', 'gnupg', '', d)} \
34" 33"
34
35INSANE_SKIP:${PN}-ptest += "buildpaths"
diff --git a/meta-oe/recipes-gnome/libpeas/libpeas/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch b/meta-oe/recipes-gnome/libpeas/libpeas/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch
deleted file mode 100644
index 6bb48777ec..0000000000
--- a/meta-oe/recipes-gnome/libpeas/libpeas/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch
+++ /dev/null
@@ -1,82 +0,0 @@
1From d798af685e9e1166400acbdab082c17b02dad85b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 18 May 2023 23:28:10 -0700
4Subject: [PATCH] Remove builddir and srcdir paths from test binaries
5
6Encoding buildtime paths is not needed since if these tests are to be
7run they will be run on target where builddir structure most certainly
8wont be available.
9
10Fixes
11WARNING: libpeas-1.36.0-r0 do_package_qa: QA Issue: File /usr/bin/peas-demo in package libpeas-demo contains reference to TMPDIR [buildpaths]
12
13Upstream-Status: Inappropriate [Cross-compile specific]
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 peas-demo/meson.build | 2 +-
17 tests/libpeas-gtk/testing/meson.build | 4 ++--
18 tests/libpeas/testing/meson.build | 4 ++--
19 tests/testing-util/meson.build | 4 ++--
20 4 files changed, 7 insertions(+), 7 deletions(-)
21
22diff --git a/peas-demo/meson.build b/peas-demo/meson.build
23index a3ec53b..855ebf2 100644
24--- a/peas-demo/meson.build
25+++ b/peas-demo/meson.build
26@@ -9,7 +9,7 @@ peas_demo_c = [
27
28 peas_demo_c_args = [
29 '-DHAVE_CONFIG_H',
30- '-DPEAS_BUILDDIR="@0@"'.format(builddir),
31+ '-DPEAS_BUILDDIR="/usr/src/debug/libpeas"',
32 '-DPEAS_PREFIX="@0@"'.format(prefix),
33 '-DPEAS_LIBDIR="@0@"'.format(libdir),
34 ]
35diff --git a/tests/libpeas-gtk/testing/meson.build b/tests/libpeas-gtk/testing/meson.build
36index 646f42d..fd9a692 100644
37--- a/tests/libpeas-gtk/testing/meson.build
38+++ b/tests/libpeas-gtk/testing/meson.build
39@@ -19,8 +19,8 @@ libpeas_gtk_testing_deps = [
40
41 libpeas_gtk_testing_c_args = [
42 '-DHAVE_CONFIG_H',
43- '-DBUILDDIR="@0@"'.format(builddir),
44- '-DSRCDIR="@0@"'.format(srcdir),
45+ '-DBUILDDIR="/usr/src/debug/libpeas"',
46+ '-DSRCDIR="/usr/src/debug/libpeas"',
47 ]
48
49 libpeas_gtk_testing_lib = library(
50diff --git a/tests/libpeas/testing/meson.build b/tests/libpeas/testing/meson.build
51index 74ba7b1..084daa9 100644
52--- a/tests/libpeas/testing/meson.build
53+++ b/tests/libpeas/testing/meson.build
54@@ -21,8 +21,8 @@ libpeas_testing_deps = [
55
56 libpeas_testing_c_args = [
57 '-DHAVE_CONFIG_H',
58- '-DBUILDDIR="@0@"'.format(builddir),
59- '-DSRCDIR="@0@"'.format(srcdir),
60+ '-DBUILDDIR="/usr/src/debug/libpeas"',
61+ '-DSRCDIR="/usr/src/debug/libpeas"',
62 ]
63
64 libpeas_testing_lib = library(
65diff --git a/tests/testing-util/meson.build b/tests/testing-util/meson.build
66index 1c40740..83ad059 100644
67--- a/tests/testing-util/meson.build
68+++ b/tests/testing-util/meson.build
69@@ -17,8 +17,8 @@ libtesting_util_deps = [
70
71 libtesting_util_c_args = [
72 '-DHAVE_CONFIG_H',
73- '-DBUILDDIR="@0@"'.format(builddir),
74- '-DSRCDIR="@0@"'.format(srcdir),
75+ '-DBUILDDIR="/usr/src/debug/libpeas"',
76+ '-DSRCDIR="/usr/src/debug/libpeas"',
77 '-UG_DISABLE_ASSERT',
78 '-UG_DISABLE_CAST_CHECKS',
79 ]
80--
812.40.1
82
diff --git a/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb b/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb
deleted file mode 100644
index 016981f04d..0000000000
--- a/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb
+++ /dev/null
@@ -1,28 +0,0 @@
1SUMMARY = "libpeas is a gobject-based plugins engine"
2HOMEPAGE = "https://wiki.gnome.org/Projects/Libpeas"
3LICENSE = "LGPL-2.1-or-later"
4LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d"
5
6DEPENDS = "gtk+3"
7
8GTKDOC_MESON_OPTION = "gtk_doc"
9
10inherit gnomebase gobject-introspection gi-docgen gtk-icon-cache features_check
11
12ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
13# FIXME: When upgrading to libpeas 2, g-i is no longer needed.
14REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
15
16SRC_URI += "file://0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch"
17SRC_URI[archive.sha256sum] = "297cb9c2cccd8e8617623d1a3e8415b4530b8e5a893e3527bbfd1edd13237b4c"
18
19PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject"
20
21PACKAGES =+ "${PN}-demo ${PN}-python3"
22FILES:${PN}-demo = " \
23 ${bindir}/peas-demo \
24 ${libdir}/peas-demo \
25"
26
27RDEPENDS:${PN}-python3 = "python3-pygobject"
28FILES:${PN}-python3 = "${libdir}/libpeas-1.0/loaders/libpython3loader.so"
diff --git a/meta-oe/recipes-gnome/malcontent/malcontent-ui.bb b/meta-oe/recipes-gnome/malcontent/malcontent-ui.bb
new file mode 100644
index 0000000000..8630822939
--- /dev/null
+++ b/meta-oe/recipes-gnome/malcontent/malcontent-ui.bb
@@ -0,0 +1,49 @@
1SUMMARY = "User-Interface for malcontent."
2HOMEPAGE = "https://gitlab.freedesktop.org/pwithnall/malcontent"
3LICENSE = "LGPL-2.1-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
5
6require malcontent.inc
7
8DEPENDS += " \
9 malcontent \
10 accountsservice \
11 glib-2.0 \
12 glib-testing \
13 dbus \
14 desktop-file-utils-native \
15 itstool-native \
16 libpam \
17 polkit \
18 appstream \
19 appstream-native \
20 flatpak \
21 libadwaita \
22 gtk4 \
23"
24
25GIR_MESON_OPTION = ""
26
27GTKIC_VERSION = "4"
28inherit meson pkgconfig gtk-icon-cache gobject-introspection gettext features_check
29
30REQUIRED_DISTRO_FEATURES = "pam polkit gobject-introspection"
31
32EXTRA_OEMESON = "-Dui=enabled"
33
34do_install() {
35 install -d ${D}${datadir}/gir-1.0 ${D}${libdir}/girepository-1.0 ${D}${bindir}
36 install -d ${D}${datadir}/polkit-1/actions ${D}${datadir}/metainfo ${D}${datadir}/applications
37 install -m 0644 ${B}/libmalcontent-ui/MalcontentUi-1.gir ${D}${datadir}/gir-1.0
38 install -m 0644 ${B}/libmalcontent-ui/MalcontentUi-1.typelib ${D}${libdir}/girepository-1.0
39 install -m 0644 ${B}/libmalcontent-ui/libmalcontent-ui-1.so.${PV} ${D}${libdir}
40 ln -sf libmalcontent-ui-1.so.${PV} ${D}${libdir}/libmalcontent-ui-1.so
41 ln -sf libmalcontent-ui-1.so.${PV} ${D}${libdir}/libmalcontent-ui-1.so.1
42 install -m 0755 ${B}/malcontent-control/malcontent-control ${D}${bindir}
43 install -m 0644 ${B}/malcontent-control/org.freedesktop.MalcontentControl.policy ${D}${datadir}/polkit-1/actions
44 install -m 0644 ${B}/malcontent-control/org.freedesktop.MalcontentControl.metainfo.xml ${D}${datadir}/metainfo
45 install -m 0644 ${B}/malcontent-control/org.freedesktop.MalcontentControl.desktop ${D}${datadir}/applications
46}
47
48FILES:${PN} += "${bindir} ${libdir} ${datadir}"
49
diff --git a/meta-oe/recipes-gnome/malcontent/malcontent.bb b/meta-oe/recipes-gnome/malcontent/malcontent.bb
new file mode 100644
index 0000000000..9da95329a8
--- /dev/null
+++ b/meta-oe/recipes-gnome/malcontent/malcontent.bb
@@ -0,0 +1,35 @@
1SUMMARY = "malcontent implements support for restricting the type of content."
2HOMEPAGE = "https://gitlab.freedesktop.org/pwithnall/malcontent"
3LICENSE = "LGPL-2.1-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
5
6require malcontent.inc
7
8DEPENDS = " \
9 accountsservice \
10 glib-2.0 \
11 glib-testing \
12 dbus \
13 itstool-native \
14 libpam \
15 polkit \
16"
17
18GIR_MESON_OPTION = ""
19
20inherit meson pkgconfig gobject-introspection gettext features_check
21
22REQUIRED_DISTRO_FEATURES = "pam polkit gobject-introspection"
23
24PACKAGECONFIG ?= "ui"
25PACKAGECONFIG[ui] = ",,,malcontent-ui"
26
27EXTRA_OEMESON = "-Dui=disabled -Dpamlibdir=${base_libdir}/security"
28
29FILES:${PN} += " \
30 ${base_libdir}/security/pam_malcontent.so \
31 ${datadir}/accountsservice \
32 ${datadir}/help \
33 ${datadir}/dbus-1 \
34 ${datadir}/polkit-1 \
35"
diff --git a/meta-oe/recipes-gnome/malcontent/malcontent.inc b/meta-oe/recipes-gnome/malcontent/malcontent.inc
new file mode 100644
index 0000000000..10597f3308
--- /dev/null
+++ b/meta-oe/recipes-gnome/malcontent/malcontent.inc
@@ -0,0 +1,3 @@
1SRC_URI = "git://gitlab.freedesktop.org/pwithnall/malcontent.git;protocol=https;branch=main"
2SRCREV = "21f3ef7b6f984710a23b607d2298fe16e554f0c3"
3PV = "0.13.0"
diff --git a/meta-oe/recipes-gnome/pyxdg/pyxdg_0.28.bb b/meta-oe/recipes-gnome/pyxdg/pyxdg_0.28.bb
index 0c9599a49c..b4dc739ec3 100644
--- a/meta-oe/recipes-gnome/pyxdg/pyxdg_0.28.bb
+++ b/meta-oe/recipes-gnome/pyxdg/pyxdg_0.28.bb
@@ -9,4 +9,3 @@ SRC_URI = "git://anongit.freedesktop.org/xdg/pyxdg;branch=master"
9 9
10inherit setuptools3 10inherit setuptools3
11 11
12S = "${WORKDIR}/git"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-09 04:19:13 +0000