mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
tinysparql: update 3.8.2 -> 3.9.1
- rework patches after directory refactor - use gi-docgen instead of gtk-doc - add graphviz-native as a dependency for api-documentation as we now need to provide dot NEW in 3.9.1 - 2025-03-17 ========================= * Brown paper bag release NEW in 3.9.0 - 2025-03-16 ========================= * Many fuzzing fixes * Multiple coverity fixes NEW in 3.9.rc - 2025-03-02 ========================== * Multiple fixes to issues found by OSS fuzz * Restructure project directories * Error handling fixes in SPARQL updates via D-Bus NEW in 3.9.alpha - 2025-01-11 ============================= * Hide again unintentionally leaked tracker_http_* symbols * A number of fixes to static linking Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Markus Volk
Khem Raj
parent
739c438d9a
commit
0b21d63e3a
|
|
@ -1,4 +1,4 @@
|
|||
From dd163864c5ee28e153e982e47502039dad2f3787 Mon Sep 17 00:00:00 2001
|
||||
From 186d91759dd0e0815f5a9d3a709e2ececa24ff3d Mon Sep 17 00:00:00 2001
|
||||
From: Markus Volk <f_l_k@t-online.de>
|
||||
Date: Mon, 18 Sep 2023 02:47:55 +0200
|
||||
Subject: [PATCH] tracker: fix reproducibility issue
|
||||
|
|
@ -12,17 +12,17 @@ Upstream-Status: Inappropriate [oe-specific]
|
|||
|
||||
Signed-off-by: Markus Volk <f_l_k@t-online.de>
|
||||
---
|
||||
meson.build | 6 +++---
|
||||
src/libtracker-common/meson.build | 4 ++--
|
||||
src/libtracker-http/tracker-http.c | 2 +-
|
||||
src/libtracker-sparql/meson.build | 4 ++--
|
||||
meson.build | 6 +++---
|
||||
src/common/meson.build | 4 ++--
|
||||
src/http/tracker-http.c | 2 +-
|
||||
src/libtinysparql/meson.build | 4 ++--
|
||||
4 files changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 3a624ad..8c02aad 100644
|
||||
index 308ada3..0120be7 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -333,7 +333,7 @@ have_rtld_noload = cc.has_header_symbol('dlfcn.h', 'RTLD_NOLOAD')
|
||||
@@ -341,7 +341,7 @@ have_rtld_noload = cc.has_header_symbol('dlfcn.h', 'RTLD_NOLOAD')
|
||||
conf.set('HAVE_RTLD_NOLOAD', have_rtld_noload)
|
||||
|
||||
# Config that goes in some other generated files (.desktop, .service, etc)
|
||||
|
|
@ -31,8 +31,8 @@ index 3a624ad..8c02aad 100644
|
|||
conf.set('libexecdir', join_paths(get_option('prefix'), get_option('libexecdir')))
|
||||
|
||||
configure_file(input: 'config.h.meson.in',
|
||||
@@ -372,8 +372,8 @@ subdir('docs')
|
||||
subdir('utils')
|
||||
@@ -382,8 +382,8 @@ subdir('utils')
|
||||
subdir('fuzzing')
|
||||
|
||||
test_c_args = tracker_c_args + [
|
||||
- '-DTOP_BUILDDIR="@0@"'.format(build_root),
|
||||
|
|
@ -41,12 +41,12 @@ index 3a624ad..8c02aad 100644
|
|||
+ '-DTOP_SRCDIR="@0@/"'.format('/usr/src/debug/tracker'),
|
||||
]
|
||||
|
||||
tracker_uninstalled_cli_dir = join_paths(meson.current_build_dir(), 'src', 'tracker')
|
||||
diff --git a/src/libtracker-common/meson.build b/src/libtracker-common/meson.build
|
||||
index 72c2ae0..12218c8 100644
|
||||
--- a/src/libtracker-common/meson.build
|
||||
+++ b/src/libtracker-common/meson.build
|
||||
@@ -51,10 +51,10 @@ libtracker_common = static_library('tracker-common',
|
||||
tracker_uninstalled_testutils_dir = join_paths(meson.current_source_dir(), 'utils')
|
||||
diff --git a/src/common/meson.build b/src/common/meson.build
|
||||
index b961ec3..edd76ce 100644
|
||||
--- a/src/common/meson.build
|
||||
+++ b/src/common/meson.build
|
||||
@@ -70,10 +70,10 @@ libtracker_common = static_library('tracker-common',
|
||||
dependencies: [tracker_common_dependencies, gmodule],
|
||||
c_args: [
|
||||
'-DPRIVATE_LIBDIR="@0@"'.format(tracker_internal_libs_dir),
|
||||
|
|
@ -59,10 +59,10 @@ index 72c2ae0..12218c8 100644
|
|||
] + tracker_c_args,
|
||||
include_directories: [configinc, srcinc],
|
||||
gnu_symbol_visibility: 'hidden',
|
||||
diff --git a/src/libtracker-http/tracker-http.c b/src/libtracker-http/tracker-http.c
|
||||
diff --git a/src/http/tracker-http.c b/src/http/tracker-http.c
|
||||
index dd82e99..cb3f1f7 100644
|
||||
--- a/src/libtracker-http/tracker-http.c
|
||||
+++ b/src/libtracker-http/tracker-http.c
|
||||
--- a/src/http/tracker-http.c
|
||||
+++ b/src/http/tracker-http.c
|
||||
@@ -53,7 +53,7 @@ ensure_types (void)
|
||||
|
||||
current_dir = g_get_current_dir ();
|
||||
|
|
@ -72,13 +72,13 @@ index dd82e99..cb3f1f7 100644
|
|||
/* Detect in-build runtime of this code, this may happen
|
||||
* building introspection information or running tests.
|
||||
* We want the in-tree modules to be loaded then.
|
||||
diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build
|
||||
index bafc2ac..859da3e 100644
|
||||
--- a/src/libtracker-sparql/meson.build
|
||||
+++ b/src/libtracker-sparql/meson.build
|
||||
diff --git a/src/libtinysparql/meson.build b/src/libtinysparql/meson.build
|
||||
index e229b51..031f7e1 100644
|
||||
--- a/src/libtinysparql/meson.build
|
||||
+++ b/src/libtinysparql/meson.build
|
||||
@@ -103,10 +103,10 @@ libtracker_sparql_private = static_library('tracker-sparql-private',
|
||||
c_args: [
|
||||
'-include', 'libtracker-sparql/tracker-private.h',
|
||||
'-include', 'tracker-private.h',
|
||||
'-DPRIVATE_LIBDIR="@0@"'.format(tracker_internal_libs_dir),
|
||||
- '-DBUILD_LIBDIR="@0@"'.format(meson.current_build_dir()),
|
||||
+ '-DBUILD_LIBDIR="@0@"'.format('/usr/src/debug/tracker'),
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@ Upstream-Status: Inappropriate [oe-specific]
|
|||
|
||||
Signed-off-by: Markus Volk <f_l_k@t-online.de>
|
||||
---
|
||||
src/libtracker-sparql/meson.build | 2 +-
|
||||
src/libtinysparql/meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build
|
||||
diff --git a/src/libtinysparql/meson.build b/src/libtinysparql/meson.build
|
||||
index 5eccb92fc..6ed7c2b1f 100644
|
||||
--- a/src/libtracker-sparql/meson.build
|
||||
+++ b/src/libtracker-sparql/meson.build
|
||||
--- a/src/libtinysparql/meson.build
|
||||
+++ b/src/libtinysparql/meson.build
|
||||
@@ -247,6 +247,6 @@ endif
|
||||
|
||||
tracker_sparql_uninstalled_dir = meson.current_build_dir()
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@ DEPENDS = " \
|
|||
libstemmer \
|
||||
"
|
||||
|
||||
inherit gettext gnomebase gobject-introspection vala gtk-doc bash-completion
|
||||
inherit gettext gnomebase gobject-introspection vala gi-docgen bash-completion
|
||||
|
||||
SRC_URI += "file://0001-fix-reproducibility.patch"
|
||||
SRC_URI += "file://0001-src-libtracker-sparql-meson.build-dont-create-compat.patch"
|
||||
SRC_URI[archive.sha256sum] = "bb8643386c8edc591a03205d4a0eda661dcdd2094473bffb9bbdb94e93589cb2"
|
||||
SRC_URI[archive.sha256sum] = "98e8933b946d8c54a77eadabd7f1d14cddd88fa43eef0d0ace3c0fcce646722b"
|
||||
|
||||
# text search is not an option anymore and requires sqlite3 build with
|
||||
# PACKAGECONFIG[fts5] set (default)
|
||||
|
|
@ -43,13 +43,18 @@ EXTRA_OEMESON = " \
|
|||
|
||||
GIR_MESON_ENABLE_FLAG = 'enabled'
|
||||
GIR_MESON_DISABLE_FLAG = 'disabled'
|
||||
GIDOCGEN_MESON_OPTION = "docs"
|
||||
|
||||
PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "zeroconf", "avahi", "", d)}"
|
||||
PACKAGECONFIG ??= " \
|
||||
${@bb.utils.contains("DISTRO_FEATURES", "zeroconf", "avahi", "", d)} \
|
||||
${@bb.utils.contains("DISTRO_FEATURES", "api-documentation", "docs", "", d)} \
|
||||
"
|
||||
PACKAGECONFIG[avahi] = "-Davahi=enabled,-Davahi=disabled,avahi,"
|
||||
PACKAGECONFIG[docs] = ",,graphviz-native"
|
||||
|
||||
do_install:prepend() {
|
||||
sed -i -e 's|${B}|${TARGET_DBGSRC_DIR}|g' ${B}/src/libtracker-sparql/tracker-sparql-enum-types.c
|
||||
sed -i -e 's|${B}|${TARGET_DBGSRC_DIR}|g' ${B}/src/libtracker-sparql/core/tracker-data-enum-types.c
|
||||
sed -i -e 's|${B}|${TARGET_DBGSRC_DIR}|g' ${B}/src/libtinysparql/tracker-sparql-enum-types.c
|
||||
sed -i -e 's|${B}|${TARGET_DBGSRC_DIR}|g' ${B}/src/libtinysparql/core/tracker-data-enum-types.c
|
||||
}
|
||||
|
||||
FILES:${PN} += " \
|
||||
Loading…
Reference in New Issue
Block a user