summaryrefslogtreecommitdiff
path: root/app-misc/tracker/files
diff options
context:
space:
mode:
Diffstat (limited to 'app-misc/tracker/files')
-rw-r--r--app-misc/tracker/files/tracker-3.1.1-Fix-asciidoc-manpage.xsl-location.patch25
-rw-r--r--app-misc/tracker/files/tracker-3.2.1-Add-config-options-for-libsoup.patch41
-rw-r--r--app-misc/tracker/files/tracker-3.2.1-build-Add-an-option-to-control-building-tests.patch69
3 files changed, 0 insertions, 135 deletions
diff --git a/app-misc/tracker/files/tracker-3.1.1-Fix-asciidoc-manpage.xsl-location.patch b/app-misc/tracker/files/tracker-3.1.1-Fix-asciidoc-manpage.xsl-location.patch
deleted file mode 100644
index 3383e2be28e5..000000000000
--- a/app-misc/tracker/files/tracker-3.1.1-Fix-asciidoc-manpage.xsl-location.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c14fa25f2b616b170b453861de87ef21c05dc6c4 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Sat, 13 Mar 2021 14:29:58 -0500
-Subject: [PATCH] Fix asciidoc manpage.xsl location
-
----
- docs/manpages/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build
-index f90c757cf..101cbca16 100644
---- a/docs/manpages/meson.build
-+++ b/docs/manpages/meson.build
-@@ -32,7 +32,7 @@ foreach m : manpages
- command: [xsltproc,
- '--output', '@OUTPUT@',
- '--stringparam', 'man.authors.section.enabled', '0',
-- '/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'],
-+ '/usr/share/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'],
- input: xml,
- output: manpage,
- install: true,
---
-2.26.3
-
diff --git a/app-misc/tracker/files/tracker-3.2.1-Add-config-options-for-libsoup.patch b/app-misc/tracker/files/tracker-3.2.1-Add-config-options-for-libsoup.patch
deleted file mode 100644
index c6895f36512f..000000000000
--- a/app-misc/tracker/files/tracker-3.2.1-Add-config-options-for-libsoup.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 6ebc7d09f005898236ee27a780f6fc0426cdd271 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Wed, 26 Jan 2022 18:08:24 -0800
-Subject: [PATCH] Add config options for libsoup
-
----
- meson.build | 4 ++--
- meson_options.txt | 5 +++++
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 4109293a9..39947437a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -53,8 +53,8 @@ json_glib = dependency('json-glib-1.0', version: '>= 1.4', required: true)
- libxml2 = dependency('libxml-2.0', version: '> 2.6')
- sqlite = dependency('sqlite3', version: '>' + sqlite_required)
- dbus = dependency('dbus-1')
--libsoup2 = dependency('libsoup-2.4', version: '> 2.40', required: false)
--libsoup3 = dependency('libsoup-3.0', version: '>= 2.99.2', required: false)
-+libsoup2 = dependency('libsoup-2.4', version: '> 2.40', required: get_option('libsoup2'))
-+libsoup3 = dependency('libsoup-3.0', version: '>= 2.99.2', required: get_option('libsoup3'))
-
- libmath = cc.find_library('m', required: false)
- libdl = cc.find_library('dl')
-diff --git a/meson_options.txt b/meson_options.txt
-index a7e647d02..d431caa03 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -28,3 +28,8 @@ option('tests_tap_protocol', type: 'boolean', value: false,
- description: 'Whether to enable TAP protocol on tests')
- option('introspection', type: 'feature', value: 'enabled',
- description: 'Whether to enable introspection')
-+
-+option('libsoup2', type: 'feature', value: 'enabled',
-+ description: 'Whether to enable libsoup2')
-+option('libsoup3', type: 'feature', value: 'enabled',
-+ description: 'Whether to enable libsoup3')
---
-2.34.1
-
diff --git a/app-misc/tracker/files/tracker-3.2.1-build-Add-an-option-to-control-building-tests.patch b/app-misc/tracker/files/tracker-3.2.1-build-Add-an-option-to-control-building-tests.patch
deleted file mode 100644
index 9480a6269c75..000000000000
--- a/app-misc/tracker/files/tracker-3.2.1-build-Add-an-option-to-control-building-tests.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From db36d010737d5eeceff300e3dd5e315c5d0382a2 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Wed, 16 Feb 2022 10:59:33 -0800
-Subject: [PATCH] build: Add an option to control building tests
-
-Commit 8569c99d2926 ("Look for a Python installation with the tap
-module") correctly added a dependency on the gi Python module for tests.
-Commit 51ca035697a4 ("Make tracker:endpoint test work on macOS")
-restructured Python probing by moving it to the top-level meson.build.
-
-These two commits have the side-effect of exposing the fact that the
-gi Python module is really only a test dependency, and should not be
-required if building without tests.
-
-As such, add a -Dtests=bool option to disable building tests. This
-reduces the number of ninja targets from 232 to 188 on my non-test
-build.
----
- meson.build | 13 +++++++++----
- meson_options.txt | 2 ++
- 2 files changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 4e59b8240..f4dd58fd4 100644
---- a/meson.build
-+++ b/meson.build
-@@ -75,9 +75,12 @@ if get_option('man')
- a2x = find_program('a2x')
- endif
-
--py_modules = ['gi']
--if get_option('tests_tap_protocol')
-- py_modules += 'tap'
-+py_modules = []
-+if get_option('tests')
-+ py_modules += 'gi'
-+ if get_option('tests_tap_protocol')
-+ py_modules += 'tap'
-+ endif
- endif
- python = import('python').find_installation('python3', modules: py_modules)
-
-@@ -358,7 +361,9 @@ tracker_uninstalled_nepomuk_ontologies_dir = join_paths(meson.current_source_dir
- tracker_uninstalled_stop_words_dir = join_paths(meson.current_source_dir(), 'src', 'libtracker-common', 'stop-words')
- tracker_uninstalled_testutils_dir = join_paths(meson.current_source_dir(), 'utils')
-
--subdir('tests')
-+if get_option('tests')
-+ subdir('tests')
-+endif
- subdir('examples')
-
- subdir('po')
-diff --git a/meson_options.txt b/meson_options.txt
-index a7e647d02..ec8ea8bc2 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -20,6 +20,8 @@ option('systemd_user_services', type: 'boolean', value: true, yield: true,
- description: 'Whether to install systemd user .service files')
- option('systemd_user_services_dir', type: 'string', value: '', yield: true,
- description: 'Directory to install systemd user unit files (or empty to use default)')
-+option('tests', type: 'boolean', value: true,
-+ description: 'Whether to build tests')
- option('test_utils', type: 'boolean', value: true,
- description: 'Whether to install the trackertestutils Python package')
- option('test_utils_dir', type: 'string', value: '',
---
-2.34.1
-