[gentoo-commits] repo/gentoo:master commit in: app-misc/tracker/, app-misc/tracker/files/

[gentoo-commits] repo/gentoo:master commit in: app-misc/tracker/, app-misc/tracker/files/

[Alexandre Rostovtsev]

commit:     d2ccfbbc1a708d0776a9856d6138ab93ca01f720
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 19:56:51 2016 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sun May 15 19:59:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2ccfbbc

app-misc/tracker: fix underlinking build failure (bug #581288)

Thanks to Maxim Sheviakov for reporting.
Upstream bug: https://bugzilla.gnome.org/show_bug.cgi?id=766487

Package-Manager: portage-2.2.28

 .../files/tracker-1.6.2-sqlite-underlinking.patch  | 58 ++++++++++++++++++++++
 app-misc/tracker/tracker-1.6.2.ebuild              |  3 ++
 2 files changed, 61 insertions(+)

diff --git a/app-misc/tracker/files/tracker-1.6.2-sqlite-underlinking.patch b/app-misc/tracker/files/tracker-1.6.2-sqlite-underlinking.patch
new file mode 100644
index 0000000..4d3e20a
--- /dev/null
+++ b/app-misc/tracker/files/tracker-1.6.2-sqlite-underlinking.patch
@@ -0,0 +1,58 @@
+From f69ece17fd3d6414ef2634336c7e780207b0f4a7 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 15 May 2016 15:15:50 -0400
+Subject: [PATCH] build: embedded copy of SQLite requires -ldl and -pthread
+
+https://bugzilla.gnome.org/show_bug.cgi?id=766487
+---
+ configure.ac           | 8 ++++++++
+ src/sqlite/Makefile.am | 9 +++++++--
+ 2 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2ccda7a..b6c978a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -719,6 +719,14 @@ if test "x$enable_journal" = "xno" ; then
+    AC_DEFINE(DISABLE_JOURNAL, 1, [Define if we disable the journal])
+ fi
+ 
++####################################################################
++# Check for SQLite
++####################################################################
++
++# Our copy of sqlite requires libdl on some platforms
++AC_CHECK_LIB(dl, dlsym, [LIBDL=-ldl], [LIBDL=])
++AC_SUBST(LIBDL)
++
+ ##################################################################
+ # Check for libtracker-common, make sure libstemmer exists
+ ##################################################################
+diff --git a/src/sqlite/Makefile.am b/src/sqlite/Makefile.am
+index 8b0ac18..354f054 100644
+--- a/src/sqlite/Makefile.am
++++ b/src/sqlite/Makefile.am
+@@ -3,7 +3,8 @@ AM_CPPFLAGS =                                          \
+ 	-I$(top_srcdir)/src                            \
+ 	-DSQLITE_THREADSAFE=1                          \
+ 	-DSQLITE_ENABLE_FTS4                           \
+-	-DSQLITE_ENABLE_FTS3_TOKENIZER
++	-DSQLITE_ENABLE_FTS3_TOKENIZER                 \
++	-pthread
+ 
+ noinst_LTLIBRARIES = libtracker-sqlite.la
+ 
+@@ -12,5 +13,9 @@ libtracker_sqlite_la_SOURCES =                         \
+ 	sqlite3.h                                      \
+ 	sqlite3ext.h
+ 
++libtracker_sqlite_la_LDFLAGS =                         \
++	-pthread
++
+ libtracker_sqlite_la_LIBADD =                          \
+-	$(BUILD_LIBS)
++	$(BUILD_LIBS)                                      \
++	$(LIBDL)
+-- 
+2.8.2
+

diff --git a/app-misc/tracker/tracker-1.6.2.ebuild b/app-misc/tracker/tracker-1.6.2.ebuild
index c51a021..f4b891a 100644
--- a/app-misc/tracker/tracker-1.6.2.ebuild
+++ b/app-misc/tracker/tracker-1.6.2.ebuild
@@ -141,6 +141,9 @@ src_prepare() {
 	# Ensure embedded sqlite.h is in the include path (from 1.6 branch)
 	epatch "${FILESDIR}"/${P}-include-path.patch
 
+	# embedded sqlite underlinking, https://bugzilla.gnome.org/show_bug.cgi?id=766487
+	epatch "${FILESDIR}"/${P}-sqlite-underlinking.patch
+
 	eautoreconf # See bug #367975
 	gnome2_src_prepare
 	vala_src_prepare

[gentoo-commits] repo/gentoo:master commit in: app-misc/tracker/, app-misc/tracker/files/

[Mart Raudsepp]

commit:     ac7095fad50859216bfa6aeae59b4569023612ec
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 26 01:23:51 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Feb 26 01:24:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac7095fa

app-misc/tracker: bump to 2.1.8

Merely includes 2 of the patches we had in 2.1.7-r1, and the
pregenerated C for vala code is generated with a different
valac version.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 app-misc/tracker/Manifest                          |   2 +-
 .../tracker/files/2.1.7-glib-2.60-compat.patch     | 169 ---------------------
 .../tracker/files/2.1.7-upgrade-path-fix.patch     |  33 ----
 ...7-doc-options.patch => 2.1.8-doc-options.patch} |   0
 ...inks.patch => 2.1.8-fix-library-symlinks.patch} |   0
 ...ng.patch => 2.1.8-prevent-stack-smashing.patch} |   0
 .../{2.1.7-test-fix.patch => 2.1.8-test-fix.patch} |   0
 ...racker-2.1.7-r1.ebuild => tracker-2.1.8.ebuild} |   2 -
 8 files changed, 1 insertion(+), 205 deletions(-)

diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 228b9799606..deb8032cdd9 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,2 +1,2 @@
 DIST tracker-1.12.4.tar.xz 5051884 BLAKE2B 99cc85fc4d49691eb0a73e4f1776d9971b5cbe5844478825e473137b4d7b13e2578065be497da57285abc2d3cf4c6d1ed1b077a01cd68dc093e18ddd7674c1f1 SHA512 e81af22733c7d80535c79e23a4b3edbbcf888eede1dff071d466518054e90d4c207af76bcb4d8c73dc20729ae2eab60444ca91ee7ae09e96c0da2fdab97752c1
-DIST tracker-2.1.7.tar.xz 2572740 BLAKE2B 0db8379502a37d0fc0c4b905a55a8642011c76368a94609b71afa5b6d59fa8a9220c302588a8217ea8626faccedd6b62e8fc96b19d4fb2cbaf1b550fbc55cf0d SHA512 75203af91ec43641caf2a3870100b8c5affb613e442e5a271edafe68ac7c6551256f288e435ce4fc8cb6f9ee0ea54871ebba90e085d0baeba4914815d3be15a0
+DIST tracker-2.1.8.tar.xz 2585924 BLAKE2B 8548f6a615c3357eb2f1a1656d81f50816cef2f59e23fe7bd2111eeade8b3e5c0a33abf1bc830a0baa9c1c1d74ee92d3e44da00cd6f65ab853ef04eb2f57a69e SHA512 447e519699bbb0c9802230629667a87ce39ec3f6bb9c605063319d5e6a019c95a76762fdc889b1a11280be08b8520f22f097f9c9779dcd7a6c7cf239b4da2696

