diff options
Diffstat (limited to 'app-misc/tracker/files')
| -rw-r--r-- | app-misc/tracker/files/2.1.8-doc-options.patch | 66 | ||||
| -rw-r--r-- | app-misc/tracker/files/2.1.8-fix-library-symlinks.patch | 71 | ||||
| -rw-r--r-- | app-misc/tracker/files/2.1.8-prevent-stack-smashing.patch | 39 | ||||
| -rw-r--r-- | app-misc/tracker/files/2.1.8-test-fix.patch | 49 | ||||
| -rw-r--r-- | app-misc/tracker/files/2.1.8-vala-0.44-compat.patch | 46 |
5 files changed, 0 insertions, 271 deletions
diff --git a/app-misc/tracker/files/2.1.8-doc-options.patch b/app-misc/tracker/files/2.1.8-doc-options.patch deleted file mode 100644 index 9b25349f659f..000000000000 --- a/app-misc/tracker/files/2.1.8-doc-options.patch +++ /dev/null @@ -1,66 +0,0 @@ -From cff7f988fd2ed7894c3d16144e799d994637d3cf Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Wed, 13 Feb 2019 12:28:53 +0200 -Subject: [PATCH 1/5] build: Separate options for manpages install and gtk-doc - generation ---- - docs/meson.build | 10 +++++++--- - meson.build | 6 +----- - meson_options.txt | 6 ++++-- - 3 files changed, 12 insertions(+), 10 deletions(-) - -diff --git a/docs/meson.build b/docs/meson.build -index 76e59797e..5e1d541bd 100644 ---- a/docs/meson.build -+++ b/docs/meson.build -@@ -1,3 +1,7 @@ --subdir('tools') --subdir('manpages') --subdir('reference') -+if get_option('man') -+ subdir('manpages') -+endif -+if get_option('gtk-doc') -+ subdir('tools') -+ subdir('reference') -+endif -diff --git a/meson.build b/meson.build -index 7d61fe1a7..0fda24151 100644 ---- a/meson.build -+++ b/meson.build -@@ -320,11 +320,7 @@ typelib_dir = gobject_introspection.get_pkgconfig_variable('typelibdir', - define_variable: [ 'libdir', libdir ]) - - subdir('src') -- --if get_option('docs') -- subdir('docs') --endif -- -+subdir('docs') - subdir('examples') - subdir('utils') - -diff --git a/meson_options.txt b/meson_options.txt -index b36ba1d1e..0eb48aac4 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,11 +1,13 @@ --option('docs', type: 'boolean', value: true, -- description: 'Enable the documentation') - option('fts', type: 'boolean', value: true, - description: 'Enable the Tracker full-text search feature') - option('functional_tests', type: 'boolean', value: true, - description: 'Enable the Tracker functional test suite') -+option('gtk-doc', type: 'boolean', value: true, -+ description: 'Generate API documentation with gtk-doc') - option('journal', type: 'boolean', value: true, - description: 'Enable database journal backup mechanism') -+option('man', type: 'boolean', value: true, -+ description: 'Install man pages') - - option('network_manager', type: 'combo', choices: ['auto', 'no', 'yes'], value: 'auto', - description: 'Enable connection detection through NetworkManager') --- -2.17.0 - diff --git a/app-misc/tracker/files/2.1.8-fix-library-symlinks.patch b/app-misc/tracker/files/2.1.8-fix-library-symlinks.patch deleted file mode 100644 index 85ddb6baa22b..000000000000 --- a/app-misc/tracker/files/2.1.8-fix-library-symlinks.patch +++ /dev/null @@ -1,71 +0,0 @@ -From d52a7bed9fdeef77bdcafd66c748adce14fde42d Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Tue, 6 Nov 2018 07:11:37 +0000 -Subject: [PATCH 5/5] build: Restore right soversion to libraries - -The previous change did not leave the expected .0 symlinks. - -'soversion' is the actual version linked against. To match the scheme -used by libtool, we need to give the libraries a 'version' as well. - -(cherry picked from commit 282cd5aa85852cc7f9e603dae435f6b528c4712a) ---- - meson.build | 3 ++- - src/libtracker-control/meson.build | 1 + - src/libtracker-miner/meson.build | 1 + - src/libtracker-sparql-backend/meson.build | 1 + - 4 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 0fda24151..593b9db44 100644 ---- a/meson.build -+++ b/meson.build -@@ -15,7 +15,8 @@ tracker_interface_age = 0 - tracker_binary_age = 100 * tracker_minor_version + tracker_micro_version - tracker_interface_age - - # This the .Z used in libtracker-sparql-2.0.so.Z --soversion = '0.@0@.@1@'.format(tracker_binary_age - tracker_interface_age, tracker_interface_age) -+soversion = '0' -+libversion = '@0@.@1@.@2@'.format(soversion, tracker_binary_age - tracker_interface_age, tracker_interface_age) - - libdir = join_paths(get_option('prefix'), get_option('libdir')) - datadir = join_paths(get_option('prefix'), get_option('datadir')) -diff --git a/src/libtracker-control/meson.build b/src/libtracker-control/meson.build -index 81578e306..533ac538e 100644 ---- a/src/libtracker-control/meson.build -+++ b/src/libtracker-control/meson.build -@@ -10,6 +10,7 @@ libtracker_control = library('tracker-control-' + tracker_api_version, - tracker_common_enum_header, - c_args: tracker_c_args, - soversion: soversion, -+ version: libversion, - install: true, - install_rpath: tracker_internal_libs_dir, - # This doesn't depend on tracker_common_dep because of -diff --git a/src/libtracker-miner/meson.build b/src/libtracker-miner/meson.build -index e53b21cf9..49c879057 100644 ---- a/src/libtracker-miner/meson.build -+++ b/src/libtracker-miner/meson.build -@@ -60,6 +60,7 @@ libtracker_miner = library( - miner_enums[0], miner_enums[1], miner_sources, - c_args: tracker_c_args, - soversion: soversion, -+ version: libversion, - install: true, - install_rpath: tracker_internal_libs_dir, - # This doesn't depend on tracker_common_dep because of -diff --git a/src/libtracker-sparql-backend/meson.build b/src/libtracker-sparql-backend/meson.build -index c8415efb8..e54333bec 100644 ---- a/src/libtracker-sparql-backend/meson.build -+++ b/src/libtracker-sparql-backend/meson.build -@@ -8,6 +8,7 @@ libtracker_sparql = library('tracker-sparql-' + tracker_api_version, - 'tracker-backend.vala', - - soversion: soversion, -+ version: libversion, - - install: true, - install_rpath: tracker_internal_libs_dir, --- -2.17.0 - diff --git a/app-misc/tracker/files/2.1.8-prevent-stack-smashing.patch b/app-misc/tracker/files/2.1.8-prevent-stack-smashing.patch deleted file mode 100644 index 1f25f115d419..000000000000 --- a/app-misc/tracker/files/2.1.8-prevent-stack-smashing.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 4238b0a27a3621f4181d38821a4eaee9f0ac1244 Mon Sep 17 00:00:00 2001 -From: Andrea Azzarone <andrea.azzarone@canonical.com> -Date: Fri, 18 Jan 2019 16:14:57 +0000 -Subject: [PATCH 3/5] tracker-monitor: Prevent stack smashing - -Make sure to use GPOINTER_TO_UINT when using g_hash_table_lookup_extended() to -prevent stack smashing. This will make sure that in the architectures where -sizeof(GFileMonitorEvent) < sizeof(gpointer), g_hash_table_lookup_extended() -will not write more bytes than prev_event_type can hold. - -Bug-Upstream: https://gitlab.gnome.org/GNOME/tracker/issues/71 -Origin: upstream, commit:63c0a5d4413e53cb76089fda6f56b2d623c5de15 -Applied-Upstream: 2.2.0 ---- - src/libtracker-miner/tracker-monitor.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/libtracker-miner/tracker-monitor.c b/src/libtracker-miner/tracker-monitor.c -index 54cd3e8fb..f2431b646 100644 ---- a/src/libtracker-miner/tracker-monitor.c -+++ b/src/libtracker-miner/tracker-monitor.c -@@ -611,10 +611,12 @@ flush_cached_event (TrackerMonitor *monitor, - GFile *file, - gboolean is_directory) - { -- GFileMonitorEvent prev_event_type; -+ gpointer value = NULL; - - if (g_hash_table_lookup_extended (monitor->priv->cached_events, -- file, NULL, (gpointer*) &prev_event_type)) { -+ file, NULL, &value)) { -+ GFileMonitorEvent prev_event_type = GPOINTER_TO_UINT (value); -+ - g_hash_table_remove (monitor->priv->cached_events, file); - emit_signal_for_event (monitor, prev_event_type, - is_directory, file, NULL); --- -2.17.0 - diff --git a/app-misc/tracker/files/2.1.8-test-fix.patch b/app-misc/tracker/files/2.1.8-test-fix.patch deleted file mode 100644 index b3dedaa9e6ec..000000000000 --- a/app-misc/tracker/files/2.1.8-test-fix.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 77059dd4b98f422c1e474b9ee53cc05dde875cce Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Wed, 13 Feb 2019 20:09:45 +0200 -Subject: [PATCH 2/5] libtracker-common: improve test_path_evaluate_name - environment handling - -Under some environments $PWD might not point where we expect, so simply -use g_get_current_dir() instead. -g_getenv() is documented to return a pointer that may get overwritten -by subsequent calls to g_getenv, g_setenv of g_unsetenv. As even after -removing the second g_getenv, there's still g_setenv calls, take a copy. ---- - tests/libtracker-common/tracker-file-utils-test.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/tests/libtracker-common/tracker-file-utils-test.c b/tests/libtracker-common/tracker-file-utils-test.c -index d1ddf3004..71a82a5c8 100644 ---- a/tests/libtracker-common/tracker-file-utils-test.c -+++ b/tests/libtracker-common/tracker-file-utils-test.c -@@ -131,14 +131,14 @@ test_path_list_filter_duplicates_with_exceptions () - static void - test_path_evaluate_name (void) - { -- gchar *result, *expected; -+ gchar *result, *expected, *pwd, *home; - -- const gchar *home = g_getenv ("HOME"); -- const gchar *pwd = g_getenv ("PWD"); - - const gchar *test = "/one/two"; - gchar *parent_dir; - -+ home = g_strdup (g_getenv ("HOME")); -+ pwd = g_get_current_dir (); - g_setenv ("TEST_TRACKER_DIR", test, TRUE); - - -@@ -216,6 +216,8 @@ test_path_evaluate_name (void) - result = tracker_path_evaluate_name (tracker_test_helpers_get_nonutf8 ()); - g_assert_cmpstr (result, ==, tracker_test_helpers_get_nonutf8 ()); - -+ g_free (home); -+ g_free (pwd); - g_unsetenv ("TEST_TRACKER_DIR"); - } - --- -2.17.0 - diff --git a/app-misc/tracker/files/2.1.8-vala-0.44-compat.patch b/app-misc/tracker/files/2.1.8-vala-0.44-compat.patch deleted file mode 100644 index 85a7eeadc2ba..000000000000 --- a/app-misc/tracker/files/2.1.8-vala-0.44-compat.patch +++ /dev/null @@ -1,46 +0,0 @@ -From e93ea9167dc4185b6c29b27abdab55b6bcd06c74 Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho <carlosg@gnome.org> -Date: Wed, 1 May 2019 13:38:34 +0200 -Subject: [PATCH] g-ir-merge: Avoid recursive includes - -Ensure the namespace is not part of the includes. This is a kludge and -shouldn't ever happen, except it does (in continuous, induced by vala). - -The next big thing that would happen here is a rewrite of libtracker-sparql -vala bits so we don't need this merging anymore, so I won't put much -thought on it. ---- - utils/g-ir-merge/g-ir-merge | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/utils/g-ir-merge/g-ir-merge b/utils/g-ir-merge/g-ir-merge -index ad79c2d29..321032a4a 100755 ---- a/utils/g-ir-merge/g-ir-merge -+++ b/utils/g-ir-merge/g-ir-merge -@@ -89,12 +89,12 @@ def parse_inputs(files): - return includes, namespaces, c_includes - - --def merge_includes(all_includes): -+def merge_includes(all_includes, namespace): - merged = {} - for element in all_includes: - name = element.get('name') - version = element.get('version') -- if name not in merged: -+ if name not in merged and name != namespace: - merged[name] = element - return list(merged.values()) - -@@ -153,7 +153,7 @@ def main(): - - all_includes, all_namespaces, all_c_includes = parse_inputs(args.files) - -- includes = merge_includes(all_includes) -+ includes = merge_includes(all_includes, args.namespace) - - namespace_contents, identifier_prefixes, symbol_prefixes, shared_libraries \ - = merge_namespaces(all_namespaces) --- -2.20.1 - |