summaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-extended/gparted/gparted_1.8.1.bb (renamed from meta-gnome/recipes-extended/gparted/gparted_1.8.0.bb)2
-rw-r--r--meta-gnome/recipes-gimp/babl/babl_0.1.126.bb (renamed from meta-gnome/recipes-gimp/babl/babl_0.1.122.bb)2
-rw-r--r--meta-gnome/recipes-gimp/gegl/gegl/0001-gegl-Add-gegl-arm.def-file.patch53
-rw-r--r--meta-gnome/recipes-gimp/gegl/gegl_0.4.70.bb (renamed from meta-gnome/recipes-gimp/gegl/gegl_0.4.66.bb)6
-rw-r--r--meta-gnome/recipes-gimp/gimp/gimp/0004-meson.build-dont-check-for-python3-pygobject-gexiv2-.patch47
-rw-r--r--meta-gnome/recipes-gimp/gimp/gimp/0005-docs-meson.build-disable-gimprc-man-build.patch33
-rw-r--r--meta-gnome/recipes-gimp/gimp/gimp_3.2.4.bb (renamed from meta-gnome/recipes-gimp/gimp/gimp_3.2.0.bb)7
-rw-r--r--meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb11
-rw-r--r--meta-gnome/recipes-gnome/cheese/cheese_44.1.bb5
-rw-r--r--meta-gnome/recipes-gnome/eog/eog_49.3.bb (renamed from meta-gnome/recipes-gnome/eog/eog_49.1.bb)7
-rw-r--r--meta-gnome/recipes-gnome/gdm/gdm_50.0.bb (renamed from meta-gnome/recipes-gnome/gdm/gdm_49.2.bb)2
-rw-r--r--meta-gnome/recipes-gnome/gedit/gedit_50.0.bb (renamed from meta-gnome/recipes-gnome/gedit/gedit_49.0.bb)4
-rw-r--r--meta-gnome/recipes-gnome/gedit/libgedit-gfls_0.4.1.bb (renamed from meta-gnome/recipes-gnome/gedit/libgedit-gfls_0.3.1.bb)4
-rw-r--r--meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.6.0.bb2
-rw-r--r--meta-gnome/recipes-gnome/gjs/gjs_1.84.2.bb (renamed from meta-gnome/recipes-gnome/gjs/gjs_1.84.1.bb)2
-rw-r--r--meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_50.0.bb (renamed from meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_48.0.bb)2
-rw-r--r--meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3_3.34.5.bb2
-rw-r--r--meta-gnome/recipes-gnome/gnome-chess/gnome-chess_50.0.bb (renamed from meta-gnome/recipes-gnome/gnome-chess/gnome-chess_48.0.bb)4
-rw-r--r--meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.58.1.bb (renamed from meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.55.1.bb)2
-rw-r--r--meta-gnome/recipes-gnome/gnome-software/gnome-software/0001-meson.build-dont-look-for-flatpak-http_backend-varia.patch56
-rw-r--r--meta-gnome/recipes-gnome/gnome-software/gnome-software_50.0.bb (renamed from meta-gnome/recipes-gnome/gnome-software/gnome-software_49.2.bb)3
-rw-r--r--meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_50.0.bb (renamed from meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_49.1.bb)2
-rw-r--r--meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_50.0.bb (renamed from meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_49.1.bb)2
-rw-r--r--meta-gnome/recipes-gnome/gthumb/gthumb_3.12.10.bb (renamed from meta-gnome/recipes-gnome/gthumb/gthumb_3.12.7.bb)13
-rw-r--r--meta-gnome/recipes-gnome/gvfs/gvfs_1.60.0.bb (renamed from meta-gnome/recipes-gnome/gvfs/gvfs_1.58.2.bb)4
-rw-r--r--meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.21.bb2
-rw-r--r--meta-gnome/recipes-gnome/libgdata/libgdata/0001-Drop-usage-of-deprecated-GTimeVal.patch1134
-rw-r--r--meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb34
-rw-r--r--meta-gnome/recipes-gnome/libgsf/libgsf_1.14.56.bb (renamed from meta-gnome/recipes-gnome/libgsf/libgsf_1.14.55.bb)2
-rw-r--r--meta-gnome/recipes-gnome/libtimezonemap/files/port-to-libsoup3.patch95
-rw-r--r--meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb5
-rw-r--r--meta-gnome/recipes-gnome/libwnck/files/ef0e40d59c32d7ebeb94d242436e3144cefc174a.patch40
-rw-r--r--meta-gnome/recipes-gnome/libwnck/libwnck3_43.3.bb (renamed from meta-gnome/recipes-gnome/libwnck/libwnck3_43.2.bb)5
-rw-r--r--meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch30
-rw-r--r--meta-gnome/recipes-gnome/metacity/metacity_3.58.1.bb (renamed from meta-gnome/recipes-gnome/metacity/metacity_3.56.0.bb)4
-rw-r--r--meta-gnome/recipes-gnome/nautilus/nautilus_49.5.bb (renamed from meta-gnome/recipes-gnome/nautilus/nautilus_49.4.bb)2
-rw-r--r--meta-gnome/recipes-gnome/tecla/tecla_50.0.bb (renamed from meta-gnome/recipes-gnome/tecla/tecla_49.0.bb)2
-rw-r--r--meta-gnome/recipes-gnome/tepl/tepl_6.14.0.bb2
-rw-r--r--meta-gnome/recipes-gnome/tracker/localsearch/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch4
-rw-r--r--meta-gnome/recipes-gnome/tracker/localsearch/0001-fix-reproducibility.patch67
-rw-r--r--meta-gnome/recipes-gnome/tracker/localsearch_3.11.0.bb (renamed from meta-gnome/recipes-gnome/tracker/localsearch_3.9.0.bb)6
-rw-r--r--meta-gnome/recipes-gnome/tracker/tinysparql_3.11.0.bb (renamed from meta-gnome/recipes-gnome/tracker/tinysparql_3.10.1.bb)2
-rw-r--r--meta-gnome/recipes-gnome/yelp/yelp_42.2.bb6
-rw-r--r--meta-gnome/recipes-support/accountsservice/accountsservice_23.13.9.bb2
-rw-r--r--meta-gnome/recipes-support/libwacom/libwacom_2.18.0.bb (renamed from meta-gnome/recipes-support/libwacom/libwacom_2.8.0.bb)5
-rw-r--r--meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch69
-rw-r--r--meta-gnome/recipes-support/onboard/onboard_1.4.4-1.bb (renamed from meta-gnome/recipes-support/onboard/onboard_1.4.3-9.bb)5
-rw-r--r--meta-gnome/recipes-support/webp-pixbuf-loader/webp-pixbuf-loader_0.2.7.bb2
-rw-r--r--meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_50.0.bb (renamed from meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_49.0.bb)2
-rw-r--r--meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gtk_1.15.3.bb2
50 files changed, 267 insertions, 1539 deletions
diff --git a/meta-gnome/recipes-extended/gparted/gparted_1.8.0.bb b/meta-gnome/recipes-extended/gparted/gparted_1.8.1.bb
index dec9ea01ae..b8c5587651 100644
--- a/meta-gnome/recipes-extended/gparted/gparted_1.8.0.bb
+++ b/meta-gnome/recipes-extended/gparted/gparted_1.8.1.bb
@@ -11,7 +11,7 @@ SRC_URI = " \
11 ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ 11 ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \
12 ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'file://0001-Install-polkit-action-unconditionally-executable-pke.patch', '', d)} \ 12 ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'file://0001-Install-polkit-action-unconditionally-executable-pke.patch', '', d)} \
13" 13"
14SRC_URI[sha256sum] = "f584ed4be7fd09c2cf6a784778a8540970d985f0ac8e5a7bd0628528a3ab5609" 14SRC_URI[sha256sum] = "67388ac405f9fe92a40636cb03b0e1e0bb6403ad89ccc174b2ff190ef6f32349"
15 15
16UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/gparted/files/gparted/" 16UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/gparted/files/gparted/"
17UPSTREAM_CHECK_REGEX = "gparted-(?P<pver>\d+\.(\d+)+(\.\d+)+)" 17UPSTREAM_CHECK_REGEX = "gparted-(?P<pver>\d+\.(\d+)+(\.\d+)+)"
diff --git a/meta-gnome/recipes-gimp/babl/babl_0.1.122.bb b/meta-gnome/recipes-gimp/babl/babl_0.1.126.bb
index c623e0d4ac..10e2c482a5 100644
--- a/meta-gnome/recipes-gimp/babl/babl_0.1.122.bb
+++ b/meta-gnome/recipes-gimp/babl/babl_0.1.126.bb
@@ -10,7 +10,7 @@ inherit setuptools3 gnomebase gobject-introspection vala
10DEPENDS += "lcms" 10DEPENDS += "lcms"
11 11
12SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" 12SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz"
13SRC_URI[sha256sum] = "6851f705cda38f2df08a4ba8618279ce30d0a46f957fe6aa325b7b7de297bed2" 13SRC_URI[sha256sum] = "3f090f4b2a61fecf7c8dc60a5804bbc77cefd8d778af2ded059f0e367a52930e"
14 14
15FILES:${PN} += "${libdir}/${BPN}-${@gnome_verdir("${PV}")}" 15FILES:${PN} += "${libdir}/${BPN}-${@gnome_verdir("${PV}")}"
16 16
diff --git a/meta-gnome/recipes-gimp/gegl/gegl/0001-gegl-Add-gegl-arm.def-file.patch b/meta-gnome/recipes-gimp/gegl/gegl/0001-gegl-Add-gegl-arm.def-file.patch
deleted file mode 100644
index 1a2d39af4a..0000000000
--- a/meta-gnome/recipes-gimp/gegl/gegl/0001-gegl-Add-gegl-arm.def-file.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1From 69c263ae5f3d4a2d251e00c7236efd035db2bb5a Mon Sep 17 00:00:00 2001
2From: Bruno Lopes <brunvonlope@outlook.com>
3Date: Sat, 13 Dec 2025 08:48:21 -0300
4Subject: [PATCH] gegl: Add gegl-arm.def file
5
6Fix def-file problem in arm environment.
7
8Problem found in gegl/gegl.def
9 the following symbols are in the library,
10 but are not listed in the .def-file:
11 + gegl_downscale_2x2_arm_neon
12 + gegl_downscale_2x2_get_fun_arm_neon
13 + gegl_downscale_2x2_nearest_arm_neon
14 + gegl_resample_bilinear_arm_neon
15 + gegl_resample_boxfilter_arm_neon
16 + gegl_resample_nearest_arm_neon
17
18Upstream-Status: Backport [https://github.com/GNOME/gegl/commit/69c263ae5f3d4a2d251e00c7236efd035db2bb5a]
19Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
20---
21 gegl/gegl-arm.def | 6 ++++++
22 gegl/meson.build | 2 +-
23 2 files changed, 7 insertions(+), 1 deletion(-)
24 create mode 100644 gegl/gegl-arm.def
25
26diff --git a/gegl/gegl-arm.def b/gegl/gegl-arm.def
27new file mode 100644
28index 000000000..cb8277cf6
29--- /dev/null
30+++ b/gegl/gegl-arm.def
31@@ -0,0 +1,6 @@
32+ gegl_downscale_2x2_arm_neon
33+ gegl_downscale_2x2_get_fun_arm_neon
34+ gegl_downscale_2x2_nearest_arm_neon
35+ gegl_resample_bilinear_arm_neon
36+ gegl_resample_boxfilter_arm_neon
37+ gegl_resample_nearest_arm_neon
38diff --git a/gegl/meson.build b/gegl/meson.build
39index 0548b069d..85e89bbd2 100644
40--- a/gegl/meson.build
41+++ b/gegl/meson.build
42@@ -102,7 +102,7 @@ if host_cpu_family == 'x86_64'
43 simd_extra_def = ['gegl-x86_64.def']
44 elif host_cpu_family == 'arm'
45 simd_extra = [lib_gegl_arm_neon]
46- simd_extra_def = []
47+ simd_extra_def = ['gegl-arm.def']
48 else
49 simd_extra = []
50 simd_extra_def = []
51--
522.43.0
53
diff --git a/meta-gnome/recipes-gimp/gegl/gegl_0.4.66.bb b/meta-gnome/recipes-gimp/gegl/gegl_0.4.70.bb
index 3ec7457866..64ff475dc4 100644
--- a/meta-gnome/recipes-gimp/gegl/gegl_0.4.66.bb
+++ b/meta-gnome/recipes-gimp/gegl/gegl_0.4.70.bb
@@ -27,10 +27,8 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
27 27
28SHPV = "${@gnome_verdir("${PV}")}" 28SHPV = "${@gnome_verdir("${PV}")}"
29 29
30SRC_URI = "https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz \ 30SRC_URI = "https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz"
31 file://0001-gegl-Add-gegl-arm.def-file.patch \ 31SRC_URI[sha256sum] = "47f50d9c3aecd375deb48c11ebfead52d162e4fc162a4b3d44618277f1faec02"
32 "
33SRC_URI[sha256sum] = "92b05855e2190868949d70cea6e9a50b163a6a441242e740a6263975379f993b"
34 32
35PACKAGECONFIG ??= "gexiv2 libraw librsvg pango poppler sdl2" 33PACKAGECONFIG ??= "gexiv2 libraw librsvg pango poppler sdl2"
36PACKAGECONFIG:class-native = "librsvg" 34PACKAGECONFIG:class-native = "librsvg"
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0004-meson.build-dont-check-for-python3-pygobject-gexiv2-.patch b/meta-gnome/recipes-gimp/gimp/gimp/0004-meson.build-dont-check-for-python3-pygobject-gexiv2-.patch
new file mode 100644
index 0000000000..4eb6f9553d
--- /dev/null
+++ b/meta-gnome/recipes-gimp/gimp/gimp/0004-meson.build-dont-check-for-python3-pygobject-gexiv2-.patch
@@ -0,0 +1,47 @@
1From d00c3c9fb8267f53cf730b8441a7d7f904af5215 Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de>
3Date: Mon, 20 Apr 2026 09:14:50 +0200
4Subject: [PATCH] meson.build: dont check for python3-pygobject gexiv2 support
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9We only provide support for gexiv2 in python3-pygobject for the target, but
10unfortunately this feature is being requested for the native version, which
11would require gexiv2-native to be compilable — something I consider quite
12hard to achieve and maybe also not desirable at all.
13
14Remove the test for this feature, since we know that our target provides it.
15
16Signed-off-by: Markus Volk <f_l_k@t-online.de>
17
18Upstream-Status: Inappropriate [oe-specific]
19---
20 meson.build | 4 ++--
21 1 file changed, 2 insertions(+), 2 deletions(-)
22
23diff --git a/meson.build b/meson.build
24index 4f6f8ce9a4..4509cd2c39 100644
25--- a/meson.build
26+++ b/meson.build
27@@ -1224,7 +1224,7 @@ foreach py : py_candidates
28 '''except (ImportError):''',
29 ''' sys.exit(1)''']),
30 check: false).returncode() == 0
31- if pygobject_found.returncode() == 0 and pygobject_found.stdout().strip().version_compare(pygobject_minver) and pygobject_gexiv2_found
32+ if pygobject_found.returncode() == 0 and pygobject_found.stdout().strip().version_compare(pygobject_minver)
33 break
34 endif
35 endif
36@@ -1235,7 +1235,7 @@ if not python.found() or not python.language_version().version_compare(python3_m
37 endif
38 message('Found Python @0@'.format(python.language_version()))
39
40-if pygobject_found.returncode() != 0 or not pygobject_found.stdout().strip().version_compare(pygobject_minver) or not pygobject_gexiv2_found
41+if pygobject_found.returncode() != 0 or not pygobject_found.stdout().strip().version_compare(pygobject_minver)
42 error('No suitable PyGObject (with GExiv2 submodule) found. Minimum supported version: @0@'.format(pygobject_minver))
43 endif
44 message('Found PyGObject: @0@'.format(pygobject_found.stdout().strip()))
45--
462.53.0
47
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0005-docs-meson.build-disable-gimprc-man-build.patch b/meta-gnome/recipes-gimp/gimp/gimp/0005-docs-meson.build-disable-gimprc-man-build.patch
new file mode 100644
index 0000000000..91e7f92336
--- /dev/null
+++ b/meta-gnome/recipes-gimp/gimp/gimp/0005-docs-meson.build-disable-gimprc-man-build.patch
@@ -0,0 +1,33 @@
1From 47948d14777438ca5e8619a1f9293db28af88305 Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de>
3Date: Mon, 20 Apr 2026 09:24:38 +0200
4Subject: [PATCH] docs/meson.build: disable gimprc man build
5
6This would require a native variant of gimp-console
7
8Signed-off-by: Markus Volk <f_l_k@t-online.de>
9
10Upstream-Status: Inappropriate [oe-specific]
11---
12 docs/meson.build | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/docs/meson.build b/docs/meson.build
16index 70b57b52ef..d36e47dbb5 100644
17--- a/docs/meson.build
18+++ b/docs/meson.build
19@@ -16,9 +16,9 @@ gimprc_man = custom_target('gimprc-' + gimp_app_version + '.5',
20 command: [ gimp_exe, '--no-interface',
21 '--dump-gimprc-manpage' ],
22 capture: true,
23- build_by_default: true,
24+ build_by_default: false,
25 env: gimp_run_env,
26- install: true,
27+ install: false,
28 install_dir: get_option('mandir') / 'man5')
29
30 gimptool_man = configure_file(input : 'gimptool.1.in',
31--
322.53.0
33
diff --git a/meta-gnome/recipes-gimp/gimp/gimp_3.2.0.bb b/meta-gnome/recipes-gimp/gimp/gimp_3.2.4.bb
index d6928498ac..82c68346eb 100644
--- a/meta-gnome/recipes-gimp/gimp/gimp_3.2.0.bb
+++ b/meta-gnome/recipes-gimp/gimp/gimp_3.2.4.bb
@@ -37,6 +37,7 @@ DEPENDS = " \
37 poppler \ 37 poppler \
38 poppler-data \ 38 poppler-data \
39 python3-pygobject-native \ 39 python3-pygobject-native \
40 python3-pycairo-native \
40 tiff \ 41 tiff \
41 xz \ 42 xz \
42 zlib \ 43 zlib \
@@ -62,8 +63,10 @@ SRC_URI = "https://download.gimp.org/gimp/v3.2/${BP}.tar.xz \
62 file://0001-meson.build-dont-check-for-lgi.patch \ 63 file://0001-meson.build-dont-check-for-lgi.patch \
63 file://0002-meson.build-use-relative-path-for-ISO_CODES_LOCATION.patch \ 64 file://0002-meson.build-use-relative-path-for-ISO_CODES_LOCATION.patch \
64 file://0003-meson.build-reproducibility-fix.patch \ 65 file://0003-meson.build-reproducibility-fix.patch \
66 file://0004-meson.build-dont-check-for-python3-pygobject-gexiv2-.patch \
67 file://0005-docs-meson.build-disable-gimprc-man-build.patch \
65" 68"
66SRC_URI[sha256sum] = "2618391416e51be3c693df9ef90e3860ed72ab3d36363ea1f196e30b75b2e083" 69SRC_URI[sha256sum] = "7312bc53e9c6d2d0056ca7b93f1c6b98707946dd934f714c21b8746ecb601588"
67 70
68PACKAGECONFIG[aa] = "-Daa=enabled,-Daa=disabled,aalib" 71PACKAGECONFIG[aa] = "-Daa=enabled,-Daa=disabled,aalib"
69PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib" 72PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib"
@@ -132,7 +135,7 @@ do_install:prepend() {
132 135
133FILES:${PN} += "${datadir}/metainfo" 136FILES:${PN} += "${datadir}/metainfo"
134 137
135RDEPENDS:${PN} = "mypaint-brushes-1.0 glib-networking python3-pygobject" 138RDEPENDS:${PN} = "mypaint-brushes glib-networking python3-pygobject python3-pycairo"
136 139
137CVE_STATUS[CVE-2007-3741] = "not-applicable-platform: This only applies for Mandriva Linux" 140CVE_STATUS[CVE-2007-3741] = "not-applicable-platform: This only applies for Mandriva Linux"
138CVE_STATUS[CVE-2025-8672] = "not-applicable-config: the vulnerability only affects MacOS" 141CVE_STATUS[CVE-2025-8672] = "not-applicable-config: the vulnerability only affects MacOS"
diff --git a/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb b/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb
deleted file mode 100644
index b6b8ff8c1f..0000000000
--- a/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1SUMMARY = "MyPaint brushes"
2LICENSE = "CC0-1.0"
3LIC_FILES_CHKSUM = "file://COPYING;md5=65d3616852dbf7b1a6d4b53b00626032"
4
5inherit autotools allarch
6
7SRC_URI = "git://github.com/mypaint/mypaint-brushes.git;protocol=https;branch=v1.3.x"
8SRCREV = "8a0124ac0675103eae8fa41fad533851768ae1ce"
9PV = "1.3.1"
10
11FILES:${PN} += "${datadir}/mypaint-data"
diff --git a/meta-gnome/recipes-gnome/cheese/cheese_44.1.bb b/meta-gnome/recipes-gnome/cheese/cheese_44.1.bb
index 8e78162991..62073ebd13 100644
--- a/meta-gnome/recipes-gnome/cheese/cheese_44.1.bb
+++ b/meta-gnome/recipes-gnome/cheese/cheese_44.1.bb
@@ -5,7 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a17cb0a873d252440acfdf9b3d0e7fbf"
5 5
6inherit gnomebase gobject-introspection vala itstool gtk-icon-cache gsettings gnome-help gtk-doc 6inherit gnomebase gobject-introspection vala itstool gtk-icon-cache gsettings gnome-help gtk-doc
7 7
8REQUIRED_DISTRO_FEATURES = "opengl" 8# x11 is needed due to libcanberra dependency which does not compile
9# gtk3 support with out it and cheese look for
10# | aarch64-yoe-linux-ld.lld: error: unable to find library -lcanberra-gtk3
11REQUIRED_DISTRO_FEATURES = "opengl x11"
9 12
10SRC_URI += "file://0001-libcheese-Add-GtkWidget-cast-to-avoid-an-incompatibl.patch" 13SRC_URI += "file://0001-libcheese-Add-GtkWidget-cast-to-avoid-an-incompatibl.patch"
11 14
diff --git a/meta-gnome/recipes-gnome/eog/eog_49.1.bb b/meta-gnome/recipes-gnome/eog/eog_49.3.bb
index 202d68700a..d67c3733af 100644
--- a/meta-gnome/recipes-gnome/eog/eog_49.1.bb
+++ b/meta-gnome/recipes-gnome/eog/eog_49.3.bb
@@ -13,7 +13,6 @@ DEPENDS = " \
13 libpeas-1 \ 13 libpeas-1 \
14 libportal \ 14 libportal \
15 libexif \ 15 libexif \
16 lcms \
17" 16"
18 17
19 18
@@ -22,7 +21,11 @@ inherit gnomebase pkgconfig gsettings gobject-introspection gettext mime-xdg fea
22# FIXME: whilst eog uses libpeas <2, g-i is needed. This can be removed when libpeas2 is used. 21# FIXME: whilst eog uses libpeas <2, g-i is needed. This can be removed when libpeas2 is used.
23REQUIRED_DISTRO_FEATURES = "opengl gobject-introspection-data" 22REQUIRED_DISTRO_FEATURES = "opengl gobject-introspection-data"
24 23
25SRC_URI[archive.sha256sum] = "fadd12e14ba9cd2be6989dfbcef40001645b63440ceed8e04867b07587b066dc" 24SRC_URI[archive.sha256sum] = "6b4e69c7a8086ae85d556ca4a24daa665b5622c4097e1ee59564bff4cc963124"
25
26PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11','cms', '', d)}"
27
28PACKAGECONFIG[cms] = "-Dcms=true,-Dcms=false,lcms"
26 29
27GTKDOC_MESON_OPTION = "gtk_doc" 30GTKDOC_MESON_OPTION = "gtk_doc"
28 31
diff --git a/meta-gnome/recipes-gnome/gdm/gdm_49.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_50.0.bb
index 94e256e4f2..858933a4b3 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm_49.2.bb
+++ b/meta-gnome/recipes-gnome/gdm/gdm_50.0.bb
@@ -21,7 +21,7 @@ GIR_MESON_OPTION = ""
21 21
22inherit gnomebase gsettings pkgconfig gobject-introspection gettext systemd useradd itstool gnome-help features_check 22inherit gnomebase gsettings pkgconfig gobject-introspection gettext systemd useradd itstool gnome-help features_check
23 23
24SRC_URI[archive.sha256sum] = "9813631f9f5f0f860ea14a437866e60efc7bed3023b7c3b765cc5de1de597a06" 24SRC_URI[archive.sha256sum] = "646f53d68f2d2d147146ffaeb85047ded8b813dcb1c104d8f0ec36ca609eb5bf"
25 25
26PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" 26PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
27PACKAGECONFIG[plymouth] = "-Dplymouth=enabled,-Dplymouth=disabled,plymouth" 27PACKAGECONFIG[plymouth] = "-Dplymouth=enabled,-Dplymouth=disabled,plymouth"
diff --git a/meta-gnome/recipes-gnome/gedit/gedit_49.0.bb b/meta-gnome/recipes-gnome/gedit/gedit_50.0.bb
index 15b14b2c90..d15ab8665d 100644
--- a/meta-gnome/recipes-gnome/gedit/gedit_49.0.bb
+++ b/meta-gnome/recipes-gnome/gedit/gedit_50.0.bb
@@ -23,8 +23,8 @@ inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc get
23def gnome_verdir(v): 23def gnome_verdir(v):
24 return oe.utils.trim_version(v, 1) 24 return oe.utils.trim_version(v, 1)
25 25
26SRC_URI = "git://gitlab.gnome.org/World/gedit/gedit.git;protocol=https;branch=master;tag=${PV}" 26SRC_URI = "gitsm://gitlab.gnome.org/World/gedit/gedit.git;protocol=https;branch=master;tag=${PV}"
27SRCREV = "684abd8299139e1a3b87446da501ad034e78c840" 27SRCREV = "25d0bf0c3c40b0866fc23ec875f0af6c67f728ef"
28 28
29# gobject-introspection is mandatory and cannot be configured 29# gobject-introspection is mandatory and cannot be configured
30REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" 30REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
diff --git a/meta-gnome/recipes-gnome/gedit/libgedit-gfls_0.3.1.bb b/meta-gnome/recipes-gnome/gedit/libgedit-gfls_0.4.1.bb
index 8b64661733..87006cc564 100644
--- a/meta-gnome/recipes-gnome/gedit/libgedit-gfls_0.3.1.bb
+++ b/meta-gnome/recipes-gnome/gedit/libgedit-gfls_0.4.1.bb
@@ -7,8 +7,8 @@ DEPENDS = "glib-2.0 gtk+3"
7 7
8inherit gobject-introspection features_check gtk-doc gnomebase 8inherit gobject-introspection features_check gtk-doc gnomebase
9 9
10SRC_URI = "git://gitlab.gnome.org/World/gedit/libgedit-gfls.git;branch=main;protocol=https" 10SRC_URI = "git://gitlab.gnome.org/World/gedit/libgedit-gfls.git;branch=main;protocol=https;tag=${PV}"
11SRCREV = "0a0c8dd29ae2f9f4a99cbaaf1628d2352953e0bc" 11SRCREV = "ce4b836dfda4ea3f594b9ded7b60c5cb51ccbc87"
12 12
13ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" 13ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
14 14
diff --git a/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.6.0.bb b/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.6.0.bb
index 119a75b2bb..4939f673bb 100644
--- a/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.6.0.bb
+++ b/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.6.0.bb
@@ -7,7 +7,7 @@ DEPENDS = "glib-2.0 gtk+3 libxml2"
7 7
8inherit gobject-introspection features_check gtk-doc gnomebase 8inherit gobject-introspection features_check gtk-doc gnomebase
9 9
10SRC_URI = "git://gitlab.gnome.org/World/gedit/libgedit-gtksourceview.git;protocol=https;branch=main" 10SRC_URI = "git://gitlab.gnome.org/World/gedit/libgedit-gtksourceview.git;protocol=https;branch=main;tag=${PV}"
11SRCREV = "a7bdc39f9fbc10c49ea7468ac1e5bf77385da0c0" 11SRCREV = "a7bdc39f9fbc10c49ea7468ac1e5bf77385da0c0"
12 12
13ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" 13ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.84.1.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.84.2.bb
index 55bd38c97c..c41fa6e93a 100644
--- a/meta-gnome/recipes-gnome/gjs/gjs_1.84.1.bb
+++ b/meta-gnome/recipes-gnome/gjs/gjs_1.84.2.bb
@@ -7,7 +7,7 @@ DEPENDS = "mozjs-128 cairo"
7 7
8inherit gnomebase gobject-introspection gettext features_check upstream-version-is-even pkgconfig multilib_script 8inherit gnomebase gobject-introspection gettext features_check upstream-version-is-even pkgconfig multilib_script
9 9
10SRC_URI[archive.sha256sum] = "44796b91318dbbe221a13909f00fd872ef92f38c68603e0e3574e46bc6bac32c" 10SRC_URI[archive.sha256sum] = "35142edf345705636300291ec3a7d583f14969ff3fae0ff30f4a95b1e6740166"
11SRC_URI += " \ 11SRC_URI += " \
12 file://0001-Support-cross-builds-a-bit-better.patch \ 12 file://0001-Support-cross-builds-a-bit-better.patch \
13 file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \ 13 file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \
diff --git a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_48.0.bb b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_50.0.bb
index d144cd0639..a898e13418 100644
--- a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_48.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_50.0.bb
@@ -6,7 +6,7 @@ SECTION = "x11/gnome"
6 6
7inherit gnomebase gettext allarch 7inherit gnomebase gettext allarch
8 8
9SRC_URI[archive.sha256sum] = "2d6baa011ee97804c7561f7e1cbd8d4763e30b55b8818dda78f9f75afb8d8d05" 9SRC_URI[archive.sha256sum] = "1acdba7acb4f34c7321febc6273444344fd55fd593611d446de70860183b52b8"
10 10
11FILES:${PN} += " \ 11FILES:${PN} += " \
12 ${datadir}/backgrounds \ 12 ${datadir}/backgrounds \
diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3_3.34.5.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3_3.34.5.bb
index 1ceff5ffcf..8490e3d161 100644
--- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3_3.34.5.bb
+++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3_3.34.5.bb
@@ -34,6 +34,6 @@ do_install:append() {
34FILES:${PN} += "${datadir}/gnome-bluetooth" 34FILES:${PN} += "${datadir}/gnome-bluetooth"
35 35
36# offer alternate bluetooth-sendto 36# offer alternate bluetooth-sendto
37RRECOMMENS:${PN} += "gnome-bluetooth" 37RRECOMMENDS:${PN} += "gnome-bluetooth"
38 38
39RDEPENDS:${PN} += "bluez5" 39RDEPENDS:${PN} += "bluez5"
diff --git a/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_48.0.bb b/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_50.0.bb
index 3aa353748b..e57bdd39f2 100644
--- a/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_48.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_50.0.bb
@@ -22,12 +22,12 @@ DEPENDS = " \
22 22
23RRECOMMENDS:${PN} = "gnuchess" 23RRECOMMENDS:${PN} = "gnuchess"
24 24
25SRC_URI = "git://github.com/GNOME/gnome-chess.git;protocol=https;branch=main" 25SRC_URI = "git://github.com/GNOME/gnome-chess.git;protocol=https;branch=main;tag=${PV}"
26 26
27inherit meson pkgconfig gobject-introspection gtk-icon-cache vala features_check mime-xdg gsettings 27inherit meson pkgconfig gobject-introspection gtk-icon-cache vala features_check mime-xdg gsettings
28 28
29GIR_MESON_OPTION = "" 29GIR_MESON_OPTION = ""
30 30
31SRCREV = "b0bf5288438f74fcb455e1e49f855b4964a2c7cb" 31SRCREV = "079ef83fe6c538be9178b03999724d5f4649bc69"
32 32
33FILES:${PN} += "${datadir}" 33FILES:${PN} += "${datadir}"
diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.55.1.bb b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.58.1.bb
index 8edbd8411d..6b80df7781 100644
--- a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.55.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.58.1.bb
@@ -8,7 +8,7 @@ REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'goabackend',
8 8
9DEPENDS += "gdk-pixbuf dbus glib-2.0 gcr keyutils" 9DEPENDS += "gdk-pixbuf dbus glib-2.0 gcr keyutils"
10 10
11SRC_URI[archive.sha256sum] = "a0b50fb75553c1e360713a827321cd17e2f91a735b8205ba5fd0ff374b26108b" 11SRC_URI[archive.sha256sum] = "9ec1900cc51409c2067c07c828c10be06fe3bf68d2999bb72d7d5ed325ed9bbc"
12 12
13PACKAGECONFIG ?= "goabackend kerberos owncloud google" 13PACKAGECONFIG ?= "goabackend kerberos owncloud google"
14 14
diff --git a/meta-gnome/recipes-gnome/gnome-software/gnome-software/0001-meson.build-dont-look-for-flatpak-http_backend-varia.patch b/meta-gnome/recipes-gnome/gnome-software/gnome-software/0001-meson.build-dont-look-for-flatpak-http_backend-varia.patch
deleted file mode 100644
index 2296b7acd2..0000000000
--- a/meta-gnome/recipes-gnome/gnome-software/gnome-software/0001-meson.build-dont-look-for-flatpak-http_backend-varia.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 4588a3d34f574619c6f3a4290d53e2ac063ab56a Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de>
3Date: Thu, 25 Dec 2025 20:04:49 +0100
4Subject: [PATCH] meson.build: dont look for flatpak http_backend variable
5
6flatpak 1.17.1 release dropped libsoup2 support:
7[https://github.com/flatpak/flatpak/blob/c324778b0720cb2d01c217fdc70358e232c38b4d/NEWS#L20]
8
9* Drop libsoup2 support in favor of libcurl. The `http_backend` build option has
10 been dropped as well. (#6395)
11
12gnome-software still searches for the http_backend variable and fails:
13 ../sources/gnome-software-49.1/meson.build:218:32: ERROR: Could not get pkg-config variable and no default provided for <PkgConfigDependency flatpak: True ['>= 1.14.1']>
14
15Signed-off-by: Markus Volk <f_l_k@t-online.de>
16
17Upstream-Status: Inappropriate
18---
19 meson.build | 20 +-------------------
20 1 file changed, 1 insertion(+), 19 deletions(-)
21
22diff --git a/meson.build b/meson.build
23index 3704e2abc..7e0496a22 100644
24--- a/meson.build
25+++ b/meson.build
26@@ -212,26 +212,8 @@ if get_option('fwupd')
27 endif
28
29 if get_option('flatpak')
30- flatpak = dependency('flatpak', version : '>= 1.14.1')
31+ flatpak = dependency('flatpak', version : '>= 1.17.1')
32 ostree = dependency('ostree-1')
33-
34- flatpak_httpbackend = flatpak.get_variable('httpbackend')
35- if flatpak_httpbackend == 'soup'
36- flatpak_soupapiversion = flatpak.get_variable('soupapiversion', default_value: '2')
37- if flatpak_soupapiversion.version_compare('< 3')
38- error('''Flatpak library has been built with 'libsoup2' http backend, which conflicts with 'libsoup3' used by gnome-software.
39-
40-You can either:
41-
42-1. Build gnome-software without flatpak support (with -Dflatpak=false) or
43-2. Rebuild flatpak library with http backend other than 'libsoup2'.''')
44- else
45- flatpak_summary = '@0@ (@1@)'.format(flatpak_httpbackend, flatpak_soupapiversion)
46- endif
47- else
48- flatpak_summary = flatpak_httpbackend
49- endif
50- summary('Flatpak http backend', '@0@'.format(flatpak_summary), section : 'Misc')
51 endif
52
53 if get_option('malcontent')
54--
552.52.0
56
diff --git a/meta-gnome/recipes-gnome/gnome-software/gnome-software_49.2.bb b/meta-gnome/recipes-gnome/gnome-software/gnome-software_50.0.bb
index 5c8be9bfb1..0cbf238181 100644
--- a/meta-gnome/recipes-gnome/gnome-software/gnome-software_49.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-software/gnome-software_50.0.bb
@@ -28,8 +28,7 @@ RDEPENDS:${PN} = "iso-codes"
28 28
29EXTRA_OEMESON += "-Dtests=false" 29EXTRA_OEMESON += "-Dtests=false"
30 30
31SRC_URI += "file://0001-meson.build-dont-look-for-flatpak-http_backend-varia.patch" 31SRC_URI[archive.sha256sum] = "3515e2015f235b6abb7a342806008acb1f184c29d9c4ced3581f8ed4c1f1c241"
32SRC_URI[archive.sha256sum] = "b610b6932a8d666432bc58d6c78c4568cd63d442ae736db8be2c4ca01bbc946c"
33 32
34PACKAGECONFIG ?= "flatpak" 33PACKAGECONFIG ?= "flatpak"
35PACKAGECONFIG[flatpak] = "-Dflatpak=true,-Dflatpak=false,flatpak ostree" 34PACKAGECONFIG[flatpak] = "-Dflatpak=true,-Dflatpak=false,flatpak ostree"
diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_49.1.bb b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_50.0.bb
index e0de81db32..1ae11dda3b 100644
--- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_49.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_50.0.bb
@@ -23,7 +23,7 @@ inherit gnomebase gsettings gnome-help itstool gtk-icon-cache features_check get
23ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" 23ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
24REQUIRED_DISTRO_FEATURES = "polkit" 24REQUIRED_DISTRO_FEATURES = "polkit"
25 25
26SRC_URI[archive.sha256sum] = "915b6a321ada12eba7bf578c20c9fe5e41f55d532847cbd124bbddaaec11d70f" 26SRC_URI[archive.sha256sum] = "a4138aa754b4584c46de91fad1d685e27b12bc2457de761863b6be02d84c4862"
27 27
28PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" 28PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
29PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" 29PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd"
diff --git a/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_49.1.bb b/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_50.0.bb
index a8dd3d5cab..81224f7718 100644
--- a/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_49.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_50.0.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] = "f0448f247bb5979a50c60222c44c4511880ad474e25495765e5ed2246e54dbb1" 21SRC_URI[archive.sha256sum] = "9dc299da4daa085423b5d48db59f0021ad55e74143a5cb8ab2e5ffe17967f45b"
22 22
23FILES:${PN} += " \ 23FILES:${PN} += " \
24 ${datadir}/metainfo \ 24 ${datadir}/metainfo \
diff --git a/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.7.bb b/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.10.bb
index 8e82b86285..58aefbff2e 100644
--- a/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.7.bb
+++ b/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.10.bb
@@ -6,6 +6,8 @@ DEPENDS = " \
6 glib-2.0 \ 6 glib-2.0 \
7 glib-2.0-native \ 7 glib-2.0-native \
8 bison-native \ 8 bison-native \
9 desktop-file-utils-native \
10 exiv2 \
9 gtk+3 \ 11 gtk+3 \
10 gsettings-desktop-schemas \ 12 gsettings-desktop-schemas \
11 zlib \ 13 zlib \
@@ -13,21 +15,16 @@ DEPENDS = " \
13 json-glib \ 15 json-glib \
14" 16"
15 17
16PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'colord', '', d)} exiv2 gstreamer lcms libjxl libraw librsvg libwebp" 18PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'colord', '', d)} gstreamer lcms libjxl libraw librsvg libwebp"
17PACKAGECONFIG[gstreamer] = "-Dgstreamer=true,-Dgstreamer=false,gstreamer1.0 gstreamer1.0-plugins-base" 19PACKAGECONFIG[gstreamer] = "-Dgstreamer=true,-Dgstreamer=false,gstreamer1.0 gstreamer1.0-plugins-base"
18PACKAGECONFIG[libwebp] = "-Dlibwebp=true,-Dlibwebp=false,libwebp" 20PACKAGECONFIG[libwebp] = "-Dlibwebp=true,-Dlibwebp=false,libwebp"
19PACKAGECONFIG[libjxl] = "-Dlibjxl=true,-Dlibjxl=false,libjxl" 21PACKAGECONFIG[libjxl] = "-Dlibjxl=true,-Dlibjxl=false,libjxl"
20PACKAGECONFIG[lcms] = "-Dlcms2=true,-Dlcms2=false,lcms" 22PACKAGECONFIG[lcms] = "-Dlcms2=true,-Dlcms2=false,lcms"
21PACKAGECONFIG[colord] = "-Dcolord=true,-Dcolord=false,colord" 23PACKAGECONFIG[colord] = "-Dcolord=true,-Dcolord=false,colord"
22PACKAGECONFIG[exiv2] = "-Dexiv2=true,-Dexiv2=false,exiv2"
23PACKAGECONFIG[librsvg] = "-Dlibrsvg=true,-Dlibrsvg=false,librsvg" 24PACKAGECONFIG[librsvg] = "-Dlibrsvg=true,-Dlibrsvg=false,librsvg"
24PACKAGECONFIG[libraw] = "-Dlibraw=true,-Dlibraw=false,libraw" 25PACKAGECONFIG[libraw] = "-Dlibraw=true,-Dlibraw=false,libraw"
25 26
26# webservices would require libsecret and webkitgtk3 built with deprecated libsoup2 27inherit gnomebase gnome-help gsettings itstool gtk-icon-cache mime-xdg
27EXTRA_OEMESON += "-Dwebservices=false -Dlibsecret=false" 28SRC_URI[archive.sha256sum] = "3222344653cd6fb5d7981b73951ae3d90c414f74220a8b1c8665b25574284c75"
28
29inherit gnomebase gnome-help gsettings itstool mime-xdg
30
31SRC_URI[archive.sha256sum] = "ee12d24cf231010241f758d6c95b9d53a7381278fa76b6a518b3d09b371efaec"
32 29
33FILES:${PN} += "${datadir}/metainfo" 30FILES:${PN} += "${datadir}/metainfo"
diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.58.2.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.60.0.bb
index e3b90950d6..2fda7cff75 100644
--- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.58.2.bb
+++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.60.0.bb
@@ -18,12 +18,13 @@ DEPENDS += "\
18RDEPENDS:${PN} += "gsettings-desktop-schemas" 18RDEPENDS:${PN} += "gsettings-desktop-schemas"
19 19
20SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" 20SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive"
21SRC_URI[archive.sha256sum] = "ad9d5bf0b45caf232520df0adee51eb650200b0370680f80a350ead9d1d61ddf" 21SRC_URI[archive.sha256sum] = "648273f069e92c7e3c013b92148e82c901f08044e2b3b14c6cfbd52269f6b646"
22 22
23ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" 23ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
24 24
25EXTRA_OEMESON = " \ 25EXTRA_OEMESON = " \
26 -Dbluray=false \ 26 -Dbluray=false \
27 -Dgoogle=false \
27" 28"
28 29
29PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash" 30PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash"
@@ -60,7 +61,6 @@ PACKAGECONFIG[dnssd] = "-Ddnssd=true, -Ddnssd=false, avahi"
60PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr" 61PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr"
61PACKAGECONFIG[gcrypt] = "-Dgcrypt=true, -Dgcrypt=false, libgcrypt" 62PACKAGECONFIG[gcrypt] = "-Dgcrypt=true, -Dgcrypt=false, libgcrypt"
62PACKAGECONFIG[goa] = "-Dgoa=true, -Dgoa=false, gnome-online-accounts" 63PACKAGECONFIG[goa] = "-Dgoa=true, -Dgoa=false, gnome-online-accounts"
63PACKAGECONFIG[google] = "-Dgoogle=true, -Dgoogle=false, libgdata"
64PACKAGECONFIG[http] = "-Dhttp=true, -Dhttp=false, libsoup-3.0" 64PACKAGECONFIG[http] = "-Dhttp=true, -Dhttp=false, libsoup-3.0"
65PACKAGECONFIG[libmtp] = "-Dmtp=true, -Dmtp=false, libmtp" 65PACKAGECONFIG[libmtp] = "-Dmtp=true, -Dmtp=false, libmtp"
66PACKAGECONFIG[logind] = "-Dlogind=true, -Dlogind=false, systemd" 66PACKAGECONFIG[logind] = "-Dlogind=true, -Dlogind=false, systemd"
diff --git a/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.21.bb b/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.21.bb
index 5aaf680e8c..af2e31a04d 100644
--- a/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.21.bb
+++ b/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.21.bb
@@ -8,7 +8,7 @@ inherit features_check gobject-introspection meson pkgconfig vala
8REQUIRED_DISTRO_FEATURES = "opengl" 8REQUIRED_DISTRO_FEATURES = "opengl"
9 9
10SRCREV = "941560af497148588783db991e8135f52a82574d" 10SRCREV = "941560af497148588783db991e8135f52a82574d"
11SRC_URI = "git://github.com/gnome/libchamplain.git;branch=master;protocol=https" 11SRC_URI = "git://github.com/gnome/libchamplain.git;branch=master;protocol=https;tag=${PV}"
12 12
13# Compilation fails on 32-bit targets, due to GTimeVal usage, which assumes that 13# Compilation fails on 32-bit targets, due to GTimeVal usage, which assumes that
14# time_t is always long, which is not always the case. 14# time_t is always long, which is not always the case.
diff --git a/meta-gnome/recipes-gnome/libgdata/libgdata/0001-Drop-usage-of-deprecated-GTimeVal.patch b/meta-gnome/recipes-gnome/libgdata/libgdata/0001-Drop-usage-of-deprecated-GTimeVal.patch
deleted file mode 100644
index 6fb52d6d52..0000000000
--- a/meta-gnome/recipes-gnome/libgdata/libgdata/0001-Drop-usage-of-deprecated-GTimeVal.patch
+++ /dev/null
@@ -1,1134 +0,0 @@
1From ef8722baa444958601bfddfee3a977ccf4f7c02c Mon Sep 17 00:00:00 2001
2From: Daniel Kolesa <dkolesa@igalia.com>
3Date: Tue, 16 Mar 2021 17:22:08 +0100
4Subject: [PATCH] drop usage of deprecated GTimeVal
5
6Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libgdata/-/commit/ef8722baa444958601bfddfee3a977ccf4f7c02c]
7Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
8
9---
10 demos/calendar/calendar-cli.c | 90 ++++++++++++-------
11 demos/tasks/tasks-cli.c | 31 ++++---
12 demos/youtube/youtube-cli.c | 9 +-
13 gdata/gdata-access-rule.c | 4 +-
14 gdata/gdata-batch-operation.c | 8 +-
15 gdata/gdata-oauth1-authorizer.c | 6 +-
16 gdata/gdata-parser.c | 48 +++++-----
17 gdata/gdata-service.c | 5 +-
18 .../services/calendar/gdata-calendar-event.c | 18 ++--
19 .../services/calendar/gdata-calendar-query.c | 6 +-
20 .../contacts/gdata-contacts-contact.c | 4 +-
21 .../services/contacts/gdata-contacts-group.c | 4 +-
22 .../documents/gdata-documents-query.c | 8 +-
23 .../picasaweb/gdata-picasaweb-album.c | 8 +-
24 .../services/picasaweb/gdata-picasaweb-file.c | 8 +-
25 gdata/services/youtube/gdata-youtube-query.c | 18 ++--
26 .../services/youtube/gdata-youtube-service.c | 10 ++-
27 gdata/tests/calendar.c | 60 +++++++------
28 gdata/tests/contacts.c | 22 +++--
29 gdata/tests/general.c | 7 +-
30 gdata/tests/perf.c | 15 ++--
31 gdata/tests/picasaweb.c | 14 +--
32 gdata/tests/youtube.c | 14 +--
33 23 files changed, 231 insertions(+), 186 deletions(-)
34
35diff --git a/demos/calendar/calendar-cli.c b/demos/calendar/calendar-cli.c
36index a1d84f67..4f601f48 100644
37--- a/demos/calendar/calendar-cli.c
38+++ b/demos/calendar/calendar-cli.c
39@@ -38,13 +38,13 @@ print_usage (char *argv[])
40 return -1;
41 }
42
43-/* Convert a GTimeVal to an ISO 8601 date string (without a time component). */
44+/* Convert a unix time to an ISO 8601 date string (without a time component). */
45 static gchar *
46-tv_to_iso8601_date (GTimeVal *tv)
47+tv_to_iso8601_date (gint64 tv)
48 {
49 struct tm *tm;
50
51- tm = gmtime (&tv->tv_sec);
52+ tm = gmtime (&tv);
53
54 return g_strdup_printf ("%04d-%02d-%02d",
55 tm->tm_year + 1900,
56@@ -81,8 +81,9 @@ print_event (GDataCalendarEvent *event)
57 {
58 const gchar *title, *id, *description, *status, *visibility;
59 const gchar *transparency, *uid;
60- GTimeVal date_published_tv = { 0, };
61- GTimeVal date_edited_tv = { 0, };
62+ GDateTime *tmp;
63+ gint64 date_published_tv;
64+ gint64 date_edited_tv;
65 gchar *date_published = NULL; /* owned */
66 gchar *date_edited = NULL; /* owned */
67 guint sequence;
68@@ -95,10 +96,14 @@ print_event (GDataCalendarEvent *event)
69 title = gdata_entry_get_title (GDATA_ENTRY (event));
70 id = gdata_entry_get_id (GDATA_ENTRY (event));
71 description = gdata_entry_get_content (GDATA_ENTRY (event));
72- date_published_tv.tv_sec = gdata_entry_get_published (GDATA_ENTRY (event));
73- date_published = g_time_val_to_iso8601 (&date_published_tv);
74- date_edited_tv.tv_sec = gdata_calendar_event_get_edited (event);
75- date_edited = g_time_val_to_iso8601 (&date_edited_tv);
76+ date_published_tv = gdata_entry_get_published (GDATA_ENTRY (event));
77+ tmp = g_date_time_new_from_unix_utc (date_published_tv);
78+ date_published = g_date_time_format_iso8601 (tmp);
79+ g_date_time_unref (tmp);
80+ date_edited_tv = gdata_calendar_event_get_edited (event);
81+ tmp = g_date_time_new_from_unix_utc (date_edited_tv);
82+ date_edited = g_date_time_format_iso8601 (tmp);
83+ g_date_time_unref (tmp);
84 status = gdata_calendar_event_get_status (event);
85 visibility = gdata_calendar_event_get_visibility (event);
86 transparency = gdata_calendar_event_get_transparency (event);
87@@ -155,20 +160,25 @@ print_event (GDataCalendarEvent *event)
88
89 for (; times != NULL; times = times->next) {
90 GDataGDWhen *when;
91- GTimeVal start_time = { 0, }, end_time = { 0, };
92+ gint64 start_time, end_time;
93 gchar *start = NULL, *end = NULL; /* owned */
94
95 when = GDATA_GD_WHEN (times->data);
96
97- start_time.tv_sec = gdata_gd_when_get_start_time (when);
98- end_time.tv_sec = gdata_gd_when_get_end_time (when);
99+ start_time = gdata_gd_when_get_start_time (when);
100+ end_time = gdata_gd_when_get_end_time (when);
101
102 if (gdata_gd_when_is_date (when)) {
103- start = tv_to_iso8601_date (&start_time);
104- end = tv_to_iso8601_date (&end_time);
105+ start = tv_to_iso8601_date (start_time);
106+ end = tv_to_iso8601_date (end_time);
107 } else {
108- start = g_time_val_to_iso8601 (&start_time);
109- end = g_time_val_to_iso8601 (&end_time);
110+ GDateTime *tmp;
111+ tmp = g_date_time_new_from_unix_utc (start_time);
112+ start = g_date_time_format_iso8601 (tmp);
113+ g_date_time_unref (tmp);
114+ tmp = g_date_time_new_from_unix_utc (end_time);
115+ end = g_date_time_format_iso8601 (tmp);
116+ g_date_time_unref (tmp);
117 }
118
119 g_print (" • %s to %s (%s)\n",
120@@ -416,8 +426,7 @@ command_insert_event (int argc, char *argv[])
121 GDataAuthorizer *authorizer = NULL;
122 GDataGDWhen *when = NULL;
123 gboolean is_date;
124- gchar *start_with_time = NULL, *end_with_time = NULL;
125- GTimeVal start_tv = { 0, }, end_tv = { 0, };
126+ GDateTime *start_tv = NULL, *end_tv = NULL;
127 gint i;
128
129 if (argc < 7) {
130@@ -454,25 +463,38 @@ command_insert_event (int argc, char *argv[])
131 event = gdata_calendar_event_new (NULL);
132 gdata_entry_set_title (GDATA_ENTRY (event), title);
133
134- start_with_time = g_strconcat (start, "T00:00:00Z", NULL);
135- end_with_time = g_strconcat (end, "T00:00:00Z", NULL);
136-
137- if (g_time_val_from_iso8601 (start, &start_tv) &&
138- g_time_val_from_iso8601 (end, &end_tv)) {
139+ start_tv = g_date_time_new_from_iso8601 (start, NULL);
140+ end_tv = g_date_time_new_from_iso8601 (end, NULL);
141+ if (start_tv && end_tv) {
142 /* Includes time. */
143 is_date = FALSE;
144- } else if (g_time_val_from_iso8601 (start_with_time, &start_tv) &&
145- g_time_val_from_iso8601 (end_with_time, &end_tv)) {
146- /* Does not include time. */
147- is_date = TRUE;
148 } else {
149- g_printerr ("%s: Could not parse start time ‘%s’ and end time "
150- "‘%s’ as ISO 8601.\n", argv[0], start, end);
151- retval = 1;
152- goto done;
153+ gchar *start_with_time, *end_with_time;
154+
155+ g_clear_pointer (&start_tv, g_date_time_unref);
156+ g_clear_pointer (&end_tv, g_date_time_unref);
157+
158+ start_with_time = g_strconcat (start, "T00:00:00Z", NULL);
159+ end_with_time = g_strconcat (end, "T00:00:00Z", NULL);
160+
161+ start_tv = g_date_time_new_from_iso8601 (start_with_time, NULL);
162+ end_tv = g_date_time_new_from_iso8601 (end_with_time, NULL);
163+
164+ g_free (start_with_time);
165+ g_free (end_with_time);
166+
167+ if (start_tv && end_tv) {
168+ /* Does not include time. */
169+ is_date = TRUE;
170+ } else {
171+ g_printerr ("%s: Could not parse start time ‘%s’ and end time "
172+ "‘%s’ as ISO 8601.\n", argv[0], start, end);
173+ retval = 1;
174+ goto done;
175+ }
176 }
177
178- when = gdata_gd_when_new (start_tv.tv_sec, end_tv.tv_sec, is_date);
179+ when = gdata_gd_when_new (g_date_time_to_unix (start_tv), g_date_time_to_unix (end_tv), is_date);
180 gdata_calendar_event_add_time (event, when);
181 g_object_unref (when);
182
183@@ -507,8 +529,8 @@ command_insert_event (int argc, char *argv[])
184 print_event (inserted_event);
185
186 done:
187- g_free (start_with_time);
188- g_free (end_with_time);
189+ g_clear_pointer (&start_tv, g_date_time_unref);
190+ g_clear_pointer (&end_tv, g_date_time_unref);
191 g_clear_object (&inserted_event);
192 g_clear_object (&event);
193 g_clear_object (&authorizer);
194diff --git a/demos/tasks/tasks-cli.c b/demos/tasks/tasks-cli.c
195index c795761a..ef4ae900 100644
196--- a/demos/tasks/tasks-cli.c
197+++ b/demos/tasks/tasks-cli.c
198@@ -67,35 +67,42 @@ print_task (GDataTasksTask *task)
199 {
200 const gchar *title, *id, *description, *parent_id, *position, *notes;
201 const gchar *status;
202- GTimeVal date_published_tv = { 0, };
203+ GDateTime *tmp;
204+ gint64 date_published_tv;
205 gchar *date_published = NULL; /* owned */
206- GTimeVal due_tv = { 0, };
207+ gint64 due_tv;
208 gchar *due = NULL; /* owned */
209- GTimeVal completed_tv = { 0, };
210+ gint64 completed_tv;
211 gchar *completed = NULL; /* owned */
212 gboolean is_deleted, is_hidden;
213
214 title = gdata_entry_get_title (GDATA_ENTRY (task));
215 id = gdata_entry_get_id (GDATA_ENTRY (task));
216 description = gdata_entry_get_content (GDATA_ENTRY (task));
217- date_published_tv.tv_sec = gdata_entry_get_published (GDATA_ENTRY (task));
218- date_published = g_time_val_to_iso8601 (&date_published_tv);
219+ date_published_tv = gdata_entry_get_published (GDATA_ENTRY (task));
220+ tmp = g_date_time_new_from_unix_utc (date_published_tv);
221+ date_published = g_date_time_format_iso8601 (tmp);
222+ g_date_time_unref (tmp);
223 parent_id = gdata_tasks_task_get_parent (task);
224 position = gdata_tasks_task_get_position (task);
225 notes = gdata_tasks_task_get_notes (task);
226 status = gdata_tasks_task_get_status (task);
227- due_tv.tv_sec = gdata_tasks_task_get_due (task);
228- due = g_time_val_to_iso8601 (&due_tv);
229- completed_tv.tv_sec = gdata_tasks_task_get_completed (task);
230- completed = g_time_val_to_iso8601 (&completed_tv);
231+ due_tv = gdata_tasks_task_get_due (task);
232+ tmp = g_date_time_new_from_unix_utc (due_tv);
233+ due = g_date_time_format_iso8601 (tmp);
234+ g_date_time_unref (tmp);
235+ completed_tv = gdata_tasks_task_get_completed (task);
236+ tmp = g_date_time_new_from_unix_utc (completed_tv);
237+ completed = g_date_time_format_iso8601 (tmp);
238+ g_date_time_unref (tmp);
239 is_deleted = gdata_tasks_task_is_deleted (task);
240 is_hidden = gdata_tasks_task_is_hidden (task);
241
242 g_print ("%s — %s\n", id, title);
243- g_print (" Published: %s\n", date_published_tv.tv_sec != 0 ? date_published : "unknown");
244+ g_print (" Published: %s\n", date_published_tv != 0 ? date_published : "unknown");
245 g_print (" Status: %s\n", format_status (status));
246- g_print (" Due: %s\n", due_tv.tv_sec != 0 ? due : "not set");
247- g_print (" Completed: %s\n", completed_tv.tv_sec != 0 ? completed : "not yet");
248+ g_print (" Due: %s\n", due_tv != 0 ? due : "not set");
249+ g_print (" Completed: %s\n", completed_tv != 0 ? completed : "not yet");
250 g_print (" Deleted? %s\n", is_deleted ? "Yes" : "No");
251 g_print (" Hidden? %s\n", is_hidden ? "Yes" : "No");
252 g_print (" Position: %s\n", position);
253diff --git a/demos/youtube/youtube-cli.c b/demos/youtube/youtube-cli.c
254index 37ff4afc..e3e0e3dc 100644
255--- a/demos/youtube/youtube-cli.c
256+++ b/demos/youtube/youtube-cli.c
257@@ -46,7 +46,8 @@ print_video (GDataYouTubeVideo *video)
258 {
259 const gchar *title, *player_uri, *id, *description;
260 GList/*<unowned GDataMediaThumbnail>*/ *thumbnails;
261- GTimeVal date_published_tv = { 0, };
262+ GDateTime *tmp;
263+ gint64 date_published_tv;
264 gchar *date_published = NULL; /* owned */
265 guint duration; /* seconds */
266 guint rating_min = 0, rating_max = 0, rating_count = 0;
267@@ -57,8 +58,10 @@ print_video (GDataYouTubeVideo *video)
268 id = gdata_entry_get_id (GDATA_ENTRY (video));
269 description = gdata_youtube_video_get_description (video);
270 thumbnails = gdata_youtube_video_get_thumbnails (video);
271- date_published_tv.tv_sec = gdata_entry_get_published (GDATA_ENTRY (video));
272- date_published = g_time_val_to_iso8601 (&date_published_tv);
273+ date_published_tv = gdata_entry_get_published (GDATA_ENTRY (video));
274+ tmp = g_date_time_new_from_unix_utc (date_published_tv);
275+ date_published = g_date_time_format_iso8601 (tmp);
276+ g_date_time_unref (tmp);
277 duration = gdata_youtube_video_get_duration (video);
278 gdata_youtube_video_get_rating (video, &rating_min, &rating_max,
279 &rating_count, &rating_average);
280diff --git a/gdata/gdata-access-rule.c b/gdata/gdata-access-rule.c
281index 9fd1ce95..0064623f 100644
282--- a/gdata/gdata-access-rule.c
283+++ b/gdata/gdata-access-rule.c
284@@ -257,12 +257,10 @@ gdata_access_rule_constructor (GType type, guint n_construct_params, GObjectCons
285 /* We can't create these in init, or they would collide with the group and control created when parsing the XML */
286 if (_gdata_parsable_is_constructed_from_xml (GDATA_PARSABLE (object)) == FALSE) {
287 GDataAccessRulePrivate *priv = GDATA_ACCESS_RULE (object)->priv;
288- GTimeVal time_val;
289
290 /* Set the edited property to the current time (creation time). We don't do this in *_init() since that would cause
291 * setting it from parse_xml() to fail (duplicate element). */
292- g_get_current_time (&time_val);
293- priv->edited = time_val.tv_sec;
294+ priv->edited = g_get_real_time () / G_USEC_PER_SEC;
295
296 /* Set up the role and scope type */
297 priv->role = g_strdup (GDATA_ACCESS_ROLE_NONE);
298diff --git a/gdata/gdata-batch-operation.c b/gdata/gdata-batch-operation.c
299index f78801ed..212fcb0b 100644
300--- a/gdata/gdata-batch-operation.c
301+++ b/gdata/gdata-batch-operation.c
302@@ -598,7 +598,7 @@ gdata_batch_operation_run (GDataBatchOperation *self, GCancellable *cancellable,
303 GDataBatchOperationPrivate *priv = self->priv;
304 SoupMessage *message;
305 GDataFeed *feed;
306- GTimeVal updated;
307+ gint64 updated;
308 gchar *upload_data;
309 guint status;
310 GHashTableIter iter;
311@@ -638,9 +638,9 @@ gdata_batch_operation_run (GDataBatchOperation *self, GCancellable *cancellable,
312 message = _gdata_service_build_message (priv->service, priv->authorization_domain, SOUP_METHOD_POST, priv->feed_uri, NULL, TRUE);
313
314 /* Build the request */
315- g_get_current_time (&updated);
316+ updated = g_get_real_time () / G_USEC_PER_SEC;
317 feed = _gdata_feed_new (GDATA_TYPE_FEED, "Batch operation feed",
318- "batch1", updated.tv_sec);
319+ "batch1", updated);
320
321 g_hash_table_iter_init (&iter, priv->operations);
322 while (g_hash_table_iter_next (&iter, &op_id, (gpointer*) &op) == TRUE) {
323@@ -658,7 +658,7 @@ gdata_batch_operation_run (GDataBatchOperation *self, GCancellable *cancellable,
324 g_free (entry_uri);
325
326 gdata_entry_set_title (entry, "Batch operation query");
327- _gdata_entry_set_updated (entry, updated.tv_sec);
328+ _gdata_entry_set_updated (entry, updated);
329
330 _gdata_entry_set_batch_data (entry, op->id, op->type);
331 _gdata_feed_add_entry (feed, entry);
332diff --git a/gdata/gdata-oauth1-authorizer.c b/gdata/gdata-oauth1-authorizer.c
333index 7b857ac0..6d5fd5ec 100644
334--- a/gdata/gdata-oauth1-authorizer.c
335+++ b/gdata/gdata-oauth1-authorizer.c
336@@ -471,7 +471,7 @@ sign_message (GDataOAuth1Authorizer *self, SoupMessage *message, const gchar *to
337 gchar *uri, *signature, *timestamp;
338 char *nonce;
339 gboolean is_first = TRUE;
340- GTimeVal time_val;
341+ gint64 time_val;
342 guchar signature_buf[HMAC_SHA1_LEN];
343 gsize signature_buf_len;
344 GHmac *signature_hmac;
345@@ -494,8 +494,8 @@ sign_message (GDataOAuth1Authorizer *self, SoupMessage *message, const gchar *to
346
347 /* Add various standard parameters to the list (note: this modifies the hash table belonging to the caller) */
348 nonce = oauth_gen_nonce ();
349- g_get_current_time (&time_val);
350- timestamp = g_strdup_printf ("%li", time_val.tv_sec);
351+ time_val = g_get_real_time () / G_USEC_PER_SEC;
352+ timestamp = g_strdup_printf ("%li", time_val);
353
354 if (parameters == NULL) {
355 parameters = g_hash_table_new (g_str_hash, g_str_equal);
356diff --git a/gdata/gdata-parser.c b/gdata/gdata-parser.c
357index c1cfe00d..d6ab92e2 100644
358--- a/gdata/gdata-parser.c
359+++ b/gdata/gdata-parser.c
360@@ -207,21 +207,22 @@ gboolean
361 gdata_parser_int64_from_date (const gchar *date, gint64 *_time)
362 {
363 gchar *iso8601_date;
364- gboolean success;
365- GTimeVal time_val;
366+ g_autoptr(GDateTime) time_val = NULL;
367
368 if (strlen (date) != 10 && strlen (date) != 8)
369 return FALSE;
370
371 /* Note: This doesn't need translating, as it's outputting an ISO 8601 time string */
372 iso8601_date = g_strdup_printf ("%sT00:00:00Z", date);
373- success = g_time_val_from_iso8601 (iso8601_date, &time_val);
374+ time_val = g_date_time_new_from_iso8601 (iso8601_date, NULL);
375 g_free (iso8601_date);
376
377- if (success == TRUE)
378- *_time = time_val.tv_sec;
379+ if (time_val) {
380+ *_time = g_date_time_to_unix (time_val);
381+ return TRUE;
382+ }
383
384- return success;
385+ return FALSE;
386 }
387
388 gchar *
389@@ -240,21 +241,24 @@ gdata_parser_date_from_int64 (gint64 _time)
390 gchar *
391 gdata_parser_int64_to_iso8601 (gint64 _time)
392 {
393- GTimeVal time_val;
394+ g_autoptr(GDateTime) time_val = NULL;
395+
396+ time_val = g_date_time_new_from_unix_utc (_time);
397
398- time_val.tv_sec = _time;
399- time_val.tv_usec = 0;
400+ if (!time_val)
401+ return NULL;
402
403- return g_time_val_to_iso8601 (&time_val);
404+ return g_date_time_format_iso8601 (time_val);
405 }
406
407 gboolean
408 gdata_parser_int64_from_iso8601 (const gchar *date, gint64 *_time)
409 {
410- GTimeVal time_val;
411+ g_autoptr(GDateTime) time_val = NULL;
412
413- if (g_time_val_from_iso8601 (date, &time_val) == TRUE) {
414- *_time = time_val.tv_sec;
415+ time_val = g_date_time_new_from_iso8601 (date, NULL);
416+ if (time_val) {
417+ *_time = g_date_time_to_unix (time_val);
418 return TRUE;
419 }
420
421@@ -479,7 +483,7 @@ gdata_parser_int64_time_from_element (xmlNode *element, const gchar *element_nam
422 gint64 *output, gboolean *success, GError **error)
423 {
424 xmlChar *text;
425- GTimeVal time_val;
426+ g_autoptr(GDateTime) time_val = NULL;
427
428 /* Check it's the right element */
429 if (xmlStrcmp (element->name, (xmlChar*) element_name) != 0)
430@@ -499,14 +503,15 @@ gdata_parser_int64_time_from_element (xmlNode *element, const gchar *element_nam
431 return TRUE;
432 }
433
434- /* Attempt to parse the string as a GTimeVal */
435- if (g_time_val_from_iso8601 ((gchar*) text, &time_val) == FALSE) {
436+ /* Attempt to parse the string as a GDateTune */
437+ time_val = g_date_time_new_from_iso8601 ((gchar *) text, NULL);
438+ if (!time_val) {
439 *success = gdata_parser_error_not_iso8601_format (element, (gchar*) text, error);
440 xmlFree (text);
441 return TRUE;
442 }
443
444- *output = time_val.tv_sec;
445+ *output = g_date_time_to_unix (time_val);
446
447 /* Success! */
448 xmlFree (text);
449@@ -911,7 +916,7 @@ gdata_parser_int64_time_from_json_member (JsonReader *reader, const gchar *membe
450 gint64 *output, gboolean *success, GError **error)
451 {
452 const gchar *text;
453- GTimeVal time_val;
454+ g_autoptr(GDateTime) time_val = NULL;
455 const GError *child_error = NULL;
456
457 /* Check if there's such element */
458@@ -935,14 +940,15 @@ gdata_parser_int64_time_from_json_member (JsonReader *reader, const gchar *membe
459 return TRUE;
460 }
461
462- /* Attempt to parse the string as a GTimeVal */
463- if (g_time_val_from_iso8601 ((gchar*) text, &time_val) == FALSE) {
464+ /* Attempt to parse the string as a GDateTime */
465+ time_val = g_date_time_new_from_iso8601 (text, NULL);
466+ if (!time_val) {
467 *success = gdata_parser_error_not_iso8601_format_json (reader, text, error);
468 return TRUE;
469 }
470
471 /* Success! */
472- *output = time_val.tv_sec;
473+ *output = g_date_time_to_unix (time_val);
474 *success = TRUE;
475
476 return TRUE;
477diff --git a/gdata/gdata-service.c b/gdata/gdata-service.c
478index fce970ec..40fbaf84 100644
479--- a/gdata/gdata-service.c
480+++ b/gdata/gdata-service.c
481@@ -956,12 +956,9 @@ __gdata_service_query (GDataService *self, GDataAuthorizationDomain *domain, con
482
483 /* Are we off the end of the final page? */
484 if (query != NULL && _gdata_query_is_finished (query)) {
485- GTimeVal updated;
486-
487 /* Build an empty dummy feed to signify the end of the list. */
488- g_get_current_time (&updated);
489 return _gdata_feed_new (klass->feed_type, "Empty feed", "feed1",
490- updated.tv_sec);
491+ g_get_real_time () / G_USEC_PER_SEC);
492 }
493
494 /* Send the request. */
495diff --git a/gdata/services/calendar/gdata-calendar-event.c b/gdata/services/calendar/gdata-calendar-event.c
496index a3a4d713..4cdf2700 100644
497--- a/gdata/services/calendar/gdata-calendar-event.c
498+++ b/gdata/services/calendar/gdata-calendar-event.c
499@@ -37,7 +37,7 @@
500 * GDataGDWhere *where;
501 * GDataGDWho *who;
502 * GDataGDWhen *when;
503- * GTimeVal current_time;
504+ * gint64 current_time;
505 * GError *error = NULL;
506 *
507 * /<!-- -->* Create a service *<!-- -->/
508@@ -58,8 +58,8 @@
509 * gdata_calendar_event_add_person (event, who);
510 * g_object_unref (who);
511 *
512- * g_get_current_time (&current_time);
513- * when = gdata_gd_when_new (current_time.tv_sec, current_time.tv_sec + 3600, FALSE);
514+ * current_time = g_get_real_time () / G_USEC_PER_SEC;
515+ * when = gdata_gd_when_new (current_time, current_time + 3600, FALSE);
516 * gdata_calendar_event_add_time (event, when);
517 * g_object_unref (when);
518 *
519@@ -374,12 +374,10 @@ gdata_calendar_event_constructor (GType type, guint n_construct_params, GObjectC
520
521 if (_gdata_parsable_is_constructed_from_xml (GDATA_PARSABLE (object)) == FALSE) {
522 GDataCalendarEventPrivate *priv = GDATA_CALENDAR_EVENT (object)->priv;
523- GTimeVal time_val;
524
525 /* Set the edited property to the current time (creation time). We don't do this in *_init() since that would cause
526 * setting it from parse_xml() to fail (duplicate element). */
527- g_get_current_time (&time_val);
528- priv->edited = time_val.tv_sec;
529+ priv->edited = g_get_real_time () / G_USEC_PER_SEC;
530 }
531
532 return object;
533@@ -554,7 +552,7 @@ date_object_from_json (JsonReader *reader,
534 if (json_reader_read_member (reader, "dateTime")) {
535 const gchar *date_string;
536 const GError *child_error;
537- GTimeVal time_val;
538+ GDateTime *time_val;
539
540 date_string = json_reader_get_string_value (reader);
541 child_error = json_reader_get_error (reader);
542@@ -567,13 +565,15 @@ date_object_from_json (JsonReader *reader,
543 return TRUE;
544 }
545
546- if (!g_time_val_from_iso8601 (date_string, &time_val)) {
547+ time_val = g_date_time_new_from_iso8601 (date_string, NULL);
548+ if (!time_val) {
549 *success = gdata_parser_error_not_iso8601_format_json (reader, date_string, error);
550 json_reader_end_member (reader);
551 return TRUE;
552 }
553
554- date_time = time_val.tv_sec;
555+ date_time = g_date_time_to_unix (time_val);
556+ g_date_time_unref (time_val);
557 is_date = FALSE;
558 found_member = TRUE;
559 }
560diff --git a/gdata/services/calendar/gdata-calendar-query.c b/gdata/services/calendar/gdata-calendar-query.c
561index 37779bbe..dd019529 100644
562--- a/gdata/services/calendar/gdata-calendar-query.c
563+++ b/gdata/services/calendar/gdata-calendar-query.c
564@@ -37,7 +37,7 @@
565 * GDataCalendarCalendar *calendar;
566 * GDataCalendarQuery *query;
567 * GDataFeed *feed;
568- * GTimeVal current_time;
569+ * gint64 current_time;
570 * GList *i;
571 * GError *error = NULL;
572 *
573@@ -47,8 +47,8 @@
574 *
575 * /<!-- -->* Create the query to use. We're going to query for events within the next week which match the search term "party",
576 * * ordered by last modification time (descending). *<!-- -->/
577- * g_get_current_time (&current_time);
578- * query = gdata_calendar_query_new_with_limits ("party", current_time.tv_sec, current_time.tv_sec + 7 * 24 * 60 * 60);
579+ * current_time = g_get_real_time () / G_USEC_PER_SEC;
580+ * query = gdata_calendar_query_new_with_limits ("party", current_time, current_time + 7 * 24 * 60 * 60);
581 * gdata_calendar_query_set_order_by (query, "lastmodified");
582 *
583 * /<!-- -->* Execute the query *<!-- -->/
584diff --git a/gdata/services/contacts/gdata-contacts-contact.c b/gdata/services/contacts/gdata-contacts-contact.c
585index 4f511315..eb4148d0 100644
586--- a/gdata/services/contacts/gdata-contacts-contact.c
587+++ b/gdata/services/contacts/gdata-contacts-contact.c
588@@ -582,12 +582,10 @@ gdata_contacts_contact_constructor (GType type, guint n_construct_params, GObjec
589
590 if (_gdata_parsable_is_constructed_from_xml (GDATA_PARSABLE (object)) == FALSE) {
591 GDataContactsContactPrivate *priv = GDATA_CONTACTS_CONTACT (object)->priv;
592- GTimeVal time_val;
593
594 /* Set the edited property to the current time (creation time). We don't do this in *_init() since that would cause
595 * setting it from parse_xml() to fail (duplicate element). */
596- g_get_current_time (&time_val);
597- priv->edited = time_val.tv_sec;
598+ priv->edited = g_get_real_time () / G_USEC_PER_SEC;
599 }
600
601 return object;
602diff --git a/gdata/services/contacts/gdata-contacts-group.c b/gdata/services/contacts/gdata-contacts-group.c
603index 055f4255..2059369a 100644
604--- a/gdata/services/contacts/gdata-contacts-group.c
605+++ b/gdata/services/contacts/gdata-contacts-group.c
606@@ -266,12 +266,10 @@ gdata_contacts_group_constructor (GType type, guint n_construct_params, GObjectC
607
608 if (_gdata_parsable_is_constructed_from_xml (GDATA_PARSABLE (object)) == FALSE) {
609 GDataContactsGroupPrivate *priv = GDATA_CONTACTS_GROUP (object)->priv;
610- GTimeVal time_val;
611
612 /* Set the edited property to the current time (creation time). We don't do this in *_init() since that would cause setting it from
613 * parse_xml() to fail (duplicate element). */
614- g_get_current_time (&time_val);
615- priv->edited = time_val.tv_sec;
616+ priv->edited = g_get_real_time () / G_USEC_PER_SEC;
617 }
618
619 return object;
620diff --git a/gdata/services/documents/gdata-documents-query.c b/gdata/services/documents/gdata-documents-query.c
621index e589b524..4797718f 100644
622--- a/gdata/services/documents/gdata-documents-query.c
623+++ b/gdata/services/documents/gdata-documents-query.c
624@@ -37,7 +37,7 @@
625 * GDataDocumentsService *service;
626 * GDataDocumentsQuery *query;
627 * GDataFeed *feed;
628- * GTimeVal current_time;
629+ * gint64 current_time;
630 * GList *i;
631 * GError *error = NULL;
632 *
633@@ -51,9 +51,9 @@
634 * gdata_documents_query_add_collaborator (query, "example@gmail.com");
635 * gdata_documents_query_set_show_deleted (query, TRUE);
636 *
637- * g_get_current_time (&current_time);
638- * gdata_query_set_updated_min (GDATA_QUERY (query), current_time.tv_sec - 7 * 24 * 60 * 60);
639- * gdata_query_set_updated_max (GDATA_QUERY (query), current_time.tv_sec);
640+ * current_time = g_get_real_time () / G_USEC_PER_SEC;
641+ * gdata_query_set_updated_min (GDATA_QUERY (query), current_time - 7 * 24 * 60 * 60);
642+ * gdata_query_set_updated_max (GDATA_QUERY (query), current_time);
643 *
644 * /<!-- -->* Execute the query *<!-- -->/
645 * feed = gdata_documents_service_query_documents (service, query, NULL, NULL, NULL, &error);
646diff --git a/gdata/services/picasaweb/gdata-picasaweb-album.c b/gdata/services/picasaweb/gdata-picasaweb-album.c
647index 40fd8cfb..fd6d0abc 100644
648--- a/gdata/services/picasaweb/gdata-picasaweb-album.c
649+++ b/gdata/services/picasaweb/gdata-picasaweb-album.c
650@@ -507,13 +507,13 @@ gdata_picasaweb_album_constructor (GType type, guint n_construct_params, GObject
651
652 if (_gdata_parsable_is_constructed_from_xml (GDATA_PARSABLE (object)) == FALSE) {
653 GDataPicasaWebAlbumPrivate *priv = GDATA_PICASAWEB_ALBUM (object)->priv;
654- GTimeVal time_val;
655+ gint64 time_val;
656
657 /* Set the edited and timestamp properties to the current time (creation time). bgo#599140
658 * We don't do this in *_init() since that would cause setting it from parse_xml() to fail (duplicate element). */
659- g_get_current_time (&time_val);
660- priv->timestamp = (gint64) time_val.tv_sec * 1000;
661- priv->edited = time_val.tv_sec;
662+ time_val = g_get_real_time () / G_USEC_PER_SEC;
663+ priv->timestamp = time_val * 1000;
664+ priv->edited = time_val;
665 }
666
667 return object;
668diff --git a/gdata/services/picasaweb/gdata-picasaweb-file.c b/gdata/services/picasaweb/gdata-picasaweb-file.c
669index 53aab33b..96db23a6 100644
670--- a/gdata/services/picasaweb/gdata-picasaweb-file.c
671+++ b/gdata/services/picasaweb/gdata-picasaweb-file.c
672@@ -690,13 +690,13 @@ gdata_picasaweb_file_constructor (GType type, guint n_construct_params, GObjectC
673
674 if (_gdata_parsable_is_constructed_from_xml (GDATA_PARSABLE (object)) == FALSE) {
675 GDataPicasaWebFilePrivate *priv = GDATA_PICASAWEB_FILE (object)->priv;
676- GTimeVal time_val;
677+ gint64 time_val;
678
679 /* Set the edited and timestamp properties to the current time (creation time). bgo#599140
680 * We don't do this in *_init() since that would cause setting it from parse_xml() to fail (duplicate element). */
681- g_get_current_time (&time_val);
682- priv->timestamp = (gint64) time_val.tv_sec * 1000;
683- priv->edited = time_val.tv_sec;
684+ time_val = g_get_real_time () / G_USEC_PER_SEC;
685+ priv->timestamp = time_val * 1000;
686+ priv->edited = time_val;
687 }
688
689 return object;
690diff --git a/gdata/services/youtube/gdata-youtube-query.c b/gdata/services/youtube/gdata-youtube-query.c
691index 212a0d10..bb5cff15 100644
692--- a/gdata/services/youtube/gdata-youtube-query.c
693+++ b/gdata/services/youtube/gdata-youtube-query.c
694@@ -572,22 +572,20 @@ get_query_uri (GDataQuery *self, const gchar *feed_uri, GString *query_uri, gboo
695
696 if (priv->age != GDATA_YOUTUBE_AGE_ALL_TIME) {
697 gchar *after;
698- GTimeVal tv = { 0, };
699+ GDateTime *tv, *tv2;
700
701- g_get_current_time (&tv);
702-
703- /* Squash the microseconds; they’re not useful. */
704- tv.tv_usec = 0;
705+ /* don't use g_date_time_new_now_utc (squash microseconds) */
706+ tv2 = g_date_time_new_from_unix_utc (g_get_real_time () / G_USEC_PER_SEC);
707
708 switch (priv->age) {
709 case GDATA_YOUTUBE_AGE_TODAY:
710- tv.tv_sec -= 24 * 60 * 60;
711+ tv = g_date_time_add_days (tv2, -1);
712 break;
713 case GDATA_YOUTUBE_AGE_THIS_WEEK:
714- tv.tv_sec -= 7 * 24 * 60 * 60;
715+ tv = g_date_time_add_weeks (tv2, -1);
716 break;
717 case GDATA_YOUTUBE_AGE_THIS_MONTH:
718- tv.tv_sec -= 31 * 24 * 60 * 60;
719+ tv = g_date_time_add_months (tv2, -1);
720 break;
721 case GDATA_YOUTUBE_AGE_ALL_TIME:
722 default:
723@@ -596,9 +594,11 @@ get_query_uri (GDataQuery *self, const gchar *feed_uri, GString *query_uri, gboo
724
725 APPEND_SEP
726
727- after = g_time_val_to_iso8601 (&tv);
728+ after = g_date_time_format_iso8601 (tv);
729 g_string_append_printf (query_uri, "publishedAfter=%s", after);
730 g_free (after);
731+ g_date_time_unref (tv);
732+ g_date_time_unref (tv2);
733 }
734
735 /* We don’t need to use APPEND_SEP below here, as this parameter is
736diff --git a/gdata/services/youtube/gdata-youtube-service.c b/gdata/services/youtube/gdata-youtube-service.c
737index 75134e57..35994c54 100644
738--- a/gdata/services/youtube/gdata-youtube-service.c
739+++ b/gdata/services/youtube/gdata-youtube-service.c
740@@ -684,14 +684,16 @@ standard_feed_type_to_feed_uri (GDataYouTubeStandardFeedType feed_type)
741 case GDATA_YOUTUBE_RECENTLY_FEATURED_FEED:
742 case GDATA_YOUTUBE_WATCH_ON_MOBILE_FEED: {
743 gchar *date, *out;
744- GTimeVal tv;
745+ GDateTime *tv, *tv2;
746
747 /* All feed types except MOST_POPULAR have been deprecated for
748 * a while, and fall back to MOST_POPULAR on the server anyway.
749 * See: https://developers.google.com/youtube/2.0/developers_guide_protocol_video_feeds#Standard_feeds */
750- g_get_current_time (&tv);
751- tv.tv_sec -= 24 * 60 * 60; /* 1 day ago */
752- date = g_time_val_to_iso8601 (&tv);
753+ tv = g_date_time_new_now_utc ();
754+ tv2 = g_date_time_add_days (tv, -1);
755+ g_date_time_unref (tv);
756+ date = g_date_time_format_iso8601 (tv2);
757+ g_date_time_unref (tv2);
758 out = _gdata_service_build_uri ("https://www.googleapis.com/youtube/v3/videos"
759 "?part=snippet"
760 "&chart=mostPopular"
761diff --git a/gdata/tests/calendar.c b/gdata/tests/calendar.c
762index 4d70d1b7..87fb0b81 100644
763--- a/gdata/tests/calendar.c
764+++ b/gdata/tests/calendar.c
765@@ -495,7 +495,7 @@ test_event_insert (InsertEventData *data, gconstpointer service)
766 GDataGDWhere *where;
767 GDataGDWho *who;
768 GDataGDWhen *when;
769- GTimeVal start_time, end_time;
770+ GDateTime *start_time, *end_time;
771 GError *error = NULL;
772
773 gdata_test_mock_server_start_trace (mock_server, "event-insert");
774@@ -512,11 +512,13 @@ test_event_insert (InsertEventData *data, gconstpointer service)
775 who = gdata_gd_who_new (GDATA_GD_WHO_EVENT_ORGANIZER, "John Smith‽", "john.smith@example.com");
776 gdata_calendar_event_add_person (event, who);
777 g_object_unref (who);
778- g_time_val_from_iso8601 ("2009-04-17T15:00:00.000Z", &start_time);
779- g_time_val_from_iso8601 ("2009-04-17T17:00:00.000Z", &end_time);
780- when = gdata_gd_when_new (start_time.tv_sec, end_time.tv_sec, FALSE);
781+ start_time = g_date_time_new_from_iso8601 ("2009-04-17T15:00:00.000Z", NULL);
782+ end_time = g_date_time_new_from_iso8601 ("2009-04-17T17:00:00.000Z", NULL);
783+ when = gdata_gd_when_new (g_date_time_to_unix (start_time), g_date_time_to_unix (end_time), FALSE);
784 gdata_calendar_event_add_time (event, when);
785 g_object_unref (when);
786+ g_date_time_unref (start_time);
787+ g_date_time_unref (end_time);
788
789 /* Insert the event */
790 new_event = data->new_event = gdata_calendar_service_insert_calendar_event (GDATA_CALENDAR_SERVICE (service),
791@@ -540,8 +542,8 @@ G_STMT_START {
792 GDataGDWhere *where;
793 GDataGDWho *who;
794 GDataGDWhen *when;
795- GTimeVal start_time;
796- GTimeVal end_time;
797+ GDateTime *start_time;
798+ GDateTime *end_time;
799
800 event = gdata_calendar_event_new (NULL);
801
802@@ -555,11 +557,13 @@ G_STMT_START {
803 who = gdata_gd_who_new (GDATA_GD_WHO_EVENT_ORGANIZER, "John Smith‽", "john.smith@example.com");
804 gdata_calendar_event_add_person (event, who);
805 g_object_unref (who);
806- g_time_val_from_iso8601 ("2009-04-17T15:00:00.000Z", &start_time);
807- g_time_val_from_iso8601 ("2009-04-17T17:00:00.000Z", &end_time);
808- when = gdata_gd_when_new (start_time.tv_sec, end_time.tv_sec, FALSE);
809+ start_time = g_date_time_new_from_iso8601 ("2009-04-17T15:00:00.000Z", NULL);
810+ end_time = g_date_time_new_from_iso8601 ("2009-04-17T17:00:00.000Z", NULL);
811+ when = gdata_gd_when_new (g_date_time_to_unix (start_time), g_date_time_to_unix (end_time), FALSE);
812 gdata_calendar_event_add_time (event, when);
813 g_object_unref (when);
814+ g_date_time_unref (start_time);
815+ g_date_time_unref (end_time);
816
817 /* Insert the event */
818 gdata_calendar_service_insert_calendar_event_async (GDATA_CALENDAR_SERVICE (service),
819@@ -587,7 +591,7 @@ test_event_json (void)
820 GDataGDWhere *where;
821 GDataGDWho *who;
822 GDataGDWhen *when;
823- GTimeVal start_time, end_time;
824+ GDateTime *start_time, *end_time;
825
826 event = gdata_calendar_event_new (NULL);
827
828@@ -601,11 +605,13 @@ test_event_json (void)
829 who = gdata_gd_who_new (GDATA_GD_WHO_EVENT_ORGANIZER, "John Smith‽", "john.smith@example.com");
830 gdata_calendar_event_add_person (event, who);
831 g_object_unref (who);
832- g_time_val_from_iso8601 ("2009-04-17T15:00:00.000Z", &start_time);
833- g_time_val_from_iso8601 ("2009-04-17T17:00:00.000Z", &end_time);
834- when = gdata_gd_when_new (start_time.tv_sec, end_time.tv_sec, FALSE);
835+ start_time = g_date_time_new_from_iso8601 ("2009-04-17T15:00:00.000Z", NULL);
836+ end_time = g_date_time_new_from_iso8601 ("2009-04-17T17:00:00.000Z", NULL);
837+ when = gdata_gd_when_new (g_date_time_to_unix (start_time), g_date_time_to_unix (end_time), FALSE);
838 gdata_calendar_event_add_time (event, when);
839 g_object_unref (when);
840+ g_date_time_unref (start_time);
841+ g_date_time_unref (end_time);
842
843 /* Check the JSON */
844 gdata_test_assert_json (event, "{"
845@@ -1099,7 +1105,7 @@ static void
846 test_query_uri (void)
847 {
848 gint64 _time;
849- GTimeVal time_val;
850+ GDateTime *time_val;
851 gchar *query_uri;
852 GDataCalendarQuery *query = gdata_calendar_query_new ("q");
853
854@@ -1111,15 +1117,15 @@ test_query_uri (void)
855 g_assert_cmpstr (gdata_calendar_query_get_order_by (query), ==, "starttime");
856
857 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
858- g_time_val_from_iso8601 ("2009-04-17T15:00:00.000Z", &time_val);
859- gdata_calendar_query_set_recurrence_expansion_start (query, time_val.tv_sec);
860+ time_val = g_date_time_new_from_iso8601 ("2009-04-17T15:00:00.000Z", NULL);
861+ gdata_calendar_query_set_recurrence_expansion_start (query, g_date_time_to_unix (time_val));
862 _time = gdata_calendar_query_get_recurrence_expansion_start (query);
863- g_assert_cmpint (_time, ==, time_val.tv_sec);
864+ g_assert_cmpint (_time, ==, g_date_time_to_unix (time_val));
865
866- g_time_val_from_iso8601 ("2010-04-17T15:00:00.000Z", &time_val);
867- gdata_calendar_query_set_recurrence_expansion_end (query, time_val.tv_sec);
868+ time_val = g_date_time_new_from_iso8601 ("2010-04-17T15:00:00.000Z", NULL);
869+ gdata_calendar_query_set_recurrence_expansion_end (query, g_date_time_to_unix (time_val));
870 _time = gdata_calendar_query_get_recurrence_expansion_end (query);
871- g_assert_cmpint (_time, ==, time_val.tv_sec);
872+ g_assert_cmpint (_time, ==, g_date_time_to_unix (time_val));
873 G_GNUC_END_IGNORE_DEPRECATIONS
874
875 gdata_calendar_query_set_single_events (query, TRUE);
876@@ -1130,15 +1136,17 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
877 g_assert_cmpstr (gdata_calendar_query_get_sort_order (query), ==, "descending");
878 G_GNUC_END_IGNORE_DEPRECATIONS
879
880- g_time_val_from_iso8601 ("2009-04-17T15:00:00.000Z", &time_val);
881- gdata_calendar_query_set_start_min (query, time_val.tv_sec);
882+ time_val = g_date_time_new_from_iso8601 ("2009-04-17T15:00:00.000Z", NULL);
883+ gdata_calendar_query_set_start_min (query, g_date_time_to_unix (time_val));
884 _time = gdata_calendar_query_get_start_min (query);
885- g_assert_cmpint (_time, ==, time_val.tv_sec);
886+ g_assert_cmpint (_time, ==, g_date_time_to_unix (time_val));
887+ g_date_time_unref (time_val);
888
889- g_time_val_from_iso8601 ("2010-04-17T15:00:00.000Z", &time_val);
890- gdata_calendar_query_set_start_max (query, time_val.tv_sec);
891+ time_val = g_date_time_new_from_iso8601 ("2010-04-17T15:00:00.000Z", NULL);
892+ gdata_calendar_query_set_start_max (query, g_date_time_to_unix (time_val));
893 _time = gdata_calendar_query_get_start_max (query);
894- g_assert_cmpint (_time, ==, time_val.tv_sec);
895+ g_assert_cmpint (_time, ==, g_date_time_to_unix (time_val));
896+ g_date_time_unref (time_val);
897
898 gdata_calendar_query_set_timezone (query, "America/Los Angeles");
899 g_assert_cmpstr (gdata_calendar_query_get_timezone (query), ==, "America/Los_Angeles");
900diff --git a/gdata/tests/contacts.c b/gdata/tests/contacts.c
901index e4f72deb..f70cee25 100644
902--- a/gdata/tests/contacts.c
903+++ b/gdata/tests/contacts.c
904@@ -304,14 +304,12 @@ test_contact_insert (InsertData *data, gconstpointer service)
905 GList *list;
906 GDate date;
907 GHashTable *properties;
908- GTimeVal current_time;
909 gint64 edited, creation_time;
910 GError *error = NULL;
911
912 gdata_test_mock_server_start_trace (mock_server, "contact-insert");
913
914 contact = gdata_contacts_contact_new (NULL);
915- g_get_current_time (&current_time);
916
917 /* Check the kind is present and correct */
918 g_assert (GDATA_IS_CONTACTS_CONTACT (contact));
919@@ -752,13 +750,13 @@ static void
920 test_group_insert (InsertGroupData *data, gconstpointer service)
921 {
922 GDataContactsGroup *group, *new_group;
923- GTimeVal time_val;
924+ gint64 time_val;
925 GHashTable *properties;
926 GError *error = NULL;
927
928 gdata_test_mock_server_start_trace (mock_server, "group-insert");
929
930- g_get_current_time (&time_val);
931+ time_val = g_get_real_time () / G_USEC_PER_SEC;
932
933 group = gdata_contacts_group_new (NULL);
934
935@@ -780,7 +778,7 @@ test_group_insert (InsertGroupData *data, gconstpointer service)
936 /* Check the properties. Time-based properties can't be checked when running against a mock server, since
937 * the trace files may be quite old. */
938 if (uhm_server_get_enable_online (mock_server) == TRUE) {
939- g_assert_cmpint (gdata_contacts_group_get_edited (new_group), >=, time_val.tv_sec);
940+ g_assert_cmpint (gdata_contacts_group_get_edited (new_group), >=, time_val);
941 }
942 g_assert (gdata_contacts_group_is_deleted (new_group) == FALSE);
943 g_assert (gdata_contacts_group_get_system_group_id (new_group) == NULL);
944@@ -850,12 +848,12 @@ test_contact_properties (void)
945 gchar *nickname, *file_as, *billing_information, *directory_server, *gender, *initials, *maiden_name, *mileage, *occupation;
946 gchar *priority, *sensitivity, *short_name, *subject, *photo_etag;
947 GDate date, *date2;
948- GTimeVal current_time;
949+ gint64 current_time;
950 gint64 edited;
951 gboolean deleted, birthday_has_year;
952
953 contact = gdata_contacts_contact_new (NULL);
954- g_get_current_time (&current_time);
955+ current_time = g_get_real_time () / G_USEC_PER_SEC;
956
957 /* Check the kind is present and correct */
958 g_assert (GDATA_IS_CONTACTS_CONTACT (contact));
959@@ -984,7 +982,7 @@ test_contact_properties (void)
960 "subject", &subject,
961 NULL);
962
963- g_assert_cmpint (edited, ==, current_time.tv_sec);
964+ g_assert_cmpint (edited, ==, current_time);
965 g_assert (deleted == FALSE);
966 g_assert (photo_etag == NULL);
967 g_assert (name2 == name);
968@@ -1751,7 +1749,7 @@ static void
969 test_group_properties (void)
970 {
971 GDataContactsGroup *group;
972- GTimeVal time_val;
973+ gint64 time_val;
974 GHashTable *properties;
975 gint64 edited;
976 gboolean deleted;
977@@ -1768,8 +1766,8 @@ test_group_properties (void)
978 g_assert (gdata_contacts_group_set_extended_property (group, "foobar", "barfoo") == TRUE);
979
980 /* Check various properties */
981- g_get_current_time (&time_val);
982- g_assert_cmpint (gdata_contacts_group_get_edited (group), ==, time_val.tv_sec);
983+ time_val = g_get_real_time () / G_USEC_PER_SEC;
984+ g_assert_cmpint (gdata_contacts_group_get_edited (group), ==, time_val);
985 g_assert (gdata_contacts_group_is_deleted (group) == FALSE);
986 g_assert (gdata_contacts_group_get_system_group_id (group) == NULL);
987
988@@ -1785,7 +1783,7 @@ test_group_properties (void)
989 "system-group-id", &system_group_id,
990 NULL);
991
992- g_assert_cmpint (edited, ==, time_val.tv_sec);
993+ g_assert_cmpint (edited, ==, time_val);
994 g_assert (deleted == FALSE);
995 g_assert (system_group_id == NULL);
996
997diff --git a/gdata/tests/general.c b/gdata/tests/general.c
998index 30604ba1..39478713 100644
999--- a/gdata/tests/general.c
1000+++ b/gdata/tests/general.c
1001@@ -3502,11 +3502,12 @@ static void
1002 test_gd_when_escaping (void)
1003 {
1004 GDataGDWhen *when;
1005- GTimeVal start_time;
1006+ GDateTime *start_time;
1007
1008- g_time_val_from_iso8601 ("2005-06-07T01:00:00Z", &start_time);
1009- when = gdata_gd_when_new (start_time.tv_sec, -1, FALSE);
1010+ start_time = g_date_time_new_from_iso8601 ("2005-06-07T01:00:00Z", NULL);
1011+ when = gdata_gd_when_new (g_date_time_to_unix (start_time), -1, FALSE);
1012 gdata_gd_when_set_value_string (when, "Value string & stuff!");
1013+ g_date_time_unref (start_time);
1014
1015 /* Check the outputted XML is escaped properly */
1016 gdata_test_assert_xml (when,
1017diff --git a/gdata/tests/perf.c b/gdata/tests/perf.c
1018index 2749d40d..60f3dcc1 100644
1019--- a/gdata/tests/perf.c
1020+++ b/gdata/tests/perf.c
1021@@ -78,23 +78,24 @@ test_parse_feed (void)
1022 static void
1023 test_perf_parsing (void)
1024 {
1025- GTimeVal start_time, end_time;
1026+ GDateTime *start_time, *end_time;
1027+ GTimeSpan total_time, per_iteration_time;
1028 guint i;
1029- guint64 total_time; /* microseconds */
1030- guint64 per_iteration_time; /* microseconds */
1031
1032 #define ITERATIONS 10000
1033
1034 /* Test feed parsing time */
1035- g_get_current_time (&start_time);
1036+ start_time = g_date_time_new_now_utc ();
1037 for (i = 0; i < ITERATIONS; i++)
1038 test_parse_feed ();
1039- g_get_current_time (&end_time);
1040+ end_time = g_date_time_new_now_utc ();
1041
1042- total_time = (end_time.tv_sec - start_time.tv_sec) * G_USEC_PER_SEC +
1043- (end_time.tv_usec - start_time.tv_usec);
1044+ total_time = g_date_time_difference (end_time, start_time);
1045 per_iteration_time = total_time / ITERATIONS;
1046
1047+ g_date_time_unref (start_time);
1048+ g_date_time_unref (end_time);
1049+
1050 /* Prefix with hashes to avoid the output being misinterpreted as TAP
1051 * commands. */
1052 printf ("# Parsing a feed %u times took:\n"
1053diff --git a/gdata/tests/picasaweb.c b/gdata/tests/picasaweb.c
1054index eecf1b78..19978e3c 100644
1055--- a/gdata/tests/picasaweb.c
1056+++ b/gdata/tests/picasaweb.c
1057@@ -782,7 +782,7 @@ typedef struct {
1058 static void
1059 set_up_insert_album (InsertAlbumData *data, gconstpointer service)
1060 {
1061- GTimeVal timestamp;
1062+ GDateTime *timestamp;
1063
1064 data->album = gdata_picasaweb_album_new (NULL);
1065 g_assert (GDATA_IS_PICASAWEB_ALBUM (data->album));
1066@@ -791,8 +791,9 @@ set_up_insert_album (InsertAlbumData *data, gconstpointer service)
1067 gdata_entry_set_summary (GDATA_ENTRY (data->album), "Family photos of the feast!");
1068 gdata_picasaweb_album_set_location (data->album, "Winnipeg, MN");
1069
1070- g_time_val_from_iso8601 ("2002-10-14T09:58:59.643554Z", &timestamp);
1071- gdata_picasaweb_album_set_timestamp (data->album, (gint64) timestamp.tv_sec * 1000);
1072+ timestamp = g_date_time_new_from_iso8601 ("2002-10-14T09:58:59.643554Z", NULL);
1073+ gdata_picasaweb_album_set_timestamp (data->album, g_date_time_to_unix (timestamp) * 1000);
1074+ g_date_time_unref (timestamp);
1075 }
1076
1077 static void
1078@@ -1757,12 +1758,12 @@ test_album_new (void)
1079 GRegex *regex;
1080 GMatchInfo *match_info;
1081 gint64 delta;
1082- GTimeVal timeval;
1083+ GDateTime *timeval;
1084
1085 g_test_bug ("598893");
1086
1087 /* Get the current time */
1088- g_get_current_time (&timeval);
1089+ timeval = g_date_time_new_now_utc ();
1090
1091 /* Build a regex to match the timestamp from the XML, since we can't definitely say what it'll be. Note that we also assign any order to the
1092 * namespace definitions, since due to a change in GLib's hashing algorithm, they could be in different orders with different GLib versions. */
1093@@ -1795,9 +1796,10 @@ test_album_new (void)
1094 xml = gdata_parsable_get_xml (GDATA_PARSABLE (album));
1095 g_assert (g_regex_match (regex, xml, 0, &match_info) == TRUE);
1096 parsed_time_str = g_match_info_fetch (match_info, 2);
1097- delta = g_ascii_strtoull (parsed_time_str, NULL, 10) - (((guint64) timeval.tv_sec) * 1000 + ((guint64) timeval.tv_usec) / 1000);
1098+ delta = g_ascii_strtoull (parsed_time_str, NULL, 10) - (g_date_time_to_unix (timeval) * 1000 + ((guint64) g_date_time_get_microsecond (timeval)) / 1000);
1099 g_assert_cmpuint (ABS (delta), <, 1000);
1100
1101+ g_date_time_unref (timeval);
1102 g_free (parsed_time_str);
1103 g_free (xml);
1104 g_regex_unref (regex);
1105diff --git a/gdata/tests/youtube.c b/gdata/tests/youtube.c
1106index 5fefbaf8..b2732680 100644
1107--- a/gdata/tests/youtube.c
1108+++ b/gdata/tests/youtube.c
1109@@ -1537,13 +1537,17 @@ test_comment_properties_parent_comment_uri (void)
1110 static gchar *
1111 build_this_week_date_str (void)
1112 {
1113- GTimeVal tv;
1114+ GDateTime *tv, *tv2;
1115+ gchar *ret;
1116
1117- g_get_current_time (&tv);
1118- tv.tv_sec -= 7 * 24 * 60 * 60; /* this week */
1119- tv.tv_usec = 0; /* pointless accuracy */
1120+ /* don't use g_date_time_new_now_utc (squash microseconds) */
1121+ tv = g_date_time_new_from_unix_utc (g_get_real_time () / G_USEC_PER_SEC);
1122+ tv2 = g_date_time_add_weeks (tv, -1);
1123+ g_date_time_unref (tv);
1124
1125- return g_time_val_to_iso8601 (&tv);
1126+ ret = g_date_time_format_iso8601 (tv2);
1127+ g_date_time_unref (tv2);
1128+ return ret;
1129 }
1130
1131 static void
1132--
1133GitLab
1134
diff --git a/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb b/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb
deleted file mode 100644
index 5f5d5834a7..0000000000
--- a/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb
+++ /dev/null
@@ -1,34 +0,0 @@
1SUMMARY = "GLib-based library for accessing online service APIs using the GData protocol"
2HOMEPAGE = "http://live.gnome.org/libgdata"
3BUGTRACKER = "https://bugzilla.gnome.org/"
4
5LICENSE = "LGPL-2.1-only"
6LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \
7 file://gdata/gdata.h;endline=20;md5=079a554efcf65d46f96a515806e7e99a \
8 file://gdata/gdata-types.h;endline=20;md5=7399b111aac8718da13888fc634be6ef"
9
10DEPENDS = "libxml2 glib-2.0 libsoup-2.4 intltool-native liboauth gcr3 json-glib"
11
12GTKDOC_MESON_OPTION = "gtk_doc"
13
14inherit gnomebase pkgconfig gettext gtk-doc vala gobject-introspection manpages features_check
15
16SRC_URI += "file://0001-Drop-usage-of-deprecated-GTimeVal.patch"
17
18ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
19REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'goa', 'opengl', '', d)}"
20
21do_compile:prepend() {
22 export GIR_EXTRA_LIBS_PATH="${B}/gdata/.libs"
23}
24
25# goa is required for gnome-photos
26PACKAGECONFIG ??= "goa gtk vala"
27PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false"
28PACKAGECONFIG[goa] = "-Dgoa=enabled,-Dgoa=disabled,gnome-online-accounts"
29PACKAGECONFIG[gtk] = "-Dgtk=enabled,-Dgtk=disabled,gtk+3"
30PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false"
31
32EXTRA_OEMESON = "-Dalways_build_tests=false"
33
34SRC_URI[archive.sha256sum] = "dd8592eeb6512ad0a8cf5c8be8c72e76f74bfe6b23e4dd93f0756ee0716804c7"
diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.55.bb b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.56.bb
index 77d621ec12..e1e1578411 100644
--- a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.55.bb
+++ b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.56.bb
@@ -9,7 +9,7 @@ DEPENDS = "libxml2 bzip2 glib-2.0 zlib"
9GNOMEBASEBUILDCLASS = "autotools" 9GNOMEBASEBUILDCLASS = "autotools"
10inherit gnomebase gobject-introspection gettext gtk-doc 10inherit gnomebase gobject-introspection gettext gtk-doc
11 11
12SRC_URI[archive.sha256sum] = "74d60abba15bd3ea5ad17da5b924d8e36f649a25c3dc77adbabd2a3628a02131" 12SRC_URI[archive.sha256sum] = "9d21d30df1d12feaf03e181afd6067f65e3048ab69cb6ad174a3c5b72b92d297"
13SRC_URI += " file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch" 13SRC_URI += " file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch"
14 14
15PACKAGECONFIG ??= "" 15PACKAGECONFIG ??= ""
diff --git a/meta-gnome/recipes-gnome/libtimezonemap/files/port-to-libsoup3.patch b/meta-gnome/recipes-gnome/libtimezonemap/files/port-to-libsoup3.patch
new file mode 100644
index 0000000000..7039be1795
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libtimezonemap/files/port-to-libsoup3.patch
@@ -0,0 +1,95 @@
1From: Joshua Peisach <itzswirlz2020@outlook.com>
2Date: Sat, 06 Aug 2022 11:37:51 +0200
3Subject: Port to libsoup3.
4
5Forwarded: not-yet
6Last-Update: 2022-08-06
7
8Upstream-Status: Backport [https://salsa.debian.org/cinnamon-team/libtimezonemap/-/commit/ed57d8331a7429487b9c8ea97cc7bd684ed5a2e1]
9Signed-off-by: Changqing Li <changqing.li@windriver.com>
10---
11Index: libtimezonemap/configure.ac
12===================================================================
13--- libtimezonemap.orig/configure.ac
14+++ libtimezonemap/configure.ac
15@@ -50,13 +50,13 @@
16 GLIB_REQUIRED_VERSION=2.26
17 GTK3_REQUIRED_VERSION=3.1.4
18 GIO_REQUIRED_VERSION=2.5.11
19-SOUP_REQUIRED_VERSION=2.42.0
20+SOUP_REQUIRED_VERSION=3.0.7
21
22 AC_CHECK_LIBM
23
24 PKG_CHECK_MODULES(LIBTIMEZONEMAP, gio-2.0 >= $GIO_REQUIRED_VERSION
25 gtk+-3.0 >= $GTK3_REQUIRED_VERSION
26- libsoup-2.4 >= $SOUP_REQUIRED_VERSION
27+ libsoup-3.0 >= $SOUP_REQUIRED_VERSION
28 json-glib-1.0)
29 LIBTIMEZONEMAP_LIBS="$LIBTIMEZONEMAP_LIBS $LIBM"
30
31Index: libtimezonemap/src/timezone-completion.c
32===================================================================
33--- libtimezonemap.orig/src/timezone-completion.c
34+++ libtimezonemap/src/timezone-completion.c
35@@ -270,9 +270,10 @@
36 CcTimezoneCompletionPrivate * priv = completion->priv;
37 GError * error = NULL;
38 GInputStream * stream;
39- SoupMessage *message;
40+ const gchar * reason_phrase;
41+ SoupStatus status_code;
42
43- stream = soup_request_send_finish (SOUP_REQUEST (object), res, &error);
44+ stream = soup_session_send_finish (priv->soup_session, res, &error);
45 if (stream == NULL)
46 {
47 if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
48@@ -283,8 +284,9 @@
49 return;
50 }
51
52- message = soup_request_http_get_message (SOUP_REQUEST_HTTP (object));
53- if (message->status_code == SOUP_STATUS_OK)
54+ reason_phrase = soup_message_get_reason_phrase (SOUP_MESSAGE (object));
55+ status_code = soup_message_get_status (SOUP_MESSAGE (object));
56+ if (status_code == SOUP_STATUS_OK)
57 {
58 JsonParser *parser;
59
60@@ -296,10 +298,10 @@
61 else
62 {
63 g_warning ("Unable to fetch geonames (server responded with: %u %s)",
64- message->status_code, message->reason_phrase);
65+ status_code, reason_phrase);
66 }
67
68- g_object_unref (message);
69+ g_object_unref (object);
70 g_object_unref (stream);
71 }
72
73@@ -362,7 +364,7 @@
74 request_zones (CcTimezoneCompletion * completion)
75 {
76 CcTimezoneCompletionPrivate * priv = completion->priv;
77- SoupRequest *req;
78+ SoupMessage *req;
79 GError *error = NULL;
80
81 priv->queued_request = 0;
82@@ -391,10 +393,11 @@
83 g_free (locale);
84 g_free (escaped);
85
86- req = soup_session_request (priv->soup_session, url, &error);
87+ req = soup_message_new (NULL, url);
88 if (req)
89 {
90- soup_request_send_async (req, priv->cancel, geonames_data_ready, completion);
91+ soup_session_send_async (priv->soup_session, req, G_PRIORITY_DEFAULT,
92+ priv->cancel, geonames_data_ready, completion);
93 g_object_unref (req);
94 }
95 else
diff --git a/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb b/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb
index 7c8e410b09..cca9e632f8 100644
--- a/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb
+++ b/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb
@@ -5,13 +5,14 @@ LICENSE = "GPL-3.0-only"
5LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 5LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
6 6
7SRC_URI = "${DEBIAN_MIRROR}/main/libt/${BPN}/${BPN}_${PV}.orig.tar.gz;downloadfilename=${BP}.tar.gz \ 7SRC_URI = "${DEBIAN_MIRROR}/main/libt/${BPN}/${BPN}_${PV}.orig.tar.gz;downloadfilename=${BP}.tar.gz \
8 file://0001-configure.ac-correct-the-version.patch" 8 file://0001-configure.ac-correct-the-version.patch \
9 file://port-to-libsoup3.patch"
9SRC_URI[sha256sum] = "0d634cc2476d8f57d1ee1864bd4f442180ae4bf040a9ae4bf73b66bbd85d7195" 10SRC_URI[sha256sum] = "0d634cc2476d8f57d1ee1864bd4f442180ae4bf040a9ae4bf73b66bbd85d7195"
10 11
11UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/libt/libtimezonemap" 12UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/libt/libtimezonemap"
12UPSTREAM_CHECK_REGEX = "libtimezonemap_(?P<pver>\d+(\.\d+)+)" 13UPSTREAM_CHECK_REGEX = "libtimezonemap_(?P<pver>\d+(\.\d+)+)"
13 14
14DEPENDS = "gtk+3 gdk-pixbuf libsoup-2.4 json-glib gnome-common-native" 15DEPENDS = "gtk+3 gdk-pixbuf libsoup json-glib gnome-common-native"
15 16
16B = "${S}" 17B = "${S}"
17 18
diff --git a/meta-gnome/recipes-gnome/libwnck/files/ef0e40d59c32d7ebeb94d242436e3144cefc174a.patch b/meta-gnome/recipes-gnome/libwnck/files/ef0e40d59c32d7ebeb94d242436e3144cefc174a.patch
deleted file mode 100644
index 2d526e7aba..0000000000
--- a/meta-gnome/recipes-gnome/libwnck/files/ef0e40d59c32d7ebeb94d242436e3144cefc174a.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From ef0e40d59c32d7ebeb94d242436e3144cefc174a Mon Sep 17 00:00:00 2001
2From: correctmost <136447-correctmost@users.noreply.gitlab.gnome.org>
3Date: Thu, 20 Mar 2025 03:03:44 -0400
4Subject: [PATCH] build: fix -Wheader-guard warnings reported by clang
5
6Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libwnck/-/commit/ef0e40d59c32d7ebeb94d242436e3144cefc174a]
7---
8 libwnck/pager-accessible-factory.h | 2 +-
9 libwnck/workspace-accessible-factory.h | 2 +-
10 2 files changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/libwnck/pager-accessible-factory.h b/libwnck/pager-accessible-factory.h
13index 8e2fe30c..25220fc2 100644
14--- a/libwnck/pager-accessible-factory.h
15+++ b/libwnck/pager-accessible-factory.h
16@@ -17,7 +17,7 @@
17 */
18
19 #ifndef __WNCK_PAGER_ACCESSIBLE_FACTORY_H__
20-#define __WBCK_PAGER_ACCESSIBLE_FACTORY_H__
21+#define __WNCK_PAGER_ACCESSIBLE_FACTORY_H__
22
23 #include <atk/atk.h>
24
25diff --git a/libwnck/workspace-accessible-factory.h b/libwnck/workspace-accessible-factory.h
26index d2d4a84a..335b465b 100644
27--- a/libwnck/workspace-accessible-factory.h
28+++ b/libwnck/workspace-accessible-factory.h
29@@ -17,7 +17,7 @@
30 */
31
32 #ifndef __WNCK_WORKSPACE_ACCESSIBLE_FACTORY_H__
33-#define __WBCK_WORKSPACE_ACCESSIBLE_FACTORY_H__
34+#define __WNCK_WORKSPACE_ACCESSIBLE_FACTORY_H__
35
36 #include <atk/atk.h>
37
38--
39GitLab
40
diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck3_43.2.bb b/meta-gnome/recipes-gnome/libwnck/libwnck3_43.3.bb
index 13923a3e17..3a49c0e2f3 100644
--- a/meta-gnome/recipes-gnome/libwnck/libwnck3_43.2.bb
+++ b/meta-gnome/recipes-gnome/libwnck/libwnck3_43.3.bb
@@ -19,8 +19,7 @@ inherit gnomebase gobject-introspection gtk-doc gettext features_check
19def gnome_verdir(v): 19def gnome_verdir(v):
20 return oe.utils.trim_version(v, 1) 20 return oe.utils.trim_version(v, 1)
21 21
22SRC_URI += "file://ef0e40d59c32d7ebeb94d242436e3144cefc174a.patch;patch=1 \ 22SRC_URI += "file://0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch;patch=1"
23 file://0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch;patch=1" 23SRC_URI[archive.sha256sum] = "6af8ac41a8f067ade1d3caaed254a83423b5f61ad3f7a460fcacbac2e192bdf7"
24SRC_URI[archive.sha256sum] = "55a7444ec1fbb95c086d40967388f231b5c0bbc8cffaa086bf9290ae449e51d5"
25 24
26REQUIRED_DISTRO_FEATURES = "x11" 25REQUIRED_DISTRO_FEATURES = "x11"
diff --git a/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch b/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch
deleted file mode 100644
index cd46824c39..0000000000
--- a/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From d36e65f3e31c882f62d5cfeb7b0e1441d5fdc821 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Sat, 14 Apr 2018 16:15:59 +0800
4Subject: [PATCH] drop zenity detection
5
6OE does not support zenity
7
8Upstream-Status: Inappropriate [OE specific]
9
10Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11---
12 configure.ac | 5 -----
13 1 file changed, 5 deletions(-)
14
15diff --git a/configure.ac b/configure.ac
16index bbb4db8..2010d78 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -336,11 +336,6 @@ fi
20
21 AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes")
22
23-AC_PATH_PROG(ZENITY, zenity, no)
24-if test x"$ZENITY" = xno; then
25- AC_MSG_ERROR([zenity not found in your path - needed for dialogs])
26-fi
27-
28 AC_SEARCH_LIBS([dlsym], [dl], [], [
29 AC_MSG_ERROR([unable to find the dlsym() function])
30 ])
diff --git a/meta-gnome/recipes-gnome/metacity/metacity_3.56.0.bb b/meta-gnome/recipes-gnome/metacity/metacity_3.58.1.bb
index b8b248ba3a..f364b52b98 100644
--- a/meta-gnome/recipes-gnome/metacity/metacity_3.56.0.bb
+++ b/meta-gnome/recipes-gnome/metacity/metacity_3.58.1.bb
@@ -24,8 +24,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
24GNOMEBASEBUILDCLASS = "autotools" 24GNOMEBASEBUILDCLASS = "autotools"
25inherit gnomebase gsettings gettext upstream-version-is-even features_check 25inherit gnomebase gsettings gettext upstream-version-is-even features_check
26 26
27SRC_URI[archive.sha256sum] = "7554997104b26ff0e79a02b37a2ba189bdf4e7ccd54226f0faf4b1a59006c901" 27SRC_URI[archive.sha256sum] = "e430c8a92409ef2f91a4dabd50a71e3d3bbcc474a3dec1caec3813b381d7d1b0"
28SRC_URI += "file://0001-drop-zenity-detection.patch"
29 28
30PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama" 29PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama"
31# enable as neccessary until new warnings are dealt with 30# enable as neccessary until new warnings are dealt with
@@ -35,6 +34,7 @@ FILES:${PN} += " \
35 ${datadir}/themes \ 34 ${datadir}/themes \
36 ${datadir}/gnome-control-center \ 35 ${datadir}/gnome-control-center \
37 ${datadir}/gnome\ 36 ${datadir}/gnome\
37 ${systemd_user_unitdir} \
38" 38"
39 39
40RDEPENDS:${PN} += "gsettings-desktop-schemas" 40RDEPENDS:${PN} += "gsettings-desktop-schemas"
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_49.4.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_49.5.bb
index 9befe945df..45e0969d66 100644
--- a/meta-gnome/recipes-gnome/nautilus/nautilus_49.4.bb
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus_49.5.bb
@@ -24,7 +24,7 @@ DEPENDS = " \
24 24
25inherit gnomebase gsettings gobject-introspection gi-docgen gettext features_check mime-xdg gtk-icon-cache 25inherit gnomebase gsettings gobject-introspection gi-docgen gettext features_check mime-xdg gtk-icon-cache
26 26
27SRC_URI[archive.sha256sum] = "1476d9459a63c85f0ebc18f237b32d12b008ad786002376424919725f50e76a8" 27SRC_URI[archive.sha256sum] = "fa5655e73ee7953aecfe71fea67bfec0c67447e14e6df135aa3f80334386872c"
28 28
29REQUIRED_DISTRO_FEATURES = "x11 opengl gobject-introspection-data" 29REQUIRED_DISTRO_FEATURES = "x11 opengl gobject-introspection-data"
30 30
diff --git a/meta-gnome/recipes-gnome/tecla/tecla_49.0.bb b/meta-gnome/recipes-gnome/tecla/tecla_50.0.bb
index 27b035dd83..f0a4874eca 100644
--- a/meta-gnome/recipes-gnome/tecla/tecla_49.0.bb
+++ b/meta-gnome/recipes-gnome/tecla/tecla_50.0.bb
@@ -14,5 +14,5 @@ REQUIRED_DISTRO_FEATURES = "wayland"
14inherit gnomebase pkgconfig features_check 14inherit gnomebase pkgconfig features_check
15 15
16SRC_URI = "https://download.gnome.org/sources/tecla/${@oe.utils.trim_version('${PV}', 1)}/tecla-${PV}.tar.xz" 16SRC_URI = "https://download.gnome.org/sources/tecla/${@oe.utils.trim_version('${PV}', 1)}/tecla-${PV}.tar.xz"
17SRC_URI[sha256sum] = "2ca424e402baf60cd6b13777703b701ebb1faf8f3d0f2f971144d823f651249f" 17SRC_URI[sha256sum] = "2542acb24850082e0ccf6aa17af9651db71d22f0e233fdbf5ed0cffe2e45bc06"
18 18
diff --git a/meta-gnome/recipes-gnome/tepl/tepl_6.14.0.bb b/meta-gnome/recipes-gnome/tepl/tepl_6.14.0.bb
index b6ba7e1a2a..4350f69068 100644
--- a/meta-gnome/recipes-gnome/tepl/tepl_6.14.0.bb
+++ b/meta-gnome/recipes-gnome/tepl/tepl_6.14.0.bb
@@ -22,7 +22,7 @@ inherit meson gobject-introspection gettext features_check pkgconfig
22 22
23 23
24ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" 24ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
25SRC_URI = "git://gitlab.gnome.org/World/gedit/libgedit-tepl.git;protocol=https;branch=main" 25SRC_URI = "git://gitlab.gnome.org/World/gedit/libgedit-tepl.git;protocol=https;branch=main;tag=${PV}"
26SRCREV = "d60f7ded17b52ea42091c073ea81090e91f38620" 26SRCREV = "d60f7ded17b52ea42091c073ea81090e91f38620"
27# gobject-introspection is mandatory and cannot be configured 27# gobject-introspection is mandatory and cannot be configured
28REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" 28REQUIRED_DISTRO_FEATURES += "gobject-introspection-data"
diff --git a/meta-gnome/recipes-gnome/tracker/localsearch/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch b/meta-gnome/recipes-gnome/tracker/localsearch/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch
index 87589a0e64..23675075f8 100644
--- a/meta-gnome/recipes-gnome/tracker/localsearch/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch
+++ b/meta-gnome/recipes-gnome/tracker/localsearch/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch
@@ -1,4 +1,4 @@
1From bad93f7aec96b1819f4027dbc06b337d2e2227f2 Mon Sep 17 00:00:00 2001 1From 78c089de4bef7d8f07cc6def1202dcec949521b5 Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui@fujitsu.com> 2From: Lei Maohui <leimaohui@fujitsu.com>
3Date: Thu, 15 Sep 2022 16:35:39 +0900 3Date: Thu, 15 Sep 2022 16:35:39 +0900
4Subject: [PATCH] Set header file to a fixed path instead of a host path. 4Subject: [PATCH] Set header file to a fixed path instead of a host path.
@@ -7,7 +7,7 @@ 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 .../tracker-miners-enum-types.c.template | 2 +- 10 src/common/tracker-miners-enum-types.c.template | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
12 12
13diff --git a/src/common/tracker-miners-enum-types.c.template b/src/common/tracker-miners-enum-types.c.template 13diff --git a/src/common/tracker-miners-enum-types.c.template b/src/common/tracker-miners-enum-types.c.template
diff --git a/meta-gnome/recipes-gnome/tracker/localsearch/0001-fix-reproducibility.patch b/meta-gnome/recipes-gnome/tracker/localsearch/0001-fix-reproducibility.patch
index 1bab34e126..f90dafea82 100644
--- a/meta-gnome/recipes-gnome/tracker/localsearch/0001-fix-reproducibility.patch
+++ b/meta-gnome/recipes-gnome/tracker/localsearch/0001-fix-reproducibility.patch
@@ -1,4 +1,4 @@
1From 57f4279008394831826ea2ff449b06b29c08ce68 Mon Sep 17 00:00:00 2001 1From 7affd66ff09747ad95b2e6de0b86ab06c97ca8f1 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,18 +12,14 @@ 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 | 8 ++++---- 15 meson.build | 4 ++--
16 src/common/tracker-landlock.c | 4 ++-- 16 1 file changed, 2 insertions(+), 2 deletions(-)
17 src/miners/fs/meson.build | 4 ++--
18 src/tracker-extract/meson.build | 2 +-
19 tests/tracker-miner-fs/meson.build | 2 +-
20 5 files changed, 10 insertions(+), 10 deletions(-)
21 17
22diff --git a/meson.build b/meson.build 18diff --git a/meson.build b/meson.build
23index 7ae103c..cc61e84 100644 19index fe65280b6..6af5abec9 100644
24--- a/meson.build 20--- a/meson.build
25+++ b/meson.build 21+++ b/meson.build
26@@ -371,7 +371,7 @@ conf.set('PACKAGE_VERSION', '"@0@"'.format(meson.project_version())) 22@@ -323,7 +323,7 @@ conf.set('PACKAGE_VERSION', '"@0@"'.format(meson.project_version()))
27 conf.set('TRACKER_VERSION', '"@0@"'.format(meson.project_version())) 23 conf.set('TRACKER_VERSION', '"@0@"'.format(meson.project_version()))
28 24
29 # Config that goes in some other generated files (.desktop, .pc, etc) 25 # Config that goes in some other generated files (.desktop, .pc, etc)
@@ -32,7 +28,7 @@ index 7ae103c..cc61e84 100644
32 conf.set('exec_prefix', get_option('prefix')) 28 conf.set('exec_prefix', get_option('prefix'))
33 conf.set('bindir', join_paths(get_option('prefix'), get_option('bindir'))) 29 conf.set('bindir', join_paths(get_option('prefix'), get_option('bindir')))
34 conf.set('datadir', datadir) 30 conf.set('datadir', datadir)
35@@ -400,7 +400,7 @@ tracker_c_args = [ 31@@ -353,7 +353,7 @@ tracker_c_args = [
36 configinc = include_directories('./') 32 configinc = include_directories('./')
37 srcinc = include_directories('src/') 33 srcinc = include_directories('src/')
38 34
@@ -41,22 +37,22 @@ index 7ae103c..cc61e84 100644
41 37
42 # We use tracker-miners-3.0 rather than tracker3-miners inside the lib64 38 # We use tracker-miners-3.0 rather than tracker3-miners inside the lib64
43 # directory, following the existing convention in that directory. 39 # directory, following the existing convention in that directory.
44@@ -430,8 +430,8 @@ subdir('data') 40@@ -378,8 +378,8 @@ subdir('src')
45 subdir('docs') 41 subdir('docs')
46 42
47 test_c_args = tracker_c_args + [ 43 test_c_args = tracker_c_args + [
48- '-DTOP_BUILDDIR="@0@/"'.format(meson.build_root()), 44- '-DTOP_BUILDDIR="@0@/"'.format(meson.project_build_root()),
49- '-DTOP_SRCDIR="@0@/"'.format(meson.source_root()), 45- '-DTOP_SRCDIR="@0@/"'.format(meson.project_source_root()),
50+ '-DTOP_BUILDDIR="@0@/"'.format(''), 46+ '-DTOP_BUILDDIR="@0@/"'.format(''),
51+ '-DTOP_SRCDIR="@0@/"'.format('/usr/src/debug/tracker'), 47+ '-DTOP_SRCDIR="@0@/"'.format('/usr/src/debug/tracker'),
52 ] 48 ]
53 49
54 if get_option('tests_tap_protocol') 50 if get_option('tests_tap_protocol')
55diff --git a/src/common/tracker-landlock.c b/src/common/tracker-landlock.c 51diff --git a/src/common/tracker-landlock.c b/src/common/tracker-landlock.c
56index 0ad90d0..354f5d1 100644 52index a3f390585..778ae62d9 100644
57--- a/src/common/tracker-landlock.c 53--- a/src/common/tracker-landlock.c 2026-03-15 01:40:56.000000000 +0100
58+++ b/src/common/tracker-landlock.c 54+++ b/src/common/tracker-landlock.c 2026-03-26 16:49:16.948259117 +0100
59@@ -283,7 +283,7 @@ tracker_landlock_init (const gchar * const *indexed_folders) 55@@ -299,7 +299,7 @@
60 LANDLOCK_ACCESS_FS_READ_DIR); 56 LANDLOCK_ACCESS_FS_READ_DIR);
61 } 57 }
62 } 58 }
@@ -65,7 +61,7 @@ index 0ad90d0..354f5d1 100644
65 current_dir = g_get_current_dir (); 61 current_dir = g_get_current_dir ();
66 62
67 /* Detect running in-tree */ 63 /* Detect running in-tree */
68@@ -303,7 +303,7 @@ tracker_landlock_init (const gchar * const *indexed_folders) 64@@ -319,7 +319,7 @@
69 in_tree_rules[i].flags); 65 in_tree_rules[i].flags);
70 } 66 }
71 } 67 }
@@ -74,43 +70,28 @@ index 0ad90d0..354f5d1 100644
74 /* Add user cache for readonly databases */ 70 /* Add user cache for readonly databases */
75 #ifdef MINER_FS_CACHE_LOCATION 71 #ifdef MINER_FS_CACHE_LOCATION
76 add_rule (landlock_fd, MINER_FS_CACHE_LOCATION, 72 add_rule (landlock_fd, MINER_FS_CACHE_LOCATION,
77diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build 73--- a/src/indexer/meson.build 2026-03-15 01:40:56.000000000 +0100
78index 1e16618..286580a 100644 74+++ b/src/indexer/meson.build 2026-03-26 16:55:09.020362168 +0100
79--- a/src/indexer/meson.build 75@@ -91,9 +91,9 @@ executable('localsearch-@0@'.format(tracker_api_major),
80+++ b/src/indexer/meson.build
81@@ -68,8 +68,8 @@ executable('localsearch-@0@'.format(tracker_api_major),
82 dependencies: tracker_miner_fs_deps, 76 dependencies: tracker_miner_fs_deps,
83 c_args: [ 77 c_args: [
84 tracker_c_args, 78 tracker_c_args,
85- '-DBUILDROOT="@0@"'.format(meson.global_build_root()), 79- '-DBUILDROOT="@0@"'.format(meson.global_build_root()),
86- '-DBUILD_EXTRACTDIR="@0@"'.format(meson.build_root() / 'src' / 'extractor'), 80- '-DBUILDDIR="@0@"'.format(meson.current_build_dir()),
81- '-DBUILD_EXTRACTDIR="@0@"'.format(meson.project_build_root() / 'src' / 'extractor'),
87+ '-DBUILDROOT="@0@"'.format(get_option('prefix') / 'src'), 82+ '-DBUILDROOT="@0@"'.format(get_option('prefix') / 'src'),
83+ '-DBUILDDIR="@0@"'.format(''),
88+ '-DBUILD_EXTRACTDIR="@0@"'.format(get_option('prefix') / 'src' / 'extractor'), 84+ '-DBUILD_EXTRACTDIR="@0@"'.format(get_option('prefix') / 'src' / 'extractor'),
89 '-DLIBEXECDIR="@0@"'.format(get_option('prefix') / get_option('libexecdir')), 85 '-DLIBEXECDIR="@0@"'.format(get_option('prefix') / get_option('libexecdir')),
90 ], 86 ],
91 install: true, 87 install: true,
92diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build 88--- a/tests/indexer/meson.build 2026-03-15 01:40:56.000000000 +0100
93index 2584881..31411f2 100644 89+++ b/tests/indexer/meson.build 2026-03-26 17:01:29.686224071 +0100
94--- a/src/extractor/meson.build 90@@ -18,7 +18,7 @@
95+++ b/src/extractor/meson.build
96@@ -158,7 +158,7 @@ endif
97 executable('localsearch-extractor-@0@'.format(tracker_api_major),
98 tracker_extract_sources,
99 # Manually add the root dir to work around https://github.com/mesonbuild/meson/issues/1387
100- c_args: tracker_c_args + ['-I' + meson.build_root()],
101+ c_args: tracker_c_args,
102 export_dynamic: true,
103 dependencies: tracker_extract_dependencies,
104 install: true,
105diff --git a/tests/tracker-miner-fs/meson.build b/tests/tracker-miner-fs/meson.build
106index 8c081fd..9792082 100644
107--- a/tests/indexer/meson.build
108+++ b/tests/indexer/meson.build
109@@ -18,7 +18,7 @@ libtracker_miner_test_c_args = [
110 ] 91 ]
111 92
112 libtracker_miner_test_environment = environment() 93 libtracker_miner_test_environment = environment()
113-libtracker_miner_test_environment.set('GSETTINGS_SCHEMA_DIR', join_paths(meson.build_root(), 'data')) 94-libtracker_miner_test_environment.set('GSETTINGS_SCHEMA_DIR', join_paths(meson.project_build_root(), 'data'))
114+libtracker_miner_test_environment.set('GSETTINGS_SCHEMA_DIR', '/usr/src/debug/tracker-miners/data') 95+libtracker_miner_test_environment.set('GSETTINGS_SCHEMA_DIR', '/usr/src/debug/tracker-miners/data')
115 96
116 libtracker_miner_test_deps = [tracker_miners_common_dep, tracker_miner_dep, tracker_sparql] 97 libtracker_miner_test_deps = [tracker_miners_common_dep, tracker_miner_dep, tracker_sparql]
diff --git a/meta-gnome/recipes-gnome/tracker/localsearch_3.9.0.bb b/meta-gnome/recipes-gnome/tracker/localsearch_3.11.0.bb
index ffea1f76b3..d49482cfec 100644
--- a/meta-gnome/recipes-gnome/tracker/localsearch_3.9.0.bb
+++ b/meta-gnome/recipes-gnome/tracker/localsearch_3.11.0.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] = "d42f408dc3fb28fe54f5a9abbf5f1decf5818db9c2e9ec51c09464bdfd0c14b9" 21SRC_URI[archive.sha256sum] = "c6774761a8b9f4a06f6812f1c8078bee2e937d65e376c3d2338b78993e5f4666"
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"
@@ -38,6 +38,7 @@ PACKAGECONFIG ??= " \
38 tiff \ 38 tiff \
39 raw \ 39 raw \
40 xml \ 40 xml \
41 zip \
41 ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \ 42 ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \
42 battery \ 43 battery \
43" 44"
@@ -62,6 +63,7 @@ PACKAGECONFIG[png] = "-Dpng=enabled,-Dpng=disabled,libpng"
62PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff" 63PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff"
63PACKAGECONFIG[raw] = "-Draw=enabled,-Draw=disabled,libraw" 64PACKAGECONFIG[raw] = "-Draw=enabled,-Draw=disabled,libraw"
64PACKAGECONFIG[xml] = "-Dxml=enabled,-Dxml=disabled,libxml2" 65PACKAGECONFIG[xml] = "-Dxml=enabled,-Dxml=disabled,libxml2"
66PACKAGECONFIG[zip] = "-Dzip=enabled,-Dzip=disabled,libzip"
65PACKAGECONFIG[landlock] = "-Dlandlock=enabled,-Dlandlock=disabled" 67PACKAGECONFIG[landlock] = "-Dlandlock=enabled,-Dlandlock=disabled"
66 68
67# For security reasons it is strongly recommended to set add meta-security in 69# For security reasons it is strongly recommended to set add meta-security in
@@ -69,7 +71,7 @@ PACKAGECONFIG[landlock] = "-Dlandlock=enabled,-Dlandlock=disabled"
69PACKAGECONFIG[seccomp] = "-Dseccomp=true,-Dseccomp=false,libseccomp" 71PACKAGECONFIG[seccomp] = "-Dseccomp=true,-Dseccomp=false,libseccomp"
70 72
71EXTRA_OEMESON += " \ 73EXTRA_OEMESON += " \
72 -Dman=false \ 74 -Dman=false -Dfunctional_tests=false \
73 -Dsystemd_user_services=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)} \ 75 -Dsystemd_user_services=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)} \
74 -Dsystemd_user_services_dir=${systemd_user_unitdir} \ 76 -Dsystemd_user_services_dir=${systemd_user_unitdir} \
75" 77"
diff --git a/meta-gnome/recipes-gnome/tracker/tinysparql_3.10.1.bb b/meta-gnome/recipes-gnome/tracker/tinysparql_3.11.0.bb
index aba8f12976..522cfb3d23 100644
--- a/meta-gnome/recipes-gnome/tracker/tinysparql_3.10.1.bb
+++ b/meta-gnome/recipes-gnome/tracker/tinysparql_3.11.0.bb
@@ -20,7 +20,7 @@ inherit gettext gnomebase gobject-introspection vala gi-docgen bash-completion
20 20
21SRC_URI += "file://0001-fix-reproducibility.patch" 21SRC_URI += "file://0001-fix-reproducibility.patch"
22SRC_URI += "file://0001-src-libtracker-sparql-meson.build-dont-create-compat.patch" 22SRC_URI += "file://0001-src-libtracker-sparql-meson.build-dont-create-compat.patch"
23SRC_URI[archive.sha256sum] = "5a7f3e789db6671a550ed6280ed4f60a60bea77368da92be68dc7d8d7e230265" 23SRC_URI[archive.sha256sum] = "011e758a53f31112a8c45700fd6039ae55617f0dac70119d9eddafc03cf68fe5"
24 24
25# text search is not an option anymore and requires sqlite3 build with 25# text search is not an option anymore and requires sqlite3 build with
26# PACKAGECONFIG[fts5] set (default) 26# PACKAGECONFIG[fts5] set (default)
diff --git a/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb b/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb
index e1c9324940..4ebb5bb3b3 100644
--- a/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb
+++ b/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb
@@ -23,12 +23,6 @@ DEPENDS += " \
23 webkitgtk3 \ 23 webkitgtk3 \
24 yelp-xsl \ 24 yelp-xsl \
25" 25"
26PACKAGECONFIG_SOUP ?= "soup3"
27PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}"
28
29PACKAGECONFIG[soup2] = "--with-webkit2gtk-4-0,,"
30PACKAGECONFIG[soup3] = ",--with-webkit2gtk-4-0,"
31
32 26
33do_configure:prepend() { 27do_configure:prepend() {
34 export ITSTOOL=${STAGING_BINDIR_NATIVE}/itstool 28 export ITSTOOL=${STAGING_BINDIR_NATIVE}/itstool
diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice_23.13.9.bb b/meta-gnome/recipes-support/accountsservice/accountsservice_23.13.9.bb
index c024ae3f92..f0c68ed62a 100644
--- a/meta-gnome/recipes-support/accountsservice/accountsservice_23.13.9.bb
+++ b/meta-gnome/recipes-support/accountsservice/accountsservice_23.13.9.bb
@@ -24,7 +24,7 @@ SRC_URI:append:libc-musl = " \
24 file://0002-musl-add-missing-fgetspent_r.patch \ 24 file://0002-musl-add-missing-fgetspent_r.patch \
25" 25"
26 26
27EXTRA_OEMESON:libc-musl += "-Dwtmpfile=/var/log/wtmp -Dtests=false" 27EXTRA_OEMESON:append:libc-musl = " -Dwtmpfile=/var/log/wtmp -Dtests=false"
28 28
29SRC_URI[sha256sum] = "adda4cdeae24fa0992e7df3ffff9effa7090be3ac233a3edfdf69d5a9c9b924f" 29SRC_URI[sha256sum] = "adda4cdeae24fa0992e7df3ffff9effa7090be3ac233a3edfdf69d5a9c9b924f"
30 30
diff --git a/meta-gnome/recipes-support/libwacom/libwacom_2.8.0.bb b/meta-gnome/recipes-support/libwacom/libwacom_2.18.0.bb
index f816cdf239..7bbeb5583a 100644
--- a/meta-gnome/recipes-support/libwacom/libwacom_2.8.0.bb
+++ b/meta-gnome/recipes-support/libwacom/libwacom_2.18.0.bb
@@ -7,12 +7,13 @@ BUGTRACKER = "https://github.com/linuxwacom/libwacom/issues"
7LICENSE = "MIT" 7LICENSE = "MIT"
8LIC_FILES_CHKSUM = "file://COPYING;md5=40a21fffb367c82f39fd91a3b137c36e" 8LIC_FILES_CHKSUM = "file://COPYING;md5=40a21fffb367c82f39fd91a3b137c36e"
9 9
10SRC_URI = "git://github.com/linuxwacom/libwacom.git;branch=master;protocol=https" 10SRC_URI = "git://github.com/linuxwacom/libwacom.git;branch=master;protocol=https;tag=${BP}"
11SRCREV = "f5b92814320d0a5745b50b7b36103843ad23e299" 11SRCREV = "44df53b14b008a8252427aa6b41128efada43b3a"
12 12
13DEPENDS = " \ 13DEPENDS = " \
14 libxml2-native \ 14 libxml2-native \
15 libgudev \ 15 libgudev \
16 libevdev \
16" 17"
17 18
18 19
diff --git a/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch b/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch
deleted file mode 100644
index 9fb2cd6814..0000000000
--- a/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch
+++ /dev/null
@@ -1,69 +0,0 @@
1From 71804c06c7179333f44b57e04ba268f37fe54f62 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 13 Jul 2017 09:01:04 -0700
4Subject: [PATCH] pypredict/lm: Define error API if platform does not have it
5
6error() API is not implemented across all libcs on linux
7e.g. musl does not provide it.
8
9Upstream-Status: Pending
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 Onboard/pypredict/lm/lm.cpp | 1 -
14 Onboard/pypredict/lm/lm.h | 13 +++++++++++++
15 Onboard/pypredict/lm/lm_dynamic.cpp | 2 --
16 3 files changed, 13 insertions(+), 3 deletions(-)
17
18diff --git a/Onboard/pypredict/lm/lm.cpp b/Onboard/pypredict/lm/lm.cpp
19index 2e642965..37ae241e 100644
20--- a/Onboard/pypredict/lm/lm.cpp
21+++ b/Onboard/pypredict/lm/lm.cpp
22@@ -19,7 +19,6 @@
23
24 #include <stdlib.h>
25 #include <stdio.h>
26-#include <error.h>
27 #include <algorithm>
28 #include <cmath>
29 #include <string>
30diff --git a/Onboard/pypredict/lm/lm.h b/Onboard/pypredict/lm/lm.h
31index ed4164a4..b8b63ee8 100644
32--- a/Onboard/pypredict/lm/lm.h
33+++ b/Onboard/pypredict/lm/lm.h
34@@ -32,6 +32,19 @@
35 #include <algorithm>
36 #include <string>
37
38+#if defined(HAVE_ERROR_H)
39+#include <error.h>
40+#else
41+#include <err.h>
42+#define _onboard_error(S, E, F, ...) do { \
43+ if (E) \
44+ err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \
45+ else \
46+ err(S, F, ##__VA_ARGS__); \
47+} while(0)
48+
49+#define error _onboard_error
50+#endif
51
52 // break into debugger
53 // step twice to come back out of the raise() call into known code
54diff --git a/Onboard/pypredict/lm/lm_dynamic.cpp b/Onboard/pypredict/lm/lm_dynamic.cpp
55index 7c628240..e7c7f40e 100644
56--- a/Onboard/pypredict/lm/lm_dynamic.cpp
57+++ b/Onboard/pypredict/lm/lm_dynamic.cpp
58@@ -17,8 +17,6 @@
59 * along with this program. If not, see <http://www.gnu.org/licenses/>.
60 */
61
62-#include <error.h>
63-
64 #include "lm_dynamic.h"
65
66 using namespace std;
67--
682.34.1
69
diff --git a/meta-gnome/recipes-support/onboard/onboard_1.4.3-9.bb b/meta-gnome/recipes-support/onboard/onboard_1.4.4-1.bb
index d544f169f8..a069fb692e 100644
--- a/meta-gnome/recipes-support/onboard/onboard_1.4.3-9.bb
+++ b/meta-gnome/recipes-support/onboard/onboard_1.4.4-1.bb
@@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING.GPL3;md5=8521fa4dd51909b407c5150498d34f4e \
10 file://COPYING.BSD3;md5=f56403ae5b2d6b82ad136d753c05a82e \ 10 file://COPYING.BSD3;md5=f56403ae5b2d6b82ad136d753c05a82e \
11 " 11 "
12 12
13SRC_URI = "git://github.com/onboard-osk/onboard.git;protocol=https;branch=main \ 13SRC_URI = "git://github.com/onboard-osk/onboard.git;protocol=https;branch=main;tag=${PV} \
14 file://0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch \
15 file://0002-toggle-onboard-hoverclick-use-bin-sh-default-shell-i.patch \ 14 file://0002-toggle-onboard-hoverclick-use-bin-sh-default-shell-i.patch \
16 " 15 "
17SRCREV = "350f7643576bc8c5f2cff9c6ddce0e1e7cff995d" 16SRCREV = "02b19e2aee88e4bf2cdc7094813ddd4a6c05d1e7"
18 17
19inherit features_check setuptools3 pkgconfig gtk-icon-cache gsettings mime-xdg 18inherit features_check setuptools3 pkgconfig gtk-icon-cache gsettings mime-xdg
20 19
diff --git a/meta-gnome/recipes-support/webp-pixbuf-loader/webp-pixbuf-loader_0.2.7.bb b/meta-gnome/recipes-support/webp-pixbuf-loader/webp-pixbuf-loader_0.2.7.bb
index 726139a6b3..00cea42ca9 100644
--- a/meta-gnome/recipes-support/webp-pixbuf-loader/webp-pixbuf-loader_0.2.7.bb
+++ b/meta-gnome/recipes-support/webp-pixbuf-loader/webp-pixbuf-loader_0.2.7.bb
@@ -12,7 +12,7 @@ inherit meson pkgconfig
12 12
13EXTRA_OEMESON = "-Dupdate_cache=true" 13EXTRA_OEMESON = "-Dupdate_cache=true"
14 14
15SRC_URI = "git://github.com/aruiz/webp-pixbuf-loader.git;protocol=https;branch=mainline" 15SRC_URI = "git://github.com/aruiz/webp-pixbuf-loader.git;protocol=https;branch=mainline;tag=${PV}"
16 16
17SRCREV = "52232e4ba282b2fed68e8fcb4b5d45ed0eaa4ed3" 17SRCREV = "52232e4ba282b2fed68e8fcb4b5d45ed0eaa4ed3"
18 18
diff --git a/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_49.0.bb b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_50.0.bb
index 21fe18039f..00ef8a5d97 100644
--- a/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_49.0.bb
+++ b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_50.0.bb
@@ -21,7 +21,7 @@ inherit gnomebase pkgconfig gsettings features_check
21 21
22REQUIRED_DISTRO_FEATURES = "polkit" 22REQUIRED_DISTRO_FEATURES = "polkit"
23 23
24SRC_URI[archive.sha256sum] = "401dafcdf8cb911f09c08d2813f774dd864127abfca93ff4caf1fc4c9b5ec4d2" 24SRC_URI[archive.sha256sum] = "ceeef2fb68b34b3f66a3def0a332a22a70af272641fb6c50065b7a2fde3d5759"
25 25
26PACKAGECONFIG ?= "screenshot screencast ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" 26PACKAGECONFIG ?= "screenshot screencast ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}"
27PACKAGECONFIG[wayland] = ",,wayland-native" 27PACKAGECONFIG[wayland] = ",,wayland-native"
diff --git a/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gtk_1.15.3.bb b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gtk_1.15.3.bb
index 5e83a07a4b..612eb4b815 100644
--- a/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gtk_1.15.3.bb
+++ b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gtk_1.15.3.bb
@@ -15,7 +15,7 @@ inherit gettext meson pkgconfig gsettings features_check
15 15
16REQUIRED_DISTRO_FEATURES = "polkit" 16REQUIRED_DISTRO_FEATURES = "polkit"
17 17
18SRC_URI = "git://github.com/flatpak/xdg-desktop-portal-gtk.git;protocol=https;branch=main" 18SRC_URI = "git://github.com/flatpak/xdg-desktop-portal-gtk.git;protocol=https;branch=main;tag=${PV}"
19 19
20SRCREV = "337202d4e7179857bc37b03c1a6d8c9d92e47c44" 20SRCREV = "337202d4e7179857bc37b03c1a6d8c9d92e47c44"
21 21