summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-gnome/recipes-gnome/tracker/tinysparql/0001-fix-reproducibility.patch27
-rw-r--r--meta-gnome/recipes-gnome/tracker/tinysparql_3.8.1.bb (renamed from meta-gnome/recipes-gnome/tracker/tinysparql_3.8.0.bb)2
2 files changed, 9 insertions, 20 deletions
diff --git a/meta-gnome/recipes-gnome/tracker/tinysparql/0001-fix-reproducibility.patch b/meta-gnome/recipes-gnome/tracker/tinysparql/0001-fix-reproducibility.patch
index 23da5bb97e..67c0bdfebc 100644
--- a/meta-gnome/recipes-gnome/tracker/tinysparql/0001-fix-reproducibility.patch
+++ b/meta-gnome/recipes-gnome/tracker/tinysparql/0001-fix-reproducibility.patch
@@ -1,4 +1,4 @@
1From 1eec06fc1ef26e4954507001c1c2f981eab8d77d Mon Sep 17 00:00:00 2001 1From e4552b9c5dbe8816266f332c5e20796d46eb5b16 Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de> 2From: Markus Volk <f_l_k@t-online.de>
3Date: Mon, 18 Sep 2023 02:47:55 +0200 3Date: Mon, 18 Sep 2023 02:47:55 +0200
4Subject: [PATCH] tracker: fix reproducibility issue 4Subject: [PATCH] tracker: fix reproducibility issue
@@ -14,13 +14,12 @@ Signed-off-by: Markus Volk <f_l_k@t-online.de>
14--- 14---
15 meson.build | 6 +++--- 15 meson.build | 6 +++---
16 src/libtracker-common/meson.build | 4 ++-- 16 src/libtracker-common/meson.build | 4 ++--
17 src/libtracker-http/meson.build | 8 ++++---- 17 src/libtracker-http/tracker-http.c | 2 +-
18 src/libtracker-http/tracker-http.c | 4 ++--
19 src/libtracker-sparql/meson.build | 4 ++-- 18 src/libtracker-sparql/meson.build | 4 ++--
20 5 files changed, 13 insertions(+), 13 deletions(-) 19 4 files changed, 8 insertions(+), 8 deletions(-)
21 20
22diff --git a/meson.build b/meson.build 21diff --git a/meson.build b/meson.build
23index 41c00fafc..6e7282cb7 100644 22index 8552c6d..d72ff52 100644
24--- a/meson.build 23--- a/meson.build
25+++ b/meson.build 24+++ b/meson.build
26@@ -333,7 +333,7 @@ have_rtld_noload = cc.has_header_symbol('dlfcn.h', 'RTLD_NOLOAD') 25@@ -333,7 +333,7 @@ have_rtld_noload = cc.has_header_symbol('dlfcn.h', 'RTLD_NOLOAD')
@@ -44,7 +43,7 @@ index 41c00fafc..6e7282cb7 100644
44 43
45 tracker_uninstalled_cli_dir = join_paths(meson.current_build_dir(), 'src', 'tracker') 44 tracker_uninstalled_cli_dir = join_paths(meson.current_build_dir(), 'src', 'tracker')
46diff --git a/src/libtracker-common/meson.build b/src/libtracker-common/meson.build 45diff --git a/src/libtracker-common/meson.build b/src/libtracker-common/meson.build
47index 72c2ae073..12218c870 100644 46index 72c2ae0..12218c8 100644
48--- a/src/libtracker-common/meson.build 47--- a/src/libtracker-common/meson.build
49+++ b/src/libtracker-common/meson.build 48+++ b/src/libtracker-common/meson.build
50@@ -51,10 +51,10 @@ libtracker_common = static_library('tracker-common', 49@@ -51,10 +51,10 @@ libtracker_common = static_library('tracker-common',
@@ -61,10 +60,10 @@ index 72c2ae073..12218c870 100644
61 include_directories: [configinc, srcinc], 60 include_directories: [configinc, srcinc],
62 gnu_symbol_visibility: 'hidden', 61 gnu_symbol_visibility: 'hidden',
63diff --git a/src/libtracker-http/tracker-http.c b/src/libtracker-http/tracker-http.c 62diff --git a/src/libtracker-http/tracker-http.c b/src/libtracker-http/tracker-http.c
64index dd82e9928..3cc68b240 100644 63index dd82e99..cb3f1f7 100644
65--- a/src/libtracker-http/tracker-http.c 64--- a/src/libtracker-http/tracker-http.c
66+++ b/src/libtracker-http/tracker-http.c 65+++ b/src/libtracker-http/tracker-http.c
67@@ -53,13 +53,13 @@ ensure_types (void) 66@@ -53,7 +53,7 @@ ensure_types (void)
68 67
69 current_dir = g_get_current_dir (); 68 current_dir = g_get_current_dir ();
70 69
@@ -73,15 +72,8 @@ index dd82e9928..3cc68b240 100644
73 /* Detect in-build runtime of this code, this may happen 72 /* Detect in-build runtime of this code, this may happen
74 * building introspection information or running tests. 73 * building introspection information or running tests.
75 * We want the in-tree modules to be loaded then. 74 * We want the in-tree modules to be loaded then.
76 */
77 module_path = g_strdup_printf (BUILD_LIBDIR "/%s", modules[i]);
78- } else {
79+ } else {
80 module_path = g_strdup_printf (PRIVATE_LIBDIR "/%s", modules[i]);
81 }
82
83diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build 75diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build
84index 5eccb92fc..161f6ea21 100644 76index 5eccb92..161f6ea 100644
85--- a/src/libtracker-sparql/meson.build 77--- a/src/libtracker-sparql/meson.build
86+++ b/src/libtracker-sparql/meson.build 78+++ b/src/libtracker-sparql/meson.build
87@@ -102,10 +102,10 @@ libtracker_sparql_private = static_library('tracker-sparql-private', 79@@ -102,10 +102,10 @@ libtracker_sparql_private = static_library('tracker-sparql-private',
@@ -97,6 +89,3 @@ index 5eccb92fc..161f6ea21 100644
97 ] + tracker_c_args, 89 ] + tracker_c_args,
98 90
99 dependencies: [libtracker_sparql_dependencies], 91 dependencies: [libtracker_sparql_dependencies],
100--
1012.46.0
102
diff --git a/meta-gnome/recipes-gnome/tracker/tinysparql_3.8.0.bb b/meta-gnome/recipes-gnome/tracker/tinysparql_3.8.1.bb
index 628384464d..0da2d1764c 100644
--- a/meta-gnome/recipes-gnome/tracker/tinysparql_3.8.0.bb
+++ b/meta-gnome/recipes-gnome/tracker/tinysparql_3.8.1.bb
@@ -20,7 +20,7 @@ inherit gettext gnomebase gobject-introspection vala gtk-doc 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] = "c0fcda77520f531548b2395137dcd193ee9cde5e222d3c9d273f030d1762a504" 23SRC_URI[archive.sha256sum] = "53e04add1ecb4d08caa1317f477fdf0e7148eaac5462831f2374880092ffb295"
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)