summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-gnome/recipes-connectivity/geary/geary/0001-application-client.vala-hardcode-some-paths.patch40
-rw-r--r--meta-gnome/recipes-connectivity/geary/geary/0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch51
-rw-r--r--meta-gnome/recipes-connectivity/geary/geary_46.0.bb (renamed from meta-gnome/recipes-connectivity/geary/geary_44.1.bb)11
3 files changed, 44 insertions, 58 deletions
diff --git a/meta-gnome/recipes-connectivity/geary/geary/0001-application-client.vala-hardcode-some-paths.patch b/meta-gnome/recipes-connectivity/geary/geary/0001-application-client.vala-hardcode-some-paths.patch
new file mode 100644
index 0000000000..8162e50d9b
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/geary/geary/0001-application-client.vala-hardcode-some-paths.patch
@@ -0,0 +1,40 @@
1From 98243ca43e40116c22f7b867e32ad27ffd314505 Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de>
3Date: Tue, 16 Jul 2024 07:30:09 +0200
4Subject: [PATCH] application-client.vala: hardcode some paths
5
6Otherwise the build values will be stored in the binary and used if geary was not installed
7https://gitlab.gnome.org/GNOME/geary/-/blob/main/src/client/application/application-client.vala?ref_type=heads#L798
8https://gitlab.gnome.org/GNOME/geary/-/blob/main/src/client/application/application-client.vala?ref_type=heads#L365
9
10This breaks reproducibility
11WARNING: geary-46.0-r0 do_package_qa: QA Issue: File /usr/lib/geary/libgeary-client-46.0.so in package geary contains reference to TMPDIR [buildpaths]
12WARNING: geary-46.0-r0 do_package_qa: QA Issue: File /usr/lib/geary/.debug/libgeary-client-46.0.so in package geary-dbg contains reference to TMPDIR [buildpaths]
13
14Upstream-Status: Inappropriate [oe-specific]
15
16Signed-off-by: Markus Volk <f_l_k@t-online.de>
17---
18 src/client/application/application-client.vala | 4 ++--
19 1 file changed, 2 insertions(+), 2 deletions(-)
20
21diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala
22index 51d0f632e..acc53a65f 100644
23--- a/src/client/application/application-client.vala
24+++ b/src/client/application/application-client.vala
25@@ -39,9 +39,9 @@ public class Application.Client : Gtk.Application {
26
27 public const string VERSION = _VERSION;
28 public const string INSTALL_PREFIX = _INSTALL_PREFIX;
29- public const string GSETTINGS_DIR = _GSETTINGS_DIR;
30- public const string SOURCE_ROOT_DIR = _SOURCE_ROOT_DIR;
31- public const string BUILD_ROOT_DIR = _BUILD_ROOT_DIR;
32+ public const string GSETTINGS_DIR = "/usr/share/applications";
33+ public const string SOURCE_ROOT_DIR = "/usr/src";
34+ public const string BUILD_ROOT_DIR = "/usr/src";
35
36 // keep these in sync with meson_options.txt
37 public const string PROFILE_RELEASE = "release";
38--
392.45.2
40
diff --git a/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch b/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch
deleted file mode 100644
index 1e0640a666..0000000000
--- a/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From a300be5877f35379bb569313eec901bda9c8d762 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 30 Apr 2023 22:08:39 -0700
4Subject: [PATCH] meson: Use PKG_CONFIG_SYSROOT_DIR when using pkg-config
5
6OE cross-builds and absolute paths found by pkg-config points to
7non-sysroot'ed locations which are not correct as they point into native
8sysroot from build machine which is incorrect.
9
10Upstream-Status: Inappropriate [OE-specific]
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 meson.build | 8 +++++---
14 1 file changed, 5 insertions(+), 3 deletions(-)
15
16diff --git a/meson.build b/meson.build
17index d563dd08..9b72aeb4 100644
18--- a/meson.build
19+++ b/meson.build
20@@ -38,6 +38,9 @@ metadata_dir = meson.project_source_root() / 'bindings'/ 'metadata'
21 po_dir = meson.project_source_root() / 'po'
22 vapi_dir = meson.project_source_root() / 'bindings' / 'vapi'
23
24+# pkg-config sysroot location
25+pkgconf_sysroot = run_command('python3', '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip()
26+
27 # Compiler configuration
28 add_project_arguments([
29 # Make sure Meson can find custom VAPIs
30@@ -120,7 +123,7 @@ icu_uc = declare_dependency(
31 if libunwind_dep.found()
32 # We need to add native lib to the search path for these so Flatpak
33 # builds can find it.
34- unwind_lib = libunwind_dep.get_variable(pkgconfig: 'libdir')
35+ unwind_lib = pkgconf_sysroot + libunwind_dep.get_variable(pkgconfig: 'libdir')
36 libunwind = declare_dependency(
37 dependencies: [
38 valac.find_library('libunwind', dirs: [vapi_dir, unwind_lib]),
39@@ -207,8 +210,7 @@ vala_unit_proj = subproject(
40 vala_unit_dep = vala_unit_proj.get_variable('vala_unit_dep')
41
42 # Language detection
43-
44-iso_codes_dir = iso_codes.get_variable(pkgconfig: 'prefix')/'share'/'xml'/'iso-codes'
45+iso_codes_dir = pkgconf_sysroot + iso_codes.get_variable(pkgconfig: 'prefix')/'share'/'xml'/'iso-codes'
46
47 iso_639_xml = get_option('iso_639_xml')
48 if iso_639_xml == ''
49--
502.40.1
51
diff --git a/meta-gnome/recipes-connectivity/geary/geary_44.1.bb b/meta-gnome/recipes-connectivity/geary/geary_46.0.bb
index decae6b2c7..d8d48ef513 100644
--- a/meta-gnome/recipes-connectivity/geary/geary_44.1.bb
+++ b/meta-gnome/recipes-connectivity/geary/geary_46.0.bb
@@ -23,6 +23,7 @@ DEPENDS = " \
23 libical \ 23 libical \
24 libpeas \ 24 libpeas \
25 libsecret \ 25 libsecret \
26 libsoup \
26 libstemmer \ 27 libstemmer \
27 libxml2 \ 28 libxml2 \
28 sqlite3 \ 29 sqlite3 \
@@ -31,15 +32,15 @@ DEPENDS = " \
31 32
32RDEPENDS:${PN} = "gnome-keyring" 33RDEPENDS:${PN} = "gnome-keyring"
33 34
34inherit meson pkgconfig mime-xdg gtk-icon-cache gobject-introspection vala features_check 35inherit meson pkgconfig mime-xdg gsettings gtk-icon-cache gobject-introspection vala features_check
35 36
36SRC_URI = " \ 37SRC_URI = " \
37 git://github.com/GNOME/geary.git;nobranch=1;protocol=https \ 38 git://github.com/GNOME/geary.git;nobranch=1;protocol=https \
38 file://0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch \ 39 file://0001-application-client.vala-hardcode-some-paths.patch \
39" 40"
40 41
41S = "${WORKDIR}/git" 42S = "${WORKDIR}/git"
42SRCREV = "37c378a563d5b1c269d57c34671edc940d1cd180" 43SRCREV = "46e93c0c0dafc381e8a308b1befb07e908121722"
43 44
44ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" 45ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
45REQUIRED_DISTRO_FEATURES = "gobject-introspection-data opengl" 46REQUIRED_DISTRO_FEATURES = "gobject-introspection-data opengl"
@@ -52,10 +53,6 @@ PACKAGECONFIG[tnef] = "-Dtnef=enabled,-Dtnef=disabled,libytnef"
52PACKAGECONFIG[valadoc] = "-Dvaladoc=enabled,-Dvaladoc=disabled" 53PACKAGECONFIG[valadoc] = "-Dvaladoc=enabled,-Dvaladoc=disabled"
53 54
54PACKAGECONFIG ??= "" 55PACKAGECONFIG ??= ""
55# rfc822/rfc822-message.c:2097:12: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'gboolean' (aka 'int') [-Wint-conversion]
56#| return NULL;
57#| ^~~~
58CFLAGS:append:toolchain-clang = " -Wno-error=int-conversion"
59 56
60FILES:${PN} += "${datadir}" 57FILES:${PN} += "${datadir}"
61 58
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-23 02:39:59 +0000