commit: 5963d9bafc507c7ed17fb0b841a0cc0e75b49303 Author: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> AuthorDate: Tue Dec 23 16:26:58 2025 +0000 Commit: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> CommitDate: Tue Dec 23 16:26:58 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5963d9ba
app-misc/tinysparql: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org> .../tinysparql/files/3.6.0-configure-c99.patch | 52 ---------------------- .../files/3.6.0-sqlite-3.45.3-compat.patch | 44 ------------------ 2 files changed, 96 deletions(-) diff --git a/app-misc/tinysparql/files/3.6.0-configure-c99.patch b/app-misc/tinysparql/files/3.6.0-configure-c99.patch deleted file mode 100644 index f5de3e2746ce..000000000000 --- a/app-misc/tinysparql/files/3.6.0-configure-c99.patch +++ /dev/null @@ -1,52 +0,0 @@ -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 <[email protected]> -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 (×tamp, &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/tinysparql/files/3.6.0-sqlite-3.45.3-compat.patch b/app-misc/tinysparql/files/3.6.0-sqlite-3.45.3-compat.patch deleted file mode 100644 index 72e37c83068c..000000000000 --- a/app-misc/tinysparql/files/3.6.0-sqlite-3.45.3-compat.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0c576af6df5af2f1b8df9841fbb566fa52a4e382 Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho <[email protected]> -Date: Thu, 18 Apr 2024 14:18:08 +0200 -Subject: [PATCH] core: Fix incompatibility introduced by SQLite 3.45.3 - -For the umpteenth time, SQLite introduced behavioral changes that -we need to adapt to. This time, version 3.45.3 "fixed" at -https://github.com/sqlite/sqlite/commit/74851f66811854c772a9b2d0a13f1e9e82b69c25 -their SQLITE_ALLOW_ROWID_IN_VIEW build-time option which controls the -behavior of views having an implicit ROWID column vs not. - -This broke our view used to proxy data to the content-less FTS5 -table, since the SELECT query it translates to used a naked reference to -ROWID that is now deemed "ambiguous" by SQLite engine, this results -in the following errors: - -Tracker:ERROR:../tests/core/tracker-ontology-test.c:231:test_query: assertion failed (error == NULL): ambiguous column name: ROWID (tracker-db-interface-error-quark, 0) - -We are actually referencing data inside the SELECT query, so fix this -ambiguity by stating clearly the table/column that we are referring to -within the SELECT query clause. This is backwards compatible with older -versions of SQLite. - -Closes: https://gitlab.gnome.org/GNOME/tracker/-/issues/435 ---- - src/libtracker-sparql/core/tracker-fts.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libtracker-sparql/core/tracker-fts.c b/src/libtracker-sparql/core/tracker-fts.c -index 1171dc11a8..99600820bd 100644 ---- a/src/libtracker-sparql/core/tracker-fts.c -+++ b/src/libtracker-sparql/core/tracker-fts.c -@@ -112,7 +112,7 @@ tracker_fts_create_table (sqlite3 *db, - - g_string_append_printf (from, "WHERE COALESCE (%s NULL) IS NOT NULL ", - column_names->str); -- g_string_append (from, "GROUP BY ROWID"); -+ g_string_append (from, "GROUP BY \"rdfs:Resource\".ID"); - g_string_append (str, from->str); - g_string_free (from, TRUE); - --- -GitLab -