diff --git a/app-misc/tracker/files/2.1.7-glib-2.60-compat.patch b/app-misc/tracker/files/2.1.7-glib-2.60-compat.patch
deleted file mode 100644
index 93737f79857..00000000000
--- a/app-misc/tracker/files/2.1.7-glib-2.60-compat.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 43b10233d4cce38230c357d885662291d2e5e978 Mon Sep 17 00:00:00 2001
-From: Iain Lane <iainl@gnome.org>
-Date: Mon, 11 Feb 2019 15:42:14 +0000
-Subject: [PATCH 4/5] libtracker-data: Don't rely on hash table iteration order
- being stable
-
-This is the same problem that was fixed by
-c58f7aa419e2c3a69fa7fe583a1fd5e0b9bd0839 on master. Instead of relying
-on hash table iteration being stable, pass the GVariantBuilder down and
-add directly to it in the right order.
-
-Forwarded: https://gitlab.gnome.org/GNOME/tracker/merge_requests/55
----
- .../tracker-sparql-pattern.vala               |  4 +--
- src/libtracker-data/tracker-sparql-query.vala | 31 ++++++++++++-------
- 2 files changed, 21 insertions(+), 14 deletions(-)
-
-diff --git a/src/libtracker-data/tracker-sparql-pattern.vala b/src/libtracker-data/tracker-sparql-pattern.vala
-index e03ed6f16..033b138a5 100644
---- a/src/libtracker-data/tracker-sparql-pattern.vala
-+++ b/src/libtracker-data/tracker-sparql-pattern.vala
-@@ -542,7 +542,7 @@ class Tracker.Sparql.Pattern : Object {
- 		} else if (accept (SparqlTokenType.BLANK_NODE)) {
- 			// _:foo
- 			expect (SparqlTokenType.COLON);
--			result = query.generate_bnodeid (get_last_string ().substring (1));
-+			result = query.generate_bnodeid (get_last_string ().substring (1), null);
- 		} else if (current () == SparqlTokenType.STRING_LITERAL1) {
- 			result = expression.parse_string_literal ();
- 		} else if (current () == SparqlTokenType.STRING_LITERAL2) {
-@@ -569,7 +569,7 @@ class Tracker.Sparql.Pattern : Object {
- 		} else if (current () == SparqlTokenType.OPEN_BRACKET) {
- 			next ();
- 
--			result = query.generate_bnodeid (null);
-+			result = query.generate_bnodeid (null, null);
- 
- 			string old_subject = current_subject;
- 			bool old_subject_is_var = current_subject_is_var;
-diff --git a/src/libtracker-data/tracker-sparql-query.vala b/src/libtracker-data/tracker-sparql-query.vala
-index 7944e78e5..69a7e9eba 100644
---- a/src/libtracker-data/tracker-sparql-query.vala
-+++ b/src/libtracker-data/tracker-sparql-query.vala
-@@ -284,7 +284,7 @@ public class Tracker.Sparql.Query : Object {
- 			sha1, sha1.substring (8), sha1.substring (12), sha1.substring (16), sha1.substring (20));
- 	}
- 
--	internal string generate_bnodeid (string? user_bnodeid) {
-+	internal string generate_bnodeid (string? user_bnodeid, GLib.VariantBuilder? builder) {
- 		// user_bnodeid is NULL for anonymous nodes
- 		if (user_bnodeid == null) {
- 			return ":%d".printf (++bnodeid);
-@@ -310,6 +310,9 @@ public class Tracker.Sparql.Query : Object {
- 				}
- 
- 				blank_nodes.insert (user_bnodeid, uri);
-+
-+				if (builder != null)
-+					builder.add ("{ss}", user_bnodeid, uri);
- 			}
- 
- 			return uri;
-@@ -774,7 +777,7 @@ public class Tracker.Sparql.Query : Object {
- 			for (int i = 0; i < n_solutions; i++) {
- 				solution.solution_index = i;
- 				set_location (delete_location);
--				parse_construct_triples_block (solution, UpdateType.DELETE);
-+				parse_construct_triples_block (solution, UpdateType.DELETE, null);
- 				data_update.update_buffer_might_flush ();
- 			}
- 
-@@ -790,16 +793,20 @@ public class Tracker.Sparql.Query : Object {
- 			for (int i = 0; i < n_solutions; i++) {
- 				uuid_generate (base_uuid);
- 				blank_nodes = new HashTable<string,string>.full (str_hash, str_equal, g_free, g_free);
-+				if (update_blank_nodes != null)
-+					update_blank_nodes.open (new GLib.VariantType("a{ss}"));
-+
- 				solution.solution_index = i;
- 
- 				set_location (insert_location);
- 				parse_construct_triples_block (solution,
- 							       insert_is_update ?
- 							       UpdateType.UPDATE :
--							       UpdateType.INSERT);
-+							       UpdateType.INSERT,
-+							       update_blank_nodes);
- 
- 				if (blank && update_blank_nodes != null) {
--					update_blank_nodes.add_value (blank_nodes);
-+					update_blank_nodes.close ();
- 				}
- 
- 				data_update.update_buffer_might_flush ();
-@@ -870,7 +877,7 @@ public class Tracker.Sparql.Query : Object {
- 		}
- 	}
- 
--	private void parse_construct_triples_block (Solution var_value_map, UpdateType type) throws Sparql.Error, DateError {
-+	private void parse_construct_triples_block (Solution var_value_map, UpdateType type, GLib.VariantBuilder? builder) throws Sparql.Error, DateError {
- 		expect (SparqlTokenType.OPEN_BRACE);
- 
- 		while (current () != SparqlTokenType.CLOSE_BRACE) {
-@@ -878,7 +885,7 @@ public class Tracker.Sparql.Query : Object {
- 
- 			if (accept (SparqlTokenType.GRAPH)) {
- 				var old_graph = current_graph;
--				current_graph = parse_construct_var_or_term (var_value_map, type, out is_null);
-+				current_graph = parse_construct_var_or_term (var_value_map, type, out is_null, builder);
- 
- 				if (is_null) {
- 					throw get_error ("'null' not supported for graph");
-@@ -887,7 +894,7 @@ public class Tracker.Sparql.Query : Object {
- 				expect (SparqlTokenType.OPEN_BRACE);
- 
- 				while (current () != SparqlTokenType.CLOSE_BRACE) {
--					current_subject = parse_construct_var_or_term (var_value_map, type, out is_null);
-+					current_subject = parse_construct_var_or_term (var_value_map, type, out is_null, builder);
- 
- 					if (is_null) {
- 						throw get_error ("'null' not supported for subject");
-@@ -906,7 +913,7 @@ public class Tracker.Sparql.Query : Object {
- 
- 				optional (SparqlTokenType.DOT);
- 			} else {
--				current_subject = parse_construct_var_or_term (var_value_map, type, out is_null);
-+				current_subject = parse_construct_var_or_term (var_value_map, type, out is_null, builder);
- 
- 				if (is_null) {
- 					throw get_error ("'null' not supported for subject");
-@@ -925,7 +932,7 @@ public class Tracker.Sparql.Query : Object {
- 
- 	bool anon_blank_node_open = false;
- 
--	private string? parse_construct_var_or_term (Solution var_value_map, UpdateType type, out bool is_null) throws Sparql.Error, DateError {
-+	private string? parse_construct_var_or_term (Solution var_value_map, UpdateType type, out bool is_null, GLib.VariantBuilder? builder) throws Sparql.Error, DateError {
- 		string result = "";
- 		is_null = false;
- 		if (current () == SparqlTokenType.VAR) {
-@@ -947,7 +954,7 @@ public class Tracker.Sparql.Query : Object {
- 		} else if (accept (SparqlTokenType.BLANK_NODE)) {
- 			// _:foo
- 			expect (SparqlTokenType.COLON);
--			result = generate_bnodeid (get_last_string ().substring (1));
-+			result = generate_bnodeid (get_last_string ().substring (1), builder);
- 		} else if (current () == SparqlTokenType.MINUS) {
- 			next ();
- 			if (current () == SparqlTokenType.INTEGER ||
-@@ -994,7 +1001,7 @@ public class Tracker.Sparql.Query : Object {
- 			anon_blank_node_open = true;
- 			next ();
- 
--			result = generate_bnodeid (null);
-+			result = generate_bnodeid (null, builder);
- 
- 			string old_subject = current_subject;
- 			bool old_subject_is_var = current_subject_is_var;
-@@ -1061,7 +1068,7 @@ public class Tracker.Sparql.Query : Object {
- 
- 	private void parse_construct_object (Solution var_value_map, UpdateType type) throws Sparql.Error, DateError {
- 		bool is_null = false;
--		string object = parse_construct_var_or_term (var_value_map, type, out is_null);
-+		string object = parse_construct_var_or_term (var_value_map, type, out is_null, null);
- 		var data = manager.get_data ();
- 		if (current_subject == null || current_predicate == null || object == null) {
- 			// the SPARQL specification says that triples containing unbound variables
--- 
-2.17.0
-

diff --git a/app-misc/tracker/files/2.1.7-upgrade-path-fix.patch b/app-misc/tracker/files/2.1.7-upgrade-path-fix.patch
deleted file mode 100644
index a1fa32738d8..00000000000
--- a/app-misc/tracker/files/2.1.7-upgrade-path-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d7e31d6940efdb6716689136774a94cfdfd83189 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Mon, 17 Dec 2018 13:34:23 +0100
-Subject: [PATCH] libtracker-data: Update FTS if base tables were altered
-
-That will issue an update of all tables, so the FTS view might be
-affected. This is not caught by ontology change tests, as this
-is a situation that can only happen when migrating from 1.x databases
-ATM.
-
-(cherry picked from commit 70758fc059e91936e88d5264b195ac291e995144)
----
- src/libtracker-data/tracker-data-manager.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
-index f2addd0df..05a96b4dd 100644
---- a/src/libtracker-data/tracker-data-manager.c
-+++ b/src/libtracker-data/tracker-data-manager.c
-@@ -3701,8 +3701,8 @@ tracker_data_ontology_import_into_db (TrackerDataManager  *manager,
- 	}
- 
- #if HAVE_TRACKER_FTS
--	if (in_update) {
--		update_fts = tracker_data_manager_fts_changed (manager);
-+	if (base_tables_altered || in_update) {
-+		update_fts = base_tables_altered | tracker_data_manager_fts_changed (manager);
- 
- 		if (update_fts)
- 			tracker_db_interface_sqlite_fts_delete_table (iface);
--- 
-2.17.0
-

diff --git a/app-misc/tracker/files/2.1.7-doc-options.patch b/app-misc/tracker/files/2.1.8-doc-options.patch
similarity index 100%
rename from app-misc/tracker/files/2.1.7-doc-options.patch
rename to app-misc/tracker/files/2.1.8-doc-options.patch

diff --git a/app-misc/tracker/files/2.1.7-fix-library-symlinks.patch b/app-misc/tracker/files/2.1.8-fix-library-symlinks.patch
similarity index 100%
rename from app-misc/tracker/files/2.1.7-fix-library-symlinks.patch
rename to app-misc/tracker/files/2.1.8-fix-library-symlinks.patch

diff --git a/app-misc/tracker/files/2.1.7-prevent-stack-smashing.patch b/app-misc/tracker/files/2.1.8-prevent-stack-smashing.patch
similarity index 100%
rename from app-misc/tracker/files/2.1.7-prevent-stack-smashing.patch
rename to app-misc/tracker/files/2.1.8-prevent-stack-smashing.patch

diff --git a/app-misc/tracker/files/2.1.7-test-fix.patch b/app-misc/tracker/files/2.1.8-test-fix.patch
similarity index 100%
rename from app-misc/tracker/files/2.1.7-test-fix.patch
rename to app-misc/tracker/files/2.1.8-test-fix.patch

diff --git a/app-misc/tracker/tracker-2.1.7-r1.ebuild b/app-misc/tracker/tracker-2.1.8.ebuild
similarity index 96%
rename from app-misc/tracker/tracker-2.1.7-r1.ebuild
rename to app-misc/tracker/tracker-2.1.8.ebuild
index 3d59f4f66b6..643340f1f2c 100644
--- a/app-misc/tracker/tracker-2.1.7-r1.ebuild
+++ b/app-misc/tracker/tracker-2.1.8.ebuild
@@ -48,9 +48,7 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-doc-options.patch # https://gitlab.gnome.org/GNOME/tracker/merge_requests/58
 	"${FILESDIR}"/${PV}-test-fix.patch # https://gitlab.gnome.org/GNOME/tracker/merge_requests/59
 	"${FILESDIR}"/${PV}-prevent-stack-smashing.patch
-	"${FILESDIR}"/${PV}-glib-2.60-compat.patch
 	"${FILESDIR}"/${PV}-fix-library-symlinks.patch
-	"${FILESDIR}"/${PV}-upgrade-path-fix.patch
 )
 
 function inotify_enabled() {

[gentoo-commits] repo/gentoo:master commit in: app-misc/tracker/, app-misc/tracker/files/

[Matt Turner]

commit:     4fda7593ca579989ad296e2131bf861bda3112f8
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 27 02:10:28 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Jan 27 02:48:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fda7593

app-misc/tracker: Version bump to 3.2.1

Closes: https://bugs.gentoo.org/807985
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-misc/tracker/Manifest                          |   1 +
 ...cker-3.2.1-Add-config-options-for-libsoup.patch |  41 ++++++++
 app-misc/tracker/tracker-3.2.1.ebuild              | 116 +++++++++++++++++++++
 3 files changed, 158 insertions(+)

diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 73fe290c692a..5756be13c5d8 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,3 +1,4 @@
 DIST tracker-2.3.5.tar.xz 1604004 BLAKE2B ad79682cb703056fd927649021a5f37fddb2e978ecc710d020c23ef5dd076f88c7e0c2cd9d4385343e9d6c2c2ac7473af7508d86793c505e2361a8021bf27d50 SHA512 74cd3b2671b811f3267a516e6f6047594fffa7c8a4a23fa5be4f7d71f581c417a88f12f614757418a848077a9231c0c876617d4486f3bb5b103382b871913d34
 DIST tracker-2.3.6.tar.xz 1606716 BLAKE2B ea39df4438e4502bc0229a5cc3b42a2fe6e13a643ac8e4034004b1291da49ff3ad1a177227035a4a02fd8f3723a735d37371c898bb03a6fc10573606a1c29d70 SHA512 1b8ae06b6c64a0cbe7d4c987bafe392fb38014215fc698f919273ba1f422dd0bc24344d3fd73164b00bfea315e527e2886ba90f1f1b86d5fceff24455b36d67e
 DIST tracker-3.1.2.tar.xz 1429356 BLAKE2B 2401ee4d73aef29a40ff9c9f917fdf4709884bc26b7e8c5ae52b0e009bfd1934a122a78adea2fe6950480f4ccacb89d11388b4553bd4c0c68f5738118d34d3a1 SHA512 3c5feb658d7d3e35bcc61ef216e59b069df661d6f13de6f26e71da35bd0ca78878099d1ae507da82860d955954f971ab68d5a3b86a3132781c3f03a12dec1f0c
+DIST tracker-3.2.1.tar.xz 1947304 BLAKE2B 9095a457157cd2bedfd34b01afc9fd832af0a5c57c6ba5b9c00175f382b70135e20437d6fd2ca9cc06df28634627e487536b15548f2c5d54c68297f26f06447b SHA512 3e8f33de0f77d45af2ed82e8fd216d6fb4c3aa080648cf490bdaef233fac1c635e10660ac0bfcdf0a43af48d454e0d4d7c04cb650f5f89660e8e4efc10104f56

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
new file mode 100644
index 000000000000..c6895f36512f
--- /dev/null
+++ b/app-misc/tracker/files/tracker-3.2.1-Add-config-options-for-libsoup.patch
@@ -0,0 +1,41 @@
+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/tracker-3.2.1.ebuild b/app-misc/tracker/tracker-3.2.1.ebuild
new file mode 100644
index 000000000000..81ebe3d808b7
--- /dev/null
+++ b/app-misc/tracker/tracker-3.2.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+VALA_MIN_API_VERSION="0.40"
+
+inherit bash-completion-r1 flag-o-matic gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
+
+DESCRIPTION="A tagging metadata database, search tool and indexer"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="3/0" # libtracker-sparql-3.0 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gtk-doc +miners stemmer test"
+RESTRICT="!test? ( test )"
+
+PV_SERIES=$(ver_cut 1-2)
+
+RDEPEND="
+	>=dev-libs/glib-2.52:2
+	>=sys-apps/dbus-1.3.2
+	>=dev-libs/gobject-introspection-1.54:=
+	>=dev-libs/icu-4.8.1.2:=
+	>=dev-libs/json-glib-1.4
+	>=net-libs/libsoup-2.40.1:2.4
+	>=dev-libs/libxml2-2.7
+	>=dev-db/sqlite-3.29.0
+	stemmer? ( dev-libs/snowball-stemmer:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	app-text/asciidoc
+	dev-libs/libxslt
+	$(vala_depend)
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.8
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.5
+	)
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? (
+		$(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
+	)
+	${PYTHON_DEPS}
+"
+PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.1-Fix-asciidoc-manpage.xsl-location.patch
+	"${FILESDIR}"/${PN}-3.2.1-Add-config-options-for-libsoup.patch
+)
+
+function inotify_enabled() {
+	if linux_config_exists; then
+		if ! linux_chkconfig_present INOTIFY_USER; then
+			ewarn "You should enable the INOTIFY support in your kernel."
+			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
+			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
+			die 'missing CONFIG_INOTIFY'
+		fi
+	else
+		einfo "Could not check for INOTIFY support in your kernel."
+	fi
+}
+
+python_check_deps() {
+	use test || return 0
+	has_version -b "dev-python/tappy[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	inotify_enabled
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	append-cflags -DTRACKER_DEBUG -DG_DISABLE_CAST_CHECKS
+
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dman=true
+		$(meson_feature stemmer)
+		-Dunicode_support=icu
+		-Dbash_completion_dir="$(get_bashcompdir)"
+		-Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
+		-Dintrospection=enabled
+		-Dlibsoup2=enabled
+		-Dlibsoup3=disabled
+	)
+	meson_src_configure
+}
+
+src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-misc/tracker/, app-misc/tracker/files/

[Sam James]

commit:     c77e5ff9a69d6d93d4bc9f8e3bdda1c61288c368
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 13:34:12 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 13:37:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c77e5ff9

app-misc/tracker: fix configure issue w/ C99

No revbump as it completely fails without it, thankfully.

Closes: https://bugs.gentoo.org/919095
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-misc/tracker/files/3.6.0-configure-c99.patch | 52 ++++++++++++++++++++++++
 app-misc/tracker/tracker-3.6.0.ebuild            |  6 ++-
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/app-misc/tracker/files/3.6.0-configure-c99.patch b/app-misc/tracker/files/3.6.0-configure-c99.patch
new file mode 100644
index 000000000000..f5de3e2746ce
--- /dev/null
+++ b/app-misc/tracker/files/3.6.0-configure-c99.patch
@@ -0,0 +1,52 @@
+https://bugs.gentoo.org/919095
+https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/638
+https://gitlab.gnome.org/GNOME/tracker/-/commit/f7393d61803815b19a1f210b197cce423ae3cc01
+
+From f7393d61803815b19a1f210b197cce423ae3cc01 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 3 Dec 2023 12:10:27 +0000
+Subject: [PATCH] build: Fix "4-digit year modifier" test
+
+Upcoming `gcc-14` enabled a few warnings into errors, like
+`-Wincompatible-pointer-types`. This caused `tracker` configure to
+fail as:
+
+    $ ../meson
+    ...
+    Checking if "strftime 4-digit year modifier" runs: DID NOT COMPILE
+
+    ../meson.build:235:2: ERROR: Problem encountered: Libc implementation has broken 4-digit years implementation.
+
+This happens because char buffer had an unusual type:
+
+    testfile.c: In function 'main':
+    testfile.c:16:17: error: passing argument 1 of 'strftime' from incompatible pointer type
+    [-Wincompatible-pointer-types]
+       16 |       strftime (&buf, sizeof buf, modifiers[i], &tm);
+          |                 ^~~~
+          |                 |
+          |                 char * (*)[100]
+--- a/meson.build
++++ b/meson.build
+@@ -215,15 +215,15 @@ result = cc.run('''
+   int main (int argc, char *argv[]) {
+     char *modifiers[] = { "%Y", "%C%y", "%4Y", "%2C%y", NULL };
+     time_t timestamp = -58979923200; /* 0101-01-01T01:01:01Z */
+-    char *buf[100];
++    char buf[100];
+     struct tm tm;
+     int i;
+     gmtime_r (&timestamp, &tm);
+     for (i = 0; modifiers[i]; i++) {
+-      strftime (&buf, sizeof buf, modifiers[i], &tm);
+-      if (strcmp (&buf, "0101") == 0) {
++      strftime (buf, sizeof buf, modifiers[i], &tm);
++      if (strcmp (buf, "0101") == 0) {
+         printf ("%s", modifiers[i]);
+-	return 0;
++        return 0;
+       }
+     }
+     return -1;
+-- 
+GitLab

diff --git a/app-misc/tracker/tracker-3.6.0.ebuild b/app-misc/tracker/tracker-3.6.0.ebuild
index 4df7c34a6c95..c98269f998af 100644
--- a/app-misc/tracker/tracker-3.6.0.ebuild
+++ b/app-misc/tracker/tracker-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -45,6 +45,10 @@ BDEPEND="
 "
 PDEPEND="miners? ( >=app-misc/tracker-miners-3.6_rc )"
 
+PATCHES=(
+	"${FILESDIR}"/3.6.0-configure-c99.patch
+)
+
 python_check_deps() {
 	python_has_version -b \
 		"dev-python/pygobject[${PYTHON_USEDEP}]" \