summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome
diff options
context:
space:
mode:
Diffstat (limited to 'meta-gnome/recipes-gnome')
-rw-r--r--meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb4
-rw-r--r--meta-gnome/recipes-gnome/evince/evince_46.3.bb (renamed from meta-gnome/recipes-gnome/evince/evince_46.0.bb)6
-rw-r--r--meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb2
-rw-r--r--meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb3
-rw-r--r--meta-gnome/recipes-gnome/file-roller/file-roller_44.3.bb (renamed from meta-gnome/recipes-gnome/file-roller/file-roller_44.1.bb)2
-rw-r--r--meta-gnome/recipes-gnome/gdm/gdm_46.0.bb1
-rw-r--r--meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.2.1.bb (renamed from meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.1.0.bb)2
-rw-r--r--meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_46.1.bb (renamed from meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_46.0.bb)2
-rw-r--r--meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_46.1.bb (renamed from meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_46.0.bb)2
-rw-r--r--meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch13
-rw-r--r--meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.2.bb (renamed from meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.1.bb)12
-rw-r--r--meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch43
-rw-r--r--meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb1
-rw-r--r--meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.50.2.bb (renamed from meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.50.1.bb)2
-rw-r--r--meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_46.2.bb (renamed from meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_46.0.bb)2
-rw-r--r--meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.2.bb (renamed from meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.0.bb)2
-rw-r--r--meta-gnome/recipes-gnome/gnome-software/gnome-software_46.2.bb (renamed from meta-gnome/recipes-gnome/gnome-software/gnome-software_46.0.bb)2
-rw-r--r--meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_46.3.bb (renamed from meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_46.1.bb)2
-rw-r--r--meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb7
-rw-r--r--meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb3
-rw-r--r--meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.2.bb4
-rw-r--r--meta-gnome/recipes-gnome/msgraph/msgraph_0.2.2.bb (renamed from meta-gnome/recipes-gnome/msgraph/msgraph_0.2.1.bb)5
-rw-r--r--meta-gnome/recipes-gnome/mutter/mutter_46.2.bb (renamed from meta-gnome/recipes-gnome/mutter/mutter_46.0.bb)2
-rw-r--r--meta-gnome/recipes-gnome/nautilus/nautilus_46.2.bb (renamed from meta-gnome/recipes-gnome/nautilus/nautilus_45.1.bb)2
-rw-r--r--meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch15
-rw-r--r--meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch105
-rw-r--r--meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.3.bb (renamed from meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.1.bb)2
-rw-r--r--meta-gnome/recipes-gnome/tracker/tracker_3.7.3.bb (renamed from meta-gnome/recipes-gnome/tracker/tracker_3.7.1.bb)2
28 files changed, 153 insertions, 97 deletions
diff --git a/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb b/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb
index 90c12efad..9e641daa5 100644
--- a/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb
+++ b/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb
@@ -29,7 +29,7 @@ do_compile() {
29do_install() { 29do_install() {
30 oe_runmake DESTDIR="${D}" PREFIX="${prefix}" install 30 oe_runmake DESTDIR="${D}" PREFIX="${prefix}" install
31 install -d ${D}/${sysconfdir}/devilspie2 31 install -d ${D}/${sysconfdir}/devilspie2
32 install -m 644 ${WORKDIR}/default.lua ${D}/${sysconfdir}/devilspie2 32 install -m 644 ${UNPACKDIR}/default.lua ${D}/${sysconfdir}/devilspie2
33 install -d ${D}/${sysconfdir}/xdg/autostart 33 install -d ${D}/${sysconfdir}/xdg/autostart
34 install -m 644 ${WORKDIR}/devilspie2.desktop ${D}/${sysconfdir}/xdg/autostart 34 install -m 644 ${UNPACKDIR}/devilspie2.desktop ${D}/${sysconfdir}/xdg/autostart
35} 35}
diff --git a/meta-gnome/recipes-gnome/evince/evince_46.0.bb b/meta-gnome/recipes-gnome/evince/evince_46.3.bb
index 57eb994e1..47c0950b6 100644
--- a/meta-gnome/recipes-gnome/evince/evince_46.0.bb
+++ b/meta-gnome/recipes-gnome/evince/evince_46.3.bb
@@ -33,7 +33,7 @@ REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'open
33def gnome_verdir(v): 33def gnome_verdir(v):
34 return oe.utils.trim_version(v, 1) 34 return oe.utils.trim_version(v, 1)
35 35
36SRC_URI[archive.sha256sum] = "aff6af69392c04956bfad976dec5d1583b41d5a334e937995f7c3ca0740de221" 36SRC_URI[archive.sha256sum] = "bc0d1d41b9d7ffc762e99d2abfafacbf745182f0b31d86db5eec8c67f5f3006b"
37 37
38GTKDOC_MESON_OPTION = "gtk_doc" 38GTKDOC_MESON_OPTION = "gtk_doc"
39 39
@@ -56,3 +56,7 @@ FILES:${PN} += "${datadir}/dbus-1 \
56 ${systemd_user_unitdir} \ 56 ${systemd_user_unitdir} \
57" 57"
58FILES:${PN}-nautilus-extension = "${libdir}/nautilus/*/*so" 58FILES:${PN}-nautilus-extension = "${libdir}/nautilus/*/*so"
59
60CVE_PRODUCT = "evince"
61CVE_STATUS[CVE-2011-0433] = "fixed-version: No action required. The current version (46.0) is not affected by the CVE which has been patched since version 3.1.2"
62CVE_STATUS[CVE-2011-5244] = "fixed-version: No action required. The current version (46.0) is not affected by the CVE which has been patched since version 3.1.2"
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
index 103bad1b6..fc1925314 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
@@ -58,7 +58,7 @@ LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0"
58GI_DATA_ENABLED:libc-musl="False" 58GI_DATA_ENABLED:libc-musl="False"
59 59
60do_configure:append () { 60do_configure:append () {
61 cp ${WORKDIR}/iconv-detect.h ${S}/src 61 cp ${UNPACKDIR}/iconv-detect.h ${S}/src
62 # avoid writing perl-native path into csv2vcard shebang 62 # avoid writing perl-native path into csv2vcard shebang
63 sed -i "s|@PERL@|${bindir}/perl|" ${S}/src/tools/addressbook-export/csv2vcard.in 63 sed -i "s|@PERL@|${bindir}/perl|" ${S}/src/tools/addressbook-export/csv2vcard.in
64} 64}
diff --git a/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb b/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb
index 12d344bff..5db945712 100644
--- a/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb
+++ b/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb
@@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
6 6
7inherit allarch gtk-icon-cache 7inherit allarch gtk-icon-cache
8 8
9S = "${WORKDIR}" 9S = "${WORKDIR}/sources"
10UNPACKDIR = "${S}"
10 11
11SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${BPN}/${BPN}_${PV}.zip" 12SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${BPN}/${BPN}_${PV}.zip"
12SRC_URI[sha256sum] = "d4486fda0413f8a81a87e0dd2329f50f2a8a7cb4147b48cf147f0160add8174a" 13SRC_URI[sha256sum] = "d4486fda0413f8a81a87e0dd2329f50f2a8a7cb4147b48cf147f0160add8174a"
diff --git a/meta-gnome/recipes-gnome/file-roller/file-roller_44.1.bb b/meta-gnome/recipes-gnome/file-roller/file-roller_44.3.bb
index 30760387f..a195d43f0 100644
--- a/meta-gnome/recipes-gnome/file-roller/file-roller_44.1.bb
+++ b/meta-gnome/recipes-gnome/file-roller/file-roller_44.3.bb
@@ -22,7 +22,7 @@ REQUIRED_DISTRO_FEATURES = "opengl"
22EXTRA_OEMESON += "-Dintrospection=enabled" 22EXTRA_OEMESON += "-Dintrospection=enabled"
23 23
24SRC_URI = "git://gitlab.gnome.org/GNOME/file-roller.git;protocol=https;branch=master" 24SRC_URI = "git://gitlab.gnome.org/GNOME/file-roller.git;protocol=https;branch=master"
25SRCREV = "299e86c77d8fe600ee6658357e209b15c674397e" 25SRCREV = "d4f3b970bd7dd07d8f539433628eba10551aa629"
26S = "${WORKDIR}/git" 26S = "${WORKDIR}/git"
27 27
28PACKAGECONFIG ??= "" 28PACKAGECONFIG ??= ""
diff --git a/meta-gnome/recipes-gnome/gdm/gdm_46.0.bb b/meta-gnome/recipes-gnome/gdm/gdm_46.0.bb
index 469281624..ec1d6ad39 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm_46.0.bb
+++ b/meta-gnome/recipes-gnome/gdm/gdm_46.0.bb
@@ -7,6 +7,7 @@ DEPENDS = " \
7 audit \ 7 audit \
8 dconf-native \ 8 dconf-native \
9 gtk+3 \ 9 gtk+3 \
10 json-glib \
10 keyutils \ 11 keyutils \
11 libcanberra \ 12 libcanberra \
12 libgudev \ 13 libgudev \
diff --git a/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.1.0.bb b/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.2.1.bb
index 0ebc22acb..d66ce6080 100644
--- a/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.1.0.bb
+++ b/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.2.1.bb
@@ -9,7 +9,7 @@ inherit meson pkgconfig gobject-introspection features_check gtk-doc
9 9
10SRC_URI = "git://github.com/gedit-technology/libgedit-gtksourceview.git;protocol=https;branch=main" 10SRC_URI = "git://github.com/gedit-technology/libgedit-gtksourceview.git;protocol=https;branch=main"
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
12SRCREV = "b271a625ca057cc3fa7d5ac83285c5d4e038202e" 12SRCREV = "eaafc892d033713c7c823d8ad602061e456b3c88"
13 13
14ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" 14ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
15 15
diff --git a/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_46.0.bb b/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_46.1.bb
index 5c7e27378..f1a93ea83 100644
--- a/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_46.1.bb
@@ -29,7 +29,7 @@ def gnome_verdir(v):
29 29
30REQUIRED_DISTRO_FEATURES = "x11 opengl" 30REQUIRED_DISTRO_FEATURES = "x11 opengl"
31 31
32SRC_URI[archive.sha256sum] = "44694fda6b6233923f5c10a48d02d2cf5724e011a8a85789074c953101f33bf1" 32SRC_URI[archive.sha256sum] = "2d36750a73890086122cf3f0c83e68517891585615165306fa1596a918668247"
33 33
34FILES:${PN} += " \ 34FILES:${PN} += " \
35 ${datadir}/dbus-1 \ 35 ${datadir}/dbus-1 \
diff --git a/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_46.0.bb b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_46.1.bb
index 707c4b583..eac768c8f 100644
--- a/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_46.1.bb
@@ -22,7 +22,7 @@ inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-versi
22 22
23REQUIRED_DISTRO_FEATURES = "x11 opengl" 23REQUIRED_DISTRO_FEATURES = "x11 opengl"
24 24
25SRC_URI[archive.sha256sum] = "5e21960c174bd8606d9089bf79c70f31070ab4837919878b00db2f14af9fe718" 25SRC_URI[archive.sha256sum] = "9861ff7b8abd5b7b20690ba55eb7542c7ec534b566269e29b5b1e858c1610897"
26 26
27do_install:prepend() { 27do_install:prepend() {
28 sed -i -e 's|${S}/src|${TARGET_DBGSRC_DIR}/src|g' ${B}/src/gcal-enum-types.h 28 sed -i -e 's|${S}/src|${TARGET_DBGSRC_DIR}/src|g' ${B}/src/gcal-enum-types.h
diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch
index 4ae923f87..c1bd34d14 100644
--- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch
+++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch
@@ -1,4 +1,4 @@
1From 1a48df2a8da44410bbd767c2420d363f6180c79a Mon Sep 17 00:00:00 2001 1From 9b88f816ffbe3dd35d0260974e246f6694983500 Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de> 2From: Markus Volk <f_l_k@t-online.de>
3Date: Mon, 18 Mar 2024 05:50:21 +0100 3Date: Mon, 18 Mar 2024 05:50:21 +0100
4Subject: [PATCH] Add meson option to pass sysroot 4Subject: [PATCH] Add meson option to pass sysroot
@@ -13,16 +13,16 @@ Upstream-Status: Inappropriate [OE specific]
13 3 files changed, 3 insertions(+), 2 deletions(-) 13 3 files changed, 3 insertions(+), 2 deletions(-)
14 14
15diff --git a/meson_options.txt b/meson_options.txt 15diff --git a/meson_options.txt b/meson_options.txt
16index e53d6e3f3..8fae4c824 100644 16index b2302bf..5b9baf5 100644
17--- a/meson_options.txt 17--- a/meson_options.txt
18+++ b/meson_options.txt 18+++ b/meson_options.txt
19@@ -1,3 +1,4 @@ 19@@ -1,3 +1,4 @@
20+option('oe_sysroot', type: 'string', value: '', description: 'Directory for OE-sysroot') 20+option('oe_sysroot', type: 'string', value: '', description: 'Directory for OE-sysroot')
21 option('deprecated-declarations', type: 'feature', value: 'disabled', description: 'build with deprecated declaration warnings') 21 option('deprecated-declarations', type: 'feature', value: 'disabled', description: 'build with deprecated declaration warnings')
22 option('documentation', type: 'boolean', value: false, description: 'build documentation') 22 option('documentation', type: 'boolean', value: false, description: 'build documentation')
23 option('ibus', type: 'boolean', value: true, description: 'build with IBus support') 23 option('location-services', type: 'feature', value: 'enabled', description: 'build with location services')
24diff --git a/panels/background/meson.build b/panels/background/meson.build 24diff --git a/panels/background/meson.build b/panels/background/meson.build
25index 6ced050f9..df1f80896 100644 25index 6ced050..df1f808 100644
26--- a/panels/background/meson.build 26--- a/panels/background/meson.build
27+++ b/panels/background/meson.build 27+++ b/panels/background/meson.build
28@@ -24,7 +24,7 @@ common_sources += gnome.mkenums_simple( 28@@ -24,7 +24,7 @@ common_sources += gnome.mkenums_simple(
@@ -35,7 +35,7 @@ index 6ced050f9..df1f80896 100644
35 35
36 common_sources += gnome.mkenums( 36 common_sources += gnome.mkenums(
37diff --git a/panels/system/meson.build b/panels/system/meson.build 37diff --git a/panels/system/meson.build b/panels/system/meson.build
38index 4fee82210..979332a0e 100644 38index 4fee822..979332a 100644
39--- a/panels/system/meson.build 39--- a/panels/system/meson.build
40+++ b/panels/system/meson.build 40+++ b/panels/system/meson.build
41@@ -73,7 +73,7 @@ sources += gnome.compile_resources( 41@@ -73,7 +73,7 @@ sources += gnome.compile_resources(
@@ -47,6 +47,3 @@ index 4fee82210..979332a0e 100644
47 'datetime/cc-datetime-page.h' 47 'datetime/cc-datetime-page.h'
48 ) 48 )
49 49
50--
512.44.0
52
diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.2.bb
index de11239ed..152e803b5 100644
--- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.2.bb
@@ -37,16 +37,16 @@ inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is
37 37
38REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11" 38REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11"
39 39
40SRC_URI = "gitsm://gitlab.gnome.org/GNOME/gnome-control-center.git;protocol=https;nobranch=1"
41SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" 40SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch"
42 41SRC_URI[archive.sha256sum] = "6335c6cb8164e574db521fff61cfa3dfaa55f1db66ae3bca02750a193e1c4f3d"
43S = "${WORKDIR}/git"
44SRCREV = "005f40dcfa464f113a1c95f97673bc5505fc15ad"
45 42
46PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" 43PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}"
47PACKAGECONFIG[cups] = ",,cups,cups" 44PACKAGECONFIG[cups] = ",,cups,cups system-config-printer cups-pk-helper"
48PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus" 45PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus"
49PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland" 46PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland"
47PACKAGECONFIG[file-share] = ",,,gnome-user-share"
48PACKAGECONFIG[media-share] = ",,,rygel-meta tumbler"
49PACKAGECONFIG[malcontent] = "-Dmalcontent=true,-Dmalcontent=false,malcontent,malcontent-ui"
50 50
51EXTRA_OEMESON += "-Doe_sysroot=${STAGING_DIR_HOST}" 51EXTRA_OEMESON += "-Doe_sysroot=${STAGING_DIR_HOST}"
52 52
@@ -72,4 +72,4 @@ FILES:${PN} += " \
72 72
73FILES:${PN}-dev += "${datadir}/gettext" 73FILES:${PN}-dev += "${datadir}/gettext"
74 74
75RDEPENDS:${PN} += "gsettings-desktop-schemas tecla system-config-printer cups-pk-helper ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'gnome-user-share', '' , d)}" 75RDEPENDS:${PN} += "gsettings-desktop-schemas tecla"
diff --git a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch
new file mode 100644
index 000000000..be4c002fc
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch
@@ -0,0 +1,43 @@
1From ac4a07e7ef3d9d046a4ca2a803c5b649b6f7ddf4 Mon Sep 17 00:00:00 2001
2From: Matt Turner <mattst88@gmail.com>
3Date: Sat, 8 Jul 2023 00:01:07 -0400
4Subject: [PATCH] window: Fix function callback definition
5
6Without this, the build fails with clang with
7CFLAGS=-Werror=incompatible-function-pointer-types
8
9```
10../src/font-view-window.c:864:77: error: incompatible function pointer types passing 'void (FontViewWindow *)' (aka 'void (struct _FontViewWindow *)') to parameter of type 'GtkWidgetActionActivateFunc' (aka 'void (*)(struct _GtkWidget *, const char *, struct _GVariant *)') [-Wincompatible-function-pointer-types]
11 gtk_widget_class_install_action (widget_class, "win.toggle-search", NULL, action_toggle_search_cb);
12 ^~~~~~~~~~~~~~~~~~~~~~~
13/usr/include/gtk-4.0/gtk/gtkwidget.h:956:87: note: passing argument to parameter 'activate' here
14 GtkWidgetActionActivateFunc activate);
15 ^
16```
17
18Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/merge_requests/54]
19Signed-off-by: Khem Raj <raj.khem@gmail.com>
20---
21 src/font-view-window.c | 5 ++++-
22 1 file changed, 4 insertions(+), 1 deletion(-)
23
24diff --git a/src/font-view-window.c b/src/font-view-window.c
25index 639ac33..24461f7 100644
26--- a/src/font-view-window.c
27+++ b/src/font-view-window.c
28@@ -758,8 +758,11 @@ font_view_window_show_overview (FontViewWindow *self)
29 }
30
31 static void
32-action_toggle_search_cb (FontViewWindow *self)
33+action_toggle_search_cb (GtkWidget *widget,
34+ const char *action_name,
35+ GVariant *parameter)
36 {
37+ FontViewWindow *self = FONT_VIEW_WINDOW (widget);
38
39 gtk_toggle_button_set_active (self->search_button,
40 !gtk_toggle_button_get_active (self->search_button));
41--
422.45.1
43
diff --git a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb
index dbce71d12..ccf8262dc 100644
--- a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb
@@ -15,6 +15,7 @@ inherit gnomebase gtk-icon-cache gettext features_check mime-xdg
15 15
16REQUIRED_DISTRO_FEATURES = "x11 opengl" 16REQUIRED_DISTRO_FEATURES = "x11 opengl"
17 17
18SRC_URI += "file://0001-window-Fix-function-callback-definition.patch"
18SRC_URI[archive.sha256sum] = "592f401e485d02cc044d487bb5c8e04c961da6856216768a59f1ff98bd2d537c" 19SRC_URI[archive.sha256sum] = "592f401e485d02cc044d487bb5c8e04c961da6856216768a59f1ff98bd2d537c"
19 20
20FILES:${PN} += " \ 21FILES:${PN} += " \
diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.50.1.bb b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.50.2.bb
index 66df8902f..adce70770 100644
--- a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.50.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.50.2.bb
@@ -8,7 +8,7 @@ REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'goabackend',
8 8
9DEPENDS += "gdk-pixbuf dbus glib-2.0 gcr" 9DEPENDS += "gdk-pixbuf dbus glib-2.0 gcr"
10 10
11SRC_URI[archive.sha256sum] = "42ee43fd1e2942b9ff6106252ccdc834602815508bf7a3a52c0bdfffa56eaf40" 11SRC_URI[archive.sha256sum] = "df16ad975d139c6bfc4ebb2ec8bb8327297a791ef2bf0b977c78076af5faa98e"
12 12
13PACKAGECONFIG ?= "goabackend kerberos owncloud google windows_live" 13PACKAGECONFIG ?= "goabackend kerberos owncloud google windows_live"
14 14
diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_46.0.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_46.2.bb
index eff5fecff..5c2ae0593 100644
--- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_46.2.bb
@@ -6,7 +6,7 @@ inherit gnomebase gettext gsettings features_check
6 6
7REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data" 7REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data"
8 8
9SRC_URI[archive.sha256sum] = "d8138f88cd92df9f932309149c236fbdd77c1bc095445036ab7eb0ecda53c01a" 9SRC_URI[archive.sha256sum] = "d442e9d26925125ff215a5c134290495655380741daafbb37a3a99d6f0c7d86f"
10 10
11EXTRA_OEMESON += " \ 11EXTRA_OEMESON += " \
12 -Dextension_set=all \ 12 -Dextension_set=all \
diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.0.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.2.bb
index 907cfdf67..0a52de7a3 100644
--- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.2.bb
@@ -32,7 +32,7 @@ GIR_MESON_OPTION = ""
32# gobject-introspection is mandatory and cannot be configured 32# gobject-introspection is mandatory and cannot be configured
33REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" 33REQUIRED_DISTRO_FEATURES += "gobject-introspection-data"
34 34
35SRC_URI[archive.sha256sum] = "6bc41340b6de05774e97cfe20feba86e2b3cc9c8139118f24bd84ac63e82b53e" 35SRC_URI[archive.sha256sum] = "6b587101c04bfb364ab09cd38b5d93ebeeb4254754c807cf712fbc8ee3fde238"
36SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch" 36SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch"
37 37
38PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" 38PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
diff --git a/meta-gnome/recipes-gnome/gnome-software/gnome-software_46.0.bb b/meta-gnome/recipes-gnome/gnome-software/gnome-software_46.2.bb
index 40a7141fc..244941786 100644
--- a/meta-gnome/recipes-gnome/gnome-software/gnome-software_46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-software/gnome-software_46.2.bb
@@ -28,7 +28,7 @@ RDEPENDS:${PN} = "iso-codes"
28 28
29EXTRA_OEMESON += "-Dtests=false -Dsoup2=false" 29EXTRA_OEMESON += "-Dtests=false -Dsoup2=false"
30 30
31SRC_URI[archive.sha256sum] = "11893002bbb54082896683707bc3991ae55a2f3040811a760e3a92c96544f86e" 31SRC_URI[archive.sha256sum] = "e700cba287764f5e2255514e312e160550fdbf7a5d3fe16358bb6f7b6732b974"
32 32
33PACKAGECONFIG ?= "flatpak" 33PACKAGECONFIG ?= "flatpak"
34PACKAGECONFIG[flatpak] = "-Dflatpak=true,-Dflatpak=false,flatpak ostree" 34PACKAGECONFIG[flatpak] = "-Dflatpak=true,-Dflatpak=false,flatpak ostree"
diff --git a/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_46.1.bb b/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_46.3.bb
index f37eb7195..1e3268238 100644
--- a/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_46.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_46.3.bb
@@ -18,7 +18,7 @@ inherit gnomebase gtk-icon-cache itstool gnome-help mime-xdg features_check
18 18
19REQUIRED_DISTRO_FEATURES = "opengl" 19REQUIRED_DISTRO_FEATURES = "opengl"
20 20
21SRC_URI[archive.sha256sum] = "8ebfa0bea12e75f5efeacc721be3b8ae65027b024aa81db9ecab8c312257a2eb" 21SRC_URI[archive.sha256sum] = "005b48104a909be66ae07448d2bc5706c7d113781057a24ff6da55bdf324c73d"
22 22
23FILES:${PN} += " \ 23FILES:${PN} += " \
24 ${datadir}/metainfo \ 24 ${datadir}/metainfo \
diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb
index 4e1e43431..9d46b43c4 100644
--- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb
+++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb
@@ -6,13 +6,14 @@ inherit allarch
6 6
7SRC_URI = "file://classic-light.xml" 7SRC_URI = "file://classic-light.xml"
8 8
9S = "${WORKDIR}" 9S = "${WORKDIR}/sources"
10UNPACKDIR = "${S}"
10 11
11do_install() { 12do_install() {
12 install -d ${D}${datadir}/gtksourceview-3.0/styles 13 install -d ${D}${datadir}/gtksourceview-3.0/styles
13 install -m 0644 ${WORKDIR}/classic-light.xml ${D}${datadir}/gtksourceview-3.0/styles/ 14 install -m 0644 ${UNPACKDIR}/classic-light.xml ${D}${datadir}/gtksourceview-3.0/styles/
14 install -d ${D}${datadir}/gtksourceview-4/styles 15 install -d ${D}${datadir}/gtksourceview-4/styles
15 install -m 0644 ${WORKDIR}/classic-light.xml ${D}${datadir}/gtksourceview-4/styles/ 16 install -m 0644 ${UNPACKDIR}/classic-light.xml ${D}${datadir}/gtksourceview-4/styles/
16} 17}
17 18
18FILES:${PN} = " \ 19FILES:${PN} = " \
diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb
index e504186b8..0ab9b1469 100644
--- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb
+++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb
@@ -15,6 +15,9 @@ inherit gnomebase lib_package gettext features_check gtk-doc gobject-introspecti
15 15
16REQUIRED_DISTRO_FEATURES = "x11" 16REQUIRED_DISTRO_FEATURES = "x11"
17 17
18EXTRA_OECONF += "--disable-glade-catalog --disable-gtk-doc --disable-Werror"
19
20CFLAGS += "-Wno-error=incompatible-pointer-types"
18SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/3.24/${PNAME}-${PV}.tar.xz" 21SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/3.24/${PNAME}-${PV}.tar.xz"
19SRC_URI[md5sum] = "b748da426a7d64e1304f0c532b0f2a67" 22SRC_URI[md5sum] = "b748da426a7d64e1304f0c532b0f2a67"
20SRC_URI[sha256sum] = "691b074a37b2a307f7f48edc5b8c7afa7301709be56378ccf9cc9735909077fd" 23SRC_URI[sha256sum] = "691b074a37b2a307f7f48edc5b8c7afa7301709be56378ccf9cc9735909077fd"
diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.2.bb b/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.2.bb
index acf288528..e0c8724a3 100644
--- a/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.2.bb
+++ b/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.2.bb
@@ -28,3 +28,7 @@ FILES:${PN} += " \
28 ${datadir}/libgweather-4 \ 28 ${datadir}/libgweather-4 \
29 ${libdir}/libgweather-4 \ 29 ${libdir}/libgweather-4 \
30" 30"
31
32do_configure:prepend() {
33 cp -f ${STAGING_LIBDIR}/girepository-1.0/GLib*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/
34}
diff --git a/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.1.bb b/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.2.bb
index 4c11a8d13..a4b434950 100644
--- a/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.1.bb
+++ b/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.2.bb
@@ -2,9 +2,10 @@ SUMMARY = "libmsgraph is a GLib-based library for accessing online serive APIs u
2LICENSE = "LGPL-3.0-only" 2LICENSE = "LGPL-3.0-only"
3LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" 3LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404"
4 4
5inherit gnomebase gobject-introspection gi-docgen 5inherit gnomebase gobject-introspection gi-docgen features_check
6REQUIRED_DISTRO_FEATURES = "opengl"
6 7
7SRC_URI[archive.sha256sum] = "e0e59eaa8ae3e0a48ec0a6c2fed0470856a709248e9212b6a1d037de5792ecbb" 8SRC_URI[archive.sha256sum] = "12cc954f750bb137ace8500fe9355d26e6e00ef6ccaab2950e9d360e92758335"
8 9
9GTKDOC_MESON_OPTION = "gtk_doc" 10GTKDOC_MESON_OPTION = "gtk_doc"
10 11
diff --git a/meta-gnome/recipes-gnome/mutter/mutter_46.0.bb b/meta-gnome/recipes-gnome/mutter/mutter_46.2.bb
index d14f161f1..6a121b09c 100644
--- a/meta-gnome/recipes-gnome/mutter/mutter_46.0.bb
+++ b/meta-gnome/recipes-gnome/mutter/mutter_46.2.bb
@@ -24,7 +24,7 @@ DEPENDS = " \
24 24
25inherit gnomebase gsettings gobject-introspection gettext features_check 25inherit gnomebase gsettings gobject-introspection gettext features_check
26 26
27SRC_URI[archive.sha256sum] = "bb3f7d77aebdea9d317d3f5ef03868e4e7969da423ac495e33a16d61db2c9373" 27SRC_URI[archive.sha256sum] = "009baa77f8362612caa2e18c338a1b3c8aad3b5fe2964c2fef7824d321228983"
28 28
29# x11 is still manadatory - see meson.build 29# x11 is still manadatory - see meson.build
30REQUIRED_DISTRO_FEATURES = "wayland x11 polkit" 30REQUIRED_DISTRO_FEATURES = "wayland x11 polkit"
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_45.1.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_46.2.bb
index 9c0d154ec..30e0681ae 100644
--- a/meta-gnome/recipes-gnome/nautilus/nautilus_45.1.bb
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus_46.2.bb
@@ -22,7 +22,7 @@ DEPENDS = " \
22 22
23inherit gnomebase gsettings gobject-introspection gi-docgen gettext features_check mime-xdg gtk-icon-cache 23inherit gnomebase gsettings gobject-introspection gi-docgen gettext features_check mime-xdg gtk-icon-cache
24 24
25SRC_URI[archive.sha256sum] = "23bdaa9a85466c5937a89daddd080ed03bcc2b49e8b64af607206353bde82fe3" 25SRC_URI[archive.sha256sum] = "6ee8c99019b9e3447f6918d68232a20deca89e5525c05805432b7d8840ca71fa"
26 26
27REQUIRED_DISTRO_FEATURES = "x11 opengl gobject-introspection-data" 27REQUIRED_DISTRO_FEATURES = "x11 opengl gobject-introspection-data"
28 28
diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch b/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch
index 7a40ae338..36dd4a588 100644
--- a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch
+++ b/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch
@@ -7,21 +7,22 @@ Upstream-Status: Inappropriate [embedded specific]
7 7
8Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> 8Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
9--- 9---
10 src/libtracker-miners-common/tracker-miner-enum-types.c.template | 1 +- 10 .../tracker-miners-enum-types.c.template | 2 +-
11 1 files changed, 1 insertions(+), 1 deletions(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
12 12
13diff --git a/src/libtracker-miners-common/tracker-miners-enum-types.c.template b/src/libtracker-miners-common/tracker-miners-enum-types.c.template 13diff --git a/src/libtracker-miners-common/tracker-miners-enum-types.c.template b/src/libtracker-miners-common/tracker-miners-enum-types.c.template
14index c712dda..cb449e2 100644 14index 4db7ef1..7c44c13 100644
15--- a/src/libtracker-miners-common/tracker-miners-enum-types.c.template 15--- a/src/libtracker-miners-common/tracker-miners-enum-types.c.template
16+++ b/src/libtracker-miners-common/tracker-miners-enum-types.c.template 16+++ b/src/libtracker-miners-common/tracker-miners-enum-types.c.template
17@@ -7,7 +7,7 @@ 17@@ -7,7 +7,7 @@
18 18
19 /*** BEGIN file-production ***/ 19 /*** BEGIN file-production ***/
20 /* enumerations from "@basename@" */ 20 /* enumerations from "@basename@" */
21-#include "@filename@" 21-#include "@filename@"
22+#include "tracker-enums.h" 22+#include "tracker-enums.h"
23 /*** END file-production ***/ 23 /*** END file-production ***/
24
25
26--
272.34.1
24 28
25
26--
272.25.1
diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch b/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch
index 98618e5d3..0812e88a9 100644
--- a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch
+++ b/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch
@@ -1,4 +1,4 @@
1From 2bbd07843e8ec34311cafab35f21b40c86e0dd7f Mon Sep 17 00:00:00 2001 1From 1b7a34b7de9eb2ae776f7cf4dc6221f49b2395ee Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de> 2From: Markus Volk <f_l_k@t-online.de>
3Date: Tue, 12 Sep 2023 17:00:41 +0200 3Date: Tue, 12 Sep 2023 17:00:41 +0200
4Subject: [PATCH] meson: fix reproducibility 4Subject: [PATCH] meson: fix reproducibility
@@ -12,16 +12,18 @@ Upstream-Status: Inappropriate [oe-specific]
12 12
13Signed-off-by: Markus Volk <f_l_k@t-online.de> 13Signed-off-by: Markus Volk <f_l_k@t-online.de>
14--- 14---
15 meson.build | 20 ++++++++++---------- 15 meson.build | 8 ++++----
16 src/tracker-extract/meson.build | 2 +- 16 src/libtracker-miners-common/tracker-landlock.c | 4 ++--
17 tests/tracker-miner-fs/meson.build | 2 +- 17 src/miners/fs/meson.build | 4 ++--
18 3 files changed, 12 insertions(+), 12 deletions(-) 18 src/tracker-extract/meson.build | 2 +-
19 tests/tracker-miner-fs/meson.build | 2 +-
20 5 files changed, 10 insertions(+), 10 deletions(-)
19 21
20diff --git a/meson.build b/meson.build 22diff --git a/meson.build b/meson.build
21index 935584185..aa6126081 100644 23index 37f5148..18f4bfa 100644
22--- a/meson.build 24--- a/meson.build
23+++ b/meson.build 25+++ b/meson.build
24@@ -380,7 +380,7 @@ conf.set('PACKAGE_VERSION', '"@0@"'.format(meson.project_version())) 26@@ -393,7 +393,7 @@ conf.set('PACKAGE_VERSION', '"@0@"'.format(meson.project_version()))
25 conf.set('TRACKER_VERSION', '"@0@"'.format(meson.project_version())) 27 conf.set('TRACKER_VERSION', '"@0@"'.format(meson.project_version()))
26 28
27 # Config that goes in some other generated files (.desktop, .pc, etc) 29 # Config that goes in some other generated files (.desktop, .pc, etc)
@@ -30,7 +32,7 @@ index 935584185..aa6126081 100644
30 conf.set('exec_prefix', get_option('prefix')) 32 conf.set('exec_prefix', get_option('prefix'))
31 conf.set('bindir', join_paths(get_option('prefix'), get_option('bindir'))) 33 conf.set('bindir', join_paths(get_option('prefix'), get_option('bindir')))
32 conf.set('datadir', datadir) 34 conf.set('datadir', datadir)
33@@ -409,7 +409,7 @@ tracker_c_args = [ 35@@ -422,7 +422,7 @@ tracker_c_args = [
34 configinc = include_directories('./') 36 configinc = include_directories('./')
35 srcinc = include_directories('src/') 37 srcinc = include_directories('src/')
36 38
@@ -39,7 +41,7 @@ index 935584185..aa6126081 100644
39 41
40 # We use tracker-miners-3.0 rather than tracker3-miners inside the lib64 42 # We use tracker-miners-3.0 rather than tracker3-miners inside the lib64
41 # directory, following the existing convention in that directory. 43 # directory, following the existing convention in that directory.
42@@ -438,8 +438,8 @@ subdir('data') 44@@ -451,8 +451,8 @@ subdir('data')
43 subdir('docs') 45 subdir('docs')
44 46
45 test_c_args = tracker_c_args + [ 47 test_c_args = tracker_c_args + [
@@ -50,11 +52,48 @@ index 935584185..aa6126081 100644
50 ] 52 ]
51 53
52 if get_option('tests_tap_protocol') 54 if get_option('tests_tap_protocol')
55diff --git a/src/libtracker-miners-common/tracker-landlock.c b/src/libtracker-miners-common/tracker-landlock.c
56index 6d4510b..189d2fb 100644
57--- a/src/libtracker-miners-common/tracker-landlock.c
58+++ b/src/libtracker-miners-common/tracker-landlock.c
59@@ -282,7 +282,7 @@ tracker_landlock_init (const gchar * const *indexed_folders)
60 LANDLOCK_ACCESS_FS_READ_DIR);
61 }
62 }
63-
64+#if 0
65 current_dir = g_get_current_dir ();
66
67 /* Detect running in-tree */
68@@ -302,7 +302,7 @@ tracker_landlock_init (const gchar * const *indexed_folders)
69 in_tree_rules[i].flags);
70 }
71 }
72-
73+#endif
74 /* Add user cache for readonly databases */
75 #ifdef MINER_FS_CACHE_LOCATION
76 add_rule (landlock_fd, MINER_FS_CACHE_LOCATION,
77diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build
78index 6e58832..04750f8 100644
79--- a/src/miners/fs/meson.build
80+++ b/src/miners/fs/meson.build
81@@ -67,8 +67,8 @@ executable('tracker-miner-fs-@0@'.format(tracker_api_major),
82 dependencies: tracker_miner_fs_deps,
83 c_args: [
84 tracker_c_args,
85- '-DBUILDROOT="@0@"'.format(meson.global_build_root()),
86- '-DBUILD_EXTRACTDIR="@0@"'.format(meson.build_root() / 'src' / 'tracker-extract'),
87+ '-DBUILDROOT="@0@"'.format(get_option('prefix') / 'src'),
88+ '-DBUILD_EXTRACTDIR="@0@"'.format(get_option('prefix') / 'src' / 'tracker-extract'),
89 '-DLIBEXECDIR="@0@"'.format(get_option('prefix') / get_option('libexecdir')),
90 ],
91 install: true,
53diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build 92diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
54index 4aaad5c41..d17cce221 100644 93index 2e4f61d..b47581c 100644
55--- a/src/tracker-extract/meson.build 94--- a/src/tracker-extract/meson.build
56+++ b/src/tracker-extract/meson.build 95+++ b/src/tracker-extract/meson.build
57@@ -159,7 +159,7 @@ endif 96@@ -158,7 +158,7 @@ endif
58 executable('tracker-extract-@0@'.format(tracker_api_major), 97 executable('tracker-extract-@0@'.format(tracker_api_major),
59 tracker_extract_sources, 98 tracker_extract_sources,
60 # Manually add the root dir to work around https://github.com/mesonbuild/meson/issues/1387 99 # Manually add the root dir to work around https://github.com/mesonbuild/meson/issues/1387
@@ -64,10 +103,10 @@ index 4aaad5c41..d17cce221 100644
64 dependencies: tracker_extract_dependencies, 103 dependencies: tracker_extract_dependencies,
65 install: true, 104 install: true,
66diff --git a/tests/tracker-miner-fs/meson.build b/tests/tracker-miner-fs/meson.build 105diff --git a/tests/tracker-miner-fs/meson.build b/tests/tracker-miner-fs/meson.build
67index e131b85ad..59e509fa6 100644 106index 8c081fd..9792082 100644
68--- a/tests/tracker-miner-fs/meson.build 107--- a/tests/tracker-miner-fs/meson.build
69+++ b/tests/tracker-miner-fs/meson.build 108+++ b/tests/tracker-miner-fs/meson.build
70@@ -19,7 +19,7 @@ libtracker_miner_test_c_args = [ 109@@ -18,7 +18,7 @@ libtracker_miner_test_c_args = [
71 ] 110 ]
72 111
73 libtracker_miner_test_environment = environment() 112 libtracker_miner_test_environment = environment()
@@ -76,43 +115,3 @@ index e131b85ad..59e509fa6 100644
76 115
77 libtracker_miner_test_deps = [tracker_miners_common_dep, tracker_miner_dep, tracker_sparql] 116 libtracker_miner_test_deps = [tracker_miners_common_dep, tracker_miner_dep, tracker_sparql]
78 117
79
80diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build
81index 6e5883288..04750f82b 100644
82--- a/src/miners/fs/meson.build
83+++ b/src/miners/fs/meson.build
84@@ -67,8 +67,8 @@ executable('tracker-miner-fs-@0@'.format(tracker_api_major),
85 dependencies: tracker_miner_fs_deps,
86 c_args: [
87 tracker_c_args,
88- '-DBUILDROOT="@0@"'.format(meson.global_build_root()),
89- '-DBUILD_EXTRACTDIR="@0@"'.format(meson.build_root() / 'src' / 'tracker-extract'),
90+ '-DBUILDROOT="@0@"'.format(get_option('prefix') / 'src'),
91+ '-DBUILD_EXTRACTDIR="@0@"'.format(get_option('prefix') / 'src' / 'tracker-extract'),
92 '-DLIBEXECDIR="@0@"'.format(get_option('prefix') / get_option('libexecdir')),
93 ],
94 install: true,
95diff --git a/src/libtracker-miners-common/tracker-landlock.c b/src/libtracker-miners-common/tracker-landlock.c
96index 27e7db65b..3021343eb 100644
97--- a/src/libtracker-miners-common/tracker-landlock.c
98+++ b/src/libtracker-miners-common/tracker-landlock.c
99@@ -276,7 +276,7 @@
100 LANDLOCK_ACCESS_FS_READ_DIR);
101 }
102 }
103-
104+#if 0
105 current_dir = g_get_current_dir ();
106
107 /* Detect running in-tree */
108@@ -296,7 +296,7 @@
109 in_tree_rules[i].flags);
110 }
111 }
112-
113+#endif
114 /* Add user cache for readonly databases */
115 #ifdef MINER_FS_CACHE_LOCATION
116 add_rule (landlock_fd, MINER_FS_CACHE_LOCATION,
117--
1182.41.0
diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.1.bb b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.3.bb
index 7bbee2a88..2b2dc7c4b 100644
--- a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.1.bb
+++ b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.3.bb
@@ -18,7 +18,7 @@ SRC_URI:append = " \
18 file://0001-fix-reproducibility.patch \ 18 file://0001-fix-reproducibility.patch \
19 file://0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch \ 19 file://0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch \
20" 20"
21SRC_URI[archive.sha256sum] = "50a3abe40cfb0b35ced43ec716dbf1368992e444ef7a0babf202c7ac6ab2f6f4" 21SRC_URI[archive.sha256sum] = "e74388154b5c197b4b7ee42f0dce8c5fbbddd4d361093ef88d4fb303e33da5fe"
22 22
23# gobject-introspection is mandatory and cannot be configured 23# gobject-introspection is mandatory and cannot be configured
24REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" 24REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
diff --git a/meta-gnome/recipes-gnome/tracker/tracker_3.7.1.bb b/meta-gnome/recipes-gnome/tracker/tracker_3.7.3.bb
index 1d5c79ab4..885f3515d 100644
--- a/meta-gnome/recipes-gnome/tracker/tracker_3.7.1.bb
+++ b/meta-gnome/recipes-gnome/tracker/tracker_3.7.3.bb
@@ -22,7 +22,7 @@ DEPENDS = " \
22inherit gettext gnomebase gobject-introspection vala gtk-doc bash-completion python3native 22inherit gettext gnomebase gobject-introspection vala gtk-doc bash-completion python3native
23 23
24SRC_URI += "file://0001-fix-reproducibility.patch" 24SRC_URI += "file://0001-fix-reproducibility.patch"
25SRC_URI[archive.sha256sum] = "cd91b885ee9839cde5387f8e05ed24a7108d1627629cb6b1b2aa51a9603e130a" 25SRC_URI[archive.sha256sum] = "ab3d4a50937e04c5ed7846f6dbb999e2909819402f389ca592ee6b77dd28d1f9"
26 26
27# text search is not an option anymore and requires sqlite3 build with 27# text search is not an option anymore and requires sqlite3 build with
28# PACKAGECONFIG[fts5] set (default) 28# PACKAGECONFIG[fts5] set (default)