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

2024-05-03 Thread Mart Raudsepp 
commit: 785116472a3975dff6bc6d9337099bf58f698759
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri May  3 20:25:33 2024 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri May  3 20:34:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78511647

app-misc/tracker: fix regression from sqlite-3.45.3 behaviour change

Straight to stable because sqlite-3.45.3 was already stabilized early and
thus tracker was broken on stable.

Closes: https://bugs.gentoo.org/931015
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../tracker/files/3.6.0-sqlite-3.45.3-compat.patch | 44 ++
 ...racker-3.6.0.ebuild => tracker-3.6.0-r1.ebuild} |  1 +
 2 files changed, 45 insertions(+)

diff --git a/app-misc/tracker/files/3.6.0-sqlite-3.45.3-compat.patch 
b/app-misc/tracker/files/3.6.0-sqlite-3.45.3-compat.patch
new file mode 100644
index ..72e37c83068c
--- /dev/null
+++ b/app-misc/tracker/files/3.6.0-sqlite-3.45.3-compat.patch
@@ -0,0 +1,44 @@
+From 0c576af6df5af2f1b8df9841fbb566fa52a4e382 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho 
+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
+

diff --git a/app-misc/tracker/tracker-3.6.0.ebuild 
b/app-misc/tracker/tracker-3.6.0-r1.ebuild
similarity index 98%
rename from app-misc/tracker/tracker-3.6.0.ebuild
rename to app-misc/tracker/tracker-3.6.0-r1.ebuild
index 3ce100022d75..d45a9117cedf 100644
--- a/app-misc/tracker/tracker-3.6.0.ebuild
+++ b/app-misc/tracker/tracker-3.6.0-r1.ebuild
@@ -47,6 +47,7 @@ PDEPEND="miners? ( >=app-misc/tracker-miners-3.6_rc )"
 
 PATCHES=(
"${FILESDIR}"/3.6.0-configure-c99.patch
+   "${FILESDIR}"/${PV}-sqlite-3.45.3-compat.patch
 )
 
 python_check_deps() {

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

2023-05-15 Thread Matt Turner 
commit: 46e9abaf656222705085c2578770f7ff18c828aa
Author: Brahmajit Das  gmail  com>
AuthorDate: Sun May 14 05:08:23 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon May 15 21:50:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46e9abaf

app-misc/tracker: Fix implicit decl of gmtime_r

Closes: https://bugs.gentoo.org/906339
Closes: https://github.com/gentoo/gentoo/pull/31030
Signed-off-by: Brahmajit Das  gmail.com>
Signed-off-by: Matt Turner  gentoo.org>

 ...5.2-build-Define-_GNU_SOURCE-for-gmtime_r.patch | 46 ++
 app-misc/tracker/tracker-3.5.2.ebuild  |  4 ++
 2 files changed, 50 insertions(+)

diff --git 
a/app-misc/tracker/files/3.5.2-build-Define-_GNU_SOURCE-for-gmtime_r.patch 
b/app-misc/tracker/files/3.5.2-build-Define-_GNU_SOURCE-for-gmtime_r.patch
new file mode 100644
index ..f60d86c0513a
--- /dev/null
+++ b/app-misc/tracker/files/3.5.2-build-Define-_GNU_SOURCE-for-gmtime_r.patch
@@ -0,0 +1,46 @@
+https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/596
+
+From 4fc04fea1755c3c4f8913877c2c1889779d3d4d1 Mon Sep 17 00:00:00 2001
+From: Brahmajit Das 
+Date: Sun, 14 May 2023 09:59:58 +0530
+Subject: [PATCH] build: Define _GNU_SOURCE for gmtime_r
+
+Found while building tracker 3.5.2 with clang 16, which enable
+Wimplicit-function-declaration by default.
+
+Without _GNU_SOURCE defined, tracker would fail in the configure phase
+with Checking if "strftime 4-digit year modifier" runs: DID NOT
+COMPILE error. And investigating the meson log we see
+
+Compiler stderr:
+ 
/var/tmp/portage/app-misc/tracker-3.5.2/work/tracker-3.5.2-build/meson-private/tmplr2vm6b0/testfile.c:12:5:
 error: call to undeclared function 'gmtime_r'; ISO C99 and later do not 
support implicit function declarations [-Wimplicit-function-declaration]
+gmtime_r (, );
+
+And a little further up
+
+Command line:  clang 
/var/tmp/portage/app-misc/tracker-3.5.2/work/tracker-3.5.2-build/meson-private/tmplr2vm6b0/testfile.c
 -o 
/var/tmp/portage/app-misc/tracker-3.5.2/work/tracker-3.5.2-build/meson-private/tmplr2vm6b0/output.exe
 -O2 -pipe -march=native -DTRACKER_DEBUG -DG_DISABLE_CAST_CHECKS 
-D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -std=c99 
-Wl,-O1 -Wl,--as-needed -fuse-ld=lld -rtlib=compiler-rt -unwindlib=libunwind 
-Wl,--as-needed
+
+Seems like cc.run() doesn't pick up the general compiler args we set
+earlier. We have already set it for the main build, so adding it just
+for the configure test should be fine.
+
+Signed-off-by: Brahmajit Das 
+---
+ meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/meson.build b/meson.build
+index 7b22cb1f9..00af07e6e 100644
+--- a/meson.build
 b/meson.build
+@@ -202,6 +202,7 @@ endif
+ # Get an appropriate 4-digit year modifier for strftime
+ ##
+ result = cc.run('''
++  #define _GNU_SOURCE
+   #include 
+   #include 
+   #include 
+-- 
+2.39.3
+

diff --git a/app-misc/tracker/tracker-3.5.2.ebuild 
b/app-misc/tracker/tracker-3.5.2.ebuild
index 69a65b9a77e5..584798e5fc46 100644
--- a/app-misc/tracker/tracker-3.5.2.ebuild
+++ b/app-misc/tracker/tracker-3.5.2.ebuild
@@ -45,6 +45,10 @@ BDEPEND="
 "
 PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
 
+PATCHES=(
+   "${FILESDIR}/${PV}-build-Define-_GNU_SOURCE-for-gmtime_r.patch"
+)
+
 python_check_deps() {
python_has_version -b \
"dev-python/pygobject[${PYTHON_USEDEP}]" \

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

2022-07-21 Thread Matt Turner 
commit: aedf9ae81c24986e8aeb06c5921acb55433bcbff
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Jul 21 11:40:18 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Jul 21 11:45:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aedf9ae8

app-misc/tracker: Remove slot :0

Bug: https://bugs.gentoo.org/846617
Signed-off-by: Matt Turner  gentoo.org>

 app-misc/tracker/Manifest  |   1 -
 .../tracker/files/2.3.6-sqlite-3.34-compat.patch   |  45 -
 app-misc/tracker/tracker-2.3.6-r1.ebuild   | 107 -
 3 files changed, 153 deletions(-)

diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 645f02651591..0c8d3f1a159c 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,3 +1,2 @@
-DIST tracker-2.3.6.tar.xz 1606716 BLAKE2B 
ea39df4438e4502bc0229a5cc3b42a2fe6e13a643ac8e4034004b1291da49ff3ad1a177227035a4a02fd8f3723a735d37371c898bb03a6fc10573606a1c29d70
 SHA512 
1b8ae06b6c64a0cbe7d4c987bafe392fb38014215fc698f919273ba1f422dd0bc24344d3fd73164b00bfea315e527e2886ba90f1f1b86d5fceff24455b36d67e
 DIST tracker-3.3.1.tar.xz 1976268 BLAKE2B 
34492aac5c7a5cae20cc3b246de7a7f9948be05356508cffeec56cd6aa83b89a875c01d58c299299723e1aed8bba55d641dc817f77cecbe1379b49ea853aa8b3
 SHA512 
34a86ac58bf8b31f3beb106d3f8db38b764624b800f4cb1c015102f02616e4c2d356f58f0e6a13f66cca79a4173828748ad5e4217b21e83b2fe1606ddcd7ce88
 DIST tracker-3.3.2.tar.xz 1977512 BLAKE2B 
92d8db9ad33b019f47194f086379e1f9370d9ce3643a2a2dc02d277be755e5a892ab4c6bead8c2d50db642aca37141c9961d2fd1f862be57a6e0f78b479eb03f
 SHA512 
2009c7a9b82fd278e38bc71cb41ef1fccb23493bd84a71456c7568ed7a025ce68bab689b8f14b8008479a203a5fdc02acea1862f4f482467ed5c295bde3d4ad8

diff --git a/app-misc/tracker/files/2.3.6-sqlite-3.34-compat.patch 
b/app-misc/tracker/files/2.3.6-sqlite-3.34-compat.patch
deleted file mode 100644
index cdbfe2f6136e..
--- a/app-misc/tracker/files/2.3.6-sqlite-3.34-compat.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 29a6650f698bbd449e11fc0481269cd8f0593f27 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho 
-Date: Thu, 10 Dec 2020 03:55:08 +0100
-Subject: [PATCH] libtracker-data: Avoid deletion of empty rows in FTS table
-
-Starting with SQLite 3.34.0, this turns into a consistency error. Ensure
-rows being deleted have actually some content before proceeding to deletion,
-and ensure we don't process individual properties one by one in the course
-of a whole rdfs:Resource deletion.
-
-Fixes: https://bugs.archlinux.org/task/68903

- src/libtracker-data/tracker-data-update.c | 1 +
- src/libtracker-data/tracker-db-interface-sqlite.c | 3 ++-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/libtracker-data/tracker-data-update.c 
b/src/libtracker-data/tracker-data-update.c
-index e2f46685e..19cae25f9 100644
 a/src/libtracker-data/tracker-data-update.c
-+++ b/src/libtracker-data/tracker-data-update.c
-@@ -2244,6 +2244,7 @@ cache_delete_resource_type_full (TrackerData  *data,
-   g_hash_table_size (data->resource_buffer->tables) == 0) {
- #if HAVE_TRACKER_FTS
-   tracker_db_interface_sqlite_fts_delete_id (iface, 
data->resource_buffer->id);
-+  data->resource_buffer->fts_updated = TRUE;
- #endif
-   /* skip subclass query when deleting whole resource
-  to improve performance */
-diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c 
b/src/libtracker-data/tracker-db-interface-sqlite.c
-index da88080ed..cdeb960e7 100644
 a/src/libtracker-data/tracker-db-interface-sqlite.c
-+++ b/src/libtracker-data/tracker-db-interface-sqlite.c
-@@ -1770,7 +1770,8 @@ tracker_db_interface_sqlite_fts_create_delete_all_query 
(TrackerDBInterface *db_
-   g_string_append_printf (insert_str,
-   "INSERT INTO fts5 (fts5, rowid %s) "
-   "SELECT 'delete', rowid %s FROM fts_view "
--  "WHERE rowid = ?",
-+  "WHERE rowid = ? AND COALESCE(NULL %s) IS NOT 
NULL",
-+  db_interface->fts_properties,
-   db_interface->fts_properties,
-   db_interface->fts_properties);
-   return g_string_free (insert_str, FALSE);
--- 
-2.32.0
-

diff --git a/app-misc/tracker/tracker-2.3.6-r1.ebuild 
b/app-misc/tracker/tracker-2.3.6-r1.ebuild
deleted file mode 100644
index 00c45d75bcc8..
--- a/app-misc/tracker/tracker-2.3.6-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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 gnome.org gnome2-utils linux-info meson 
python-any-r1 systemd vala xdg
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"

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

2022-03-26 Thread Matt Turner 
commit: 8f0caccc3fc5d98f53b2dc7f7f56867b89ff474a
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Mar 27 05:26:02 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Mar 27 05:26:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f0caccc

Revert "app-misc/tracker: Drop old versions"

This reverts commit ed7171c7c2411f6add10beba7534e814dab5c413.

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/tracker/Manifest  |   1 +
 .../tracker/files/2.3.6-sqlite-3.34-compat.patch   |  45 +
 app-misc/tracker/tracker-2.3.6-r1.ebuild   | 107 +
 3 files changed, 153 insertions(+)

diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index a9daf6b37ad5..0273c2755643 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,2 +1,3 @@
+DIST tracker-2.3.6.tar.xz 1606716 BLAKE2B 
ea39df4438e4502bc0229a5cc3b42a2fe6e13a643ac8e4034004b1291da49ff3ad1a177227035a4a02fd8f3723a735d37371c898bb03a6fc10573606a1c29d70
 SHA512 
1b8ae06b6c64a0cbe7d4c987bafe392fb38014215fc698f919273ba1f422dd0bc24344d3fd73164b00bfea315e527e2886ba90f1f1b86d5fceff24455b36d67e
 DIST tracker-3.2.1.tar.xz 1947304 BLAKE2B 
9095a457157cd2bedfd34b01afc9fd832af0a5c57c6ba5b9c00175f382b70135e20437d6fd2ca9cc06df28634627e487536b15548f2c5d54c68297f26f06447b
 SHA512 
3e8f33de0f77d45af2ed82e8fd216d6fb4c3aa080648cf490bdaef233fac1c635e10660ac0bfcdf0a43af48d454e0d4d7c04cb650f5f89660e8e4efc10104f56
 DIST tracker-3.3.0.tar.xz 1969132 BLAKE2B 
a43183599ee3d3947450e4d58fd02094a41d5978d0c3be120b995844eca5ddc0f7e37bd98e886bec99d5c9342f5ba6f92eec2cd729a1793ce2141bfa5ff99908
 SHA512 
0a55a80b44c2267f149c4c83ecbe42ca27a0645bd4fc206984999520f6bed3b7c63c71f81450f40ce2896223ce17326add20e7f39a71c821d754f30b8ce157bc

diff --git a/app-misc/tracker/files/2.3.6-sqlite-3.34-compat.patch 
b/app-misc/tracker/files/2.3.6-sqlite-3.34-compat.patch
new file mode 100644
index ..cdbfe2f6136e
--- /dev/null
+++ b/app-misc/tracker/files/2.3.6-sqlite-3.34-compat.patch
@@ -0,0 +1,45 @@
+From 29a6650f698bbd449e11fc0481269cd8f0593f27 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho 
+Date: Thu, 10 Dec 2020 03:55:08 +0100
+Subject: [PATCH] libtracker-data: Avoid deletion of empty rows in FTS table
+
+Starting with SQLite 3.34.0, this turns into a consistency error. Ensure
+rows being deleted have actually some content before proceeding to deletion,
+and ensure we don't process individual properties one by one in the course
+of a whole rdfs:Resource deletion.
+
+Fixes: https://bugs.archlinux.org/task/68903
+---
+ src/libtracker-data/tracker-data-update.c | 1 +
+ src/libtracker-data/tracker-db-interface-sqlite.c | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/libtracker-data/tracker-data-update.c 
b/src/libtracker-data/tracker-data-update.c
+index e2f46685e..19cae25f9 100644
+--- a/src/libtracker-data/tracker-data-update.c
 b/src/libtracker-data/tracker-data-update.c
+@@ -2244,6 +2244,7 @@ cache_delete_resource_type_full (TrackerData  *data,
+   g_hash_table_size (data->resource_buffer->tables) == 0) {
+ #if HAVE_TRACKER_FTS
+   tracker_db_interface_sqlite_fts_delete_id (iface, 
data->resource_buffer->id);
++  data->resource_buffer->fts_updated = TRUE;
+ #endif
+   /* skip subclass query when deleting whole resource
+  to improve performance */
+diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c 
b/src/libtracker-data/tracker-db-interface-sqlite.c
+index da88080ed..cdeb960e7 100644
+--- a/src/libtracker-data/tracker-db-interface-sqlite.c
 b/src/libtracker-data/tracker-db-interface-sqlite.c
+@@ -1770,7 +1770,8 @@ tracker_db_interface_sqlite_fts_create_delete_all_query 
(TrackerDBInterface *db_
+   g_string_append_printf (insert_str,
+   "INSERT INTO fts5 (fts5, rowid %s) "
+   "SELECT 'delete', rowid %s FROM fts_view "
+-  "WHERE rowid = ?",
++  "WHERE rowid = ? AND COALESCE(NULL %s) IS NOT 
NULL",
++  db_interface->fts_properties,
+   db_interface->fts_properties,
+   db_interface->fts_properties);
+   return g_string_free (insert_str, FALSE);
+-- 
+2.32.0
+

diff --git a/app-misc/tracker/tracker-2.3.6-r1.ebuild 
b/app-misc/tracker/tracker-2.3.6-r1.ebuild
new file mode 100644
index ..cfaa81da0bab
--- /dev/null
+++ b/app-misc/tracker/tracker-2.3.6-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+VALA_MIN_API_VERSION="0.40"
+
+inherit bash-completion-r1 gnome.org gnome2-utils linux-info meson 
python-any-r1 systemd vala xdg
+
+DESCRIPTION="A tagging metadata

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

2022-03-26 Thread Matt Turner 
commit: ed7171c7c2411f6add10beba7534e814dab5c413
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Mar 27 05:06:56 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Mar 27 05:06:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed7171c7

app-misc/tracker: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/tracker/Manifest  |   1 -
 .../tracker/files/2.3.6-sqlite-3.34-compat.patch   |  45 -
 app-misc/tracker/tracker-2.3.6-r1.ebuild   | 107 -
 3 files changed, 153 deletions(-)

diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 0273c2755643..a9daf6b37ad5 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,3 +1,2 @@
-DIST tracker-2.3.6.tar.xz 1606716 BLAKE2B 
ea39df4438e4502bc0229a5cc3b42a2fe6e13a643ac8e4034004b1291da49ff3ad1a177227035a4a02fd8f3723a735d37371c898bb03a6fc10573606a1c29d70
 SHA512 
1b8ae06b6c64a0cbe7d4c987bafe392fb38014215fc698f919273ba1f422dd0bc24344d3fd73164b00bfea315e527e2886ba90f1f1b86d5fceff24455b36d67e
 DIST tracker-3.2.1.tar.xz 1947304 BLAKE2B 
9095a457157cd2bedfd34b01afc9fd832af0a5c57c6ba5b9c00175f382b70135e20437d6fd2ca9cc06df28634627e487536b15548f2c5d54c68297f26f06447b
 SHA512 
3e8f33de0f77d45af2ed82e8fd216d6fb4c3aa080648cf490bdaef233fac1c635e10660ac0bfcdf0a43af48d454e0d4d7c04cb650f5f89660e8e4efc10104f56
 DIST tracker-3.3.0.tar.xz 1969132 BLAKE2B 
a43183599ee3d3947450e4d58fd02094a41d5978d0c3be120b995844eca5ddc0f7e37bd98e886bec99d5c9342f5ba6f92eec2cd729a1793ce2141bfa5ff99908
 SHA512 
0a55a80b44c2267f149c4c83ecbe42ca27a0645bd4fc206984999520f6bed3b7c63c71f81450f40ce2896223ce17326add20e7f39a71c821d754f30b8ce157bc

diff --git a/app-misc/tracker/files/2.3.6-sqlite-3.34-compat.patch 
b/app-misc/tracker/files/2.3.6-sqlite-3.34-compat.patch
deleted file mode 100644
index cdbfe2f6136e..
--- a/app-misc/tracker/files/2.3.6-sqlite-3.34-compat.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 29a6650f698bbd449e11fc0481269cd8f0593f27 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho 
-Date: Thu, 10 Dec 2020 03:55:08 +0100
-Subject: [PATCH] libtracker-data: Avoid deletion of empty rows in FTS table
-
-Starting with SQLite 3.34.0, this turns into a consistency error. Ensure
-rows being deleted have actually some content before proceeding to deletion,
-and ensure we don't process individual properties one by one in the course
-of a whole rdfs:Resource deletion.
-
-Fixes: https://bugs.archlinux.org/task/68903

- src/libtracker-data/tracker-data-update.c | 1 +
- src/libtracker-data/tracker-db-interface-sqlite.c | 3 ++-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/libtracker-data/tracker-data-update.c 
b/src/libtracker-data/tracker-data-update.c
-index e2f46685e..19cae25f9 100644
 a/src/libtracker-data/tracker-data-update.c
-+++ b/src/libtracker-data/tracker-data-update.c
-@@ -2244,6 +2244,7 @@ cache_delete_resource_type_full (TrackerData  *data,
-   g_hash_table_size (data->resource_buffer->tables) == 0) {
- #if HAVE_TRACKER_FTS
-   tracker_db_interface_sqlite_fts_delete_id (iface, 
data->resource_buffer->id);
-+  data->resource_buffer->fts_updated = TRUE;
- #endif
-   /* skip subclass query when deleting whole resource
-  to improve performance */
-diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c 
b/src/libtracker-data/tracker-db-interface-sqlite.c
-index da88080ed..cdeb960e7 100644
 a/src/libtracker-data/tracker-db-interface-sqlite.c
-+++ b/src/libtracker-data/tracker-db-interface-sqlite.c
-@@ -1770,7 +1770,8 @@ tracker_db_interface_sqlite_fts_create_delete_all_query 
(TrackerDBInterface *db_
-   g_string_append_printf (insert_str,
-   "INSERT INTO fts5 (fts5, rowid %s) "
-   "SELECT 'delete', rowid %s FROM fts_view "
--  "WHERE rowid = ?",
-+  "WHERE rowid = ? AND COALESCE(NULL %s) IS NOT 
NULL",
-+  db_interface->fts_properties,
-   db_interface->fts_properties,
-   db_interface->fts_properties);
-   return g_string_free (insert_str, FALSE);
--- 
-2.32.0
-

diff --git a/app-misc/tracker/tracker-2.3.6-r1.ebuild 
b/app-misc/tracker/tracker-2.3.6-r1.ebuild
deleted file mode 100644
index cfaa81da0bab..
--- a/app-misc/tracker/tracker-2.3.6-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-VALA_MIN_API_VERSION="0.40"
-
-inherit bash-completion-r1 gnome.org gnome2-utils linux-info meson 
python-any-r1 systemd vala xdg
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"

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

2022-02-20 Thread Matt Turner 
commit: 9e7bddcce802a7ec8e3e731592fa18e3ba5ff0a2
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Feb 20 18:38:56 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Feb 20 18:39:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e7bddcc

app-misc/tracker: Fix test dependencies

Closes: https://bugs.gentoo.org/832141
Signed-off-by: Matt Turner  gentoo.org>

 ...d-Add-an-option-to-control-building-tests.patch | 69 ++
 app-misc/tracker/tracker-3.2.1.ebuild  |  3 +
 2 files changed, 72 insertions(+)

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
new file mode 100644
index ..9480a6269c75
--- /dev/null
+++ 
b/app-misc/tracker/files/tracker-3.2.1-build-Add-an-option-to-control-building-tests.patch
@@ -0,0 +1,69 @@
+From db36d010737d5eeceff300e3dd5e315c5d0382a2 Mon Sep 17 00:00:00 2001
+From: Matt Turner 
+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
+

diff --git a/app-misc/tracker/tracker-3.2.1.ebuild 
b/app-misc/tracker/tracker-3.2.1.ebuild
index 81ebe3d808b7..534f1b18334a 100644
--- a/app-misc/tracker/tracker-3.2.1.ebuild
+++ b/app-misc/tracker/tracker-3.2.1.ebuild
@@ -43,6 +43,7 @@ BDEPEND="
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
test? (
+   $(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
$(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
)
${PYTHON_DEPS}
@@ -52,6 +53,7 @@ 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
+   
"${FILESDIR}"/${PN}-3.2.1-build-Add-an-option-to-control-building-tests.patch
 )
 
 function inotify_enabled() {
@@ -94,6 +96,7 @@ src_configure() {
-Dunicode_support=icu
-Dbash_completion_dir="$(get_bashcompdir)"
-Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
+   $(meson_use test tests)
-Dintrospection=enabled
-Dlibsoup2=enabled
-Dlibsoup3=disabled

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

2021-08-13 Thread Mart Raudsepp 
commit: e70376859638b7ae133342992c04db92e0ffe39c
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Aug 13 13:43:22 2021 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Aug 13 16:26:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7037685

app-misc/tracker: bump to 2.3.6

Stops tracker-store getting spawned on startup on tracker3 systems

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Mart Raudsepp  gentoo.org>

 app-misc/tracker/Manifest  |   1 +
 .../tracker/files/2.3.6-sqlite-3.34-compat.patch   |  45 +
 app-misc/tracker/tracker-2.3.6.ebuild  | 107 +
 3 files changed, 153 insertions(+)

diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 282aa7275d2..73fe290c692 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/app-misc/tracker/files/2.3.6-sqlite-3.34-compat.patch 
b/app-misc/tracker/files/2.3.6-sqlite-3.34-compat.patch
new file mode 100644
index 000..cdbfe2f6136
--- /dev/null
+++ b/app-misc/tracker/files/2.3.6-sqlite-3.34-compat.patch
@@ -0,0 +1,45 @@
+From 29a6650f698bbd449e11fc0481269cd8f0593f27 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho 
+Date: Thu, 10 Dec 2020 03:55:08 +0100
+Subject: [PATCH] libtracker-data: Avoid deletion of empty rows in FTS table
+
+Starting with SQLite 3.34.0, this turns into a consistency error. Ensure
+rows being deleted have actually some content before proceeding to deletion,
+and ensure we don't process individual properties one by one in the course
+of a whole rdfs:Resource deletion.
+
+Fixes: https://bugs.archlinux.org/task/68903
+---
+ src/libtracker-data/tracker-data-update.c | 1 +
+ src/libtracker-data/tracker-db-interface-sqlite.c | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/libtracker-data/tracker-data-update.c 
b/src/libtracker-data/tracker-data-update.c
+index e2f46685e..19cae25f9 100644
+--- a/src/libtracker-data/tracker-data-update.c
 b/src/libtracker-data/tracker-data-update.c
+@@ -2244,6 +2244,7 @@ cache_delete_resource_type_full (TrackerData  *data,
+   g_hash_table_size (data->resource_buffer->tables) == 0) {
+ #if HAVE_TRACKER_FTS
+   tracker_db_interface_sqlite_fts_delete_id (iface, 
data->resource_buffer->id);
++  data->resource_buffer->fts_updated = TRUE;
+ #endif
+   /* skip subclass query when deleting whole resource
+  to improve performance */
+diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c 
b/src/libtracker-data/tracker-db-interface-sqlite.c
+index da88080ed..cdeb960e7 100644
+--- a/src/libtracker-data/tracker-db-interface-sqlite.c
 b/src/libtracker-data/tracker-db-interface-sqlite.c
+@@ -1770,7 +1770,8 @@ tracker_db_interface_sqlite_fts_create_delete_all_query 
(TrackerDBInterface *db_
+   g_string_append_printf (insert_str,
+   "INSERT INTO fts5 (fts5, rowid %s) "
+   "SELECT 'delete', rowid %s FROM fts_view "
+-  "WHERE rowid = ?",
++  "WHERE rowid = ? AND COALESCE(NULL %s) IS NOT 
NULL",
++  db_interface->fts_properties,
+   db_interface->fts_properties,
+   db_interface->fts_properties);
+   return g_string_free (insert_str, FALSE);
+-- 
+2.32.0
+

diff --git a/app-misc/tracker/tracker-2.3.6.ebuild 
b/app-misc/tracker/tracker-2.3.6.ebuild
new file mode 100644
index 000..66c91276a49
--- /dev/null
+++ b/app-misc/tracker/tracker-2.3.6.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+VALA_MIN_API_VERSION="0.40"
+
+inherit bash-completion-r1 gnome.org gnome2-utils linux-info meson 
python-any-r1 systemd vala xdg
+

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

2019-08-05 Thread Mart Raudsepp 
commit: 24498428ca700c5f84c362ea7f7c800aa1213326
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Mon Aug  5 11:01:47 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Aug  5 12:41:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24498428

app-misc/tracker: fix compatibility with vala:0.44 and reallow 0.44

With vala:0.46 it has new problems, so raise the MAX from 0.42 to 0.44
instead of removing it. The core problem was that 0.44.4 fixed a bug
where it didn't notice some extern symbol or whatnot and filtered out
a Tracker-2.0 include, so now with 0.44.4 and newer the GIR file had
Tracker-2.0 including Tracker-2.0 and under sandbox it bailed out
in some snprintf stuff (without sandbox it seemed to succeed, maybe
it has a recursion limit that hits after stricter sandbox bails on
some snprintf limit stuff going on in that recursion, or I tested
bad) in the recursion. Newer tracker has a fix by avoiding this
situation that it itself causes (it merges multiple different GIR
files together, without that it would probably be fine) by avoiding
the include of itself, and this is the patch that we apply now to
fix vala:0.44 compat to be able to lift the restriction.

Closes: https://bugs.gentoo.org/691072
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../tracker/files/2.1.8-vala-0.44-compat.patch | 46 ++
 app-misc/tracker/tracker-2.1.8.ebuild  |  3 +-
 2 files changed, 48 insertions(+), 1 deletion(-)

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
new file mode 100644
index 000..85a7eeadc2b
--- /dev/null
+++ b/app-misc/tracker/files/2.1.8-vala-0.44-compat.patch
@@ -0,0 +1,46 @@
+From e93ea9167dc4185b6c29b27abdab55b6bcd06c74 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho 
+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
+

diff --git a/app-misc/tracker/tracker-2.1.8.ebuild 
b/app-misc/tracker/tracker-2.1.8.ebuild
index 3bce3d5c217..a709313c84a 100644
--- a/app-misc/tracker/tracker-2.1.8.ebuild
+++ b/app-misc/tracker/tracker-2.1.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 PYTHON_COMPAT=( python3_{5,6,7} )
-VALA_MAX_API_VERSION="0.42"
+VALA_MAX_API_VERSION="0.44"
 
 inherit bash-completion-r1 eapi7-ver gnome.org linux-info meson python-any-r1 
systemd vala xdg
 
@@ -50,6 +50,7 @@ PATCHES=(
"${FILESDIR}"/${PV}-test-fix.patch # 
https://gitlab.gnome.org/GNOME/tracker/merge_requests/59
"${FILESDIR}"/${PV}-prevent-stack-smashing.patch
"${FILESDIR}"/${PV}-fix-library-symlinks.patch
+   "${FILESDIR}"/${PV}-vala-0.44-compat.patch # upstream commit e93ea9167dc
 )
 
 function inotify_enabled() {

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

2019-02-15 Thread Mart Raudsepp 
commit: fe6bac8296ebbf1da3f8bdb366f47ed4229fa163
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Feb 15 14:13:09 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Feb 15 14:14:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe6bac82

app-misc/tracker: fix database upgrade from tracker-1

Without the added patch tracker-store actually fails to upgrade
the database from tracker-1 times to tracker-2 and exits, thus
for users that had used tracker-1 already tracker-2 wouldn't
actually work at all. This patch fixes it for me at least.
This might only be a problem when upgrading from tracker-1 only
now, while having sqlite at v3.25 or newer, but this will be the
case for only main tree users.

Bug: https://bugs.gentoo.org/672308
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../tracker/files/2.1.7-upgrade-path-fix.patch | 33 ++
 ...racker-2.1.7.ebuild => tracker-2.1.7-r1.ebuild} |  1 +
 2 files changed, 34 insertions(+)

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
new file mode 100644
index 000..a1fa32738d8
--- /dev/null
+++ b/app-misc/tracker/files/2.1.7-upgrade-path-fix.patch
@@ -0,0 +1,33 @@
+From d7e31d6940efdb6716689136774a94cfdfd83189 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho 
+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/tracker-2.1.7.ebuild 
b/app-misc/tracker/tracker-2.1.7-r1.ebuild
similarity index 98%
rename from app-misc/tracker/tracker-2.1.7.ebuild
rename to app-misc/tracker/tracker-2.1.7-r1.ebuild
index 24923cfd409..c9232427a4b 100644
--- a/app-misc/tracker/tracker-2.1.7.ebuild
+++ b/app-misc/tracker/tracker-2.1.7-r1.ebuild
@@ -52,6 +52,7 @@ PATCHES=(
"${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/files/, app-misc/tracker/

2016-11-01 Thread Gilles Dartiguelongue 
commit: 7278ccf972ff85dc414d3def94c832efbfc22627
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Tue Nov  1 17:04:54 2016 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Tue Nov  1 23:57:48 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7278ccf9

app-misc/tracker: cleanup old revision

Package-Manager: portage-2.3.2

 app-misc/tracker/Manifest  |   1 -
 .../tracker/files/tracker-1.6.2-include-path.patch |  64 -
 .../files/tracker-1.6.2-sqlite-underlinking.patch  |  58 -
 app-misc/tracker/tracker-1.6.2.ebuild  | 266 -
 4 files changed, 389 deletions(-)

diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 582a24f..7ba0741 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,3 +1,2 @@
 DIST tracker-1.10.1.tar.xz 5027912 SHA256 
67ea78cca8ebbd6633dddcdd40b5205683cc886b872cde987e2a8bae171f4191 SHA512 
aa523fad1c577926ec1f33692314afe673bdc6a84917c4ed506d29e8d0ec17dfacf0a6694cd794d140fc1498770b58d640ed4886c2827644665c92461764d7ce
 WHIRLPOOL 
6947aef1420f15c879ae26a7c5e17ce0a34316077cba20b12dbb5be7e5f55ea840d6d0e145d3c19f47f3db640e07b043a6a25a7bd810bd6ac9a3de336f30f6d3
-DIST tracker-1.6.2.tar.xz 6128492 SHA256 
d3583f32e6a06ccb1146ca31939710edb630d7ffe3da37b01f893b45f4480045 SHA512 
280f2feab5c6af611c77ce90db925ecb6278eb4b516f22ac9f8b44ebfd87806fdbca51985ca28eccdabb503ee15ac76ded31d9380ea448cb2dc3fdd1ee4d5914
 WHIRLPOOL 
d5ceca74daf114a3d09b2975d2ae3d21891c2f0a6cb9923ceda89e9f57b5fe049c9f23164f6f5c00806c664b98cc01dc5e8760fe6dcf5046125b520530924852
 DIST tracker-1.8.0.tar.xz 4961488 SHA256 
a11f31a373bfec3abae38ae719d0a59f666f1f067d8789ade2ed7032a152907d SHA512 
c7d0600cfcf5485188167d237e22a00a5777b97b96c8735ba3efcef67288a8d9db9476f05289cf1498c50432981a4bc932973241138ea116a18e421576ed3cdd
 WHIRLPOOL 
2941ab228ccaae96abf8ad1387d898981aae961164425df21fb941ca4f49e485dfb094b191b1ec46f1b83f5e248fbce700b18b232209866fdb248b4bba53

diff --git a/app-misc/tracker/files/tracker-1.6.2-include-path.patch 
b/app-misc/tracker/files/tracker-1.6.2-include-path.patch
deleted file mode 100644
index 18f62b8..
--- a/app-misc/tracker/files/tracker-1.6.2-include-path.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From a0be9abc0bffdaedd1e64a45da0eb12509b1ab72 Mon Sep 17 00:00:00 2001
-From: David King 
-Date: Wed, 2 Mar 2016 11:10:51 +
-Subject: Ensure embedded sqlite.h is in the include path
-
-https://bugzilla.gnome.org/show_bug.cgi?id=762976

- src/libtracker-data/Makefile.am   | 1 +
- src/libtracker-fts/Makefile.am| 1 +
- src/plugins/evolution/Makefile.am | 1 +
- src/tracker-store/Makefile.am | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/src/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am
-index 7835d1f..6ad4c7f 100644
 a/src/libtracker-data/Makefile.am
-+++ b/src/libtracker-data/Makefile.am
-@@ -12,6 +12,7 @@ AM_VALAFLAGS = \
- AM_CPPFLAGS =  \
-   $(BUILD_VALACFLAGS)\
-   -I$(top_srcdir)/src\
-+  -I$(top_srcdir)/src/sqlite \
-   -I$(top_builddir)/src  \
-   -DSHAREDIR=\""$(datadir)"\"\
-   $(LIBTRACKER_DATA_CFLAGS)
-diff --git a/src/libtracker-fts/Makefile.am b/src/libtracker-fts/Makefile.am
-index bcb2802..27ff127 100644
 a/src/libtracker-fts/Makefile.am
-+++ b/src/libtracker-fts/Makefile.am
-@@ -1,6 +1,7 @@
- AM_CPPFLAGS =  \
-   $(BUILD_CFLAGS)\
-   -I$(top_srcdir)/src\
-+  -I$(top_srcdir)/src/sqlite \
-   -DNDEBUG   \
-   $(LIBTRACKER_FTS_CFLAGS)
- 
-diff --git a/src/plugins/evolution/Makefile.am 
b/src/plugins/evolution/Makefile.am
-index dcdd886..9448b2f 100644
 a/src/plugins/evolution/Makefile.am
-+++ b/src/plugins/evolution/Makefile.am
-@@ -1,6 +1,7 @@
- AM_CPPFLAGS =  \
-   $(BUILD_CFLAGS)\
-   -I$(top_srcdir)/src\
-+  -I$(top_srcdir)/src/sqlite \
-   -I$(top_builddir)/src  \
-   -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \
-   -DLOCALEDIR="\"$(localedir)\"" \
-diff --git a/src/tracker-store/Makefile.am b/src/tracker-store/Makefile.am
-index 83cb77e..26d8a06 100644
 a/src/tracker-store/Makefile.am
-+++ b/src/tracker-store/Makefile.am
-@@ -5,6 +5,7 @@ AM_CPPFLAGS =  \
-   
-DMAIL_MODULES_DIR=\""$(libdir)"/tracker-$(TRACKER_API_VERSION)/mail-modules\" \
-   
-DPUSH_MODULES_DIR=\""$(libdir)/tracker-$(TRACKER_API_VERSION)/push-modules/daemon"\"
 \
-

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

2016-04-03 Thread Pacho Ramos 
commit: 2ec6654559113819bc434ccf73a505df359b6908
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Apr  3 11:57:19 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Apr  3 12:41:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ec66545

app-misc/tracker: Drop old

Package-Manager: portage-2.2.28

 app-misc/tracker/Manifest  |   2 -
 .../files/tracker-1.4.0-have-gstreamer-fix.patch   |  35 ---
 app-misc/tracker/tracker-1.4.1.ebuild  | 271 -
 app-misc/tracker/tracker-1.6.0.ebuild  | 263 
 4 files changed, 571 deletions(-)

diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index a76151f..c974a58 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,3 +1 @@
-DIST tracker-1.4.1.tar.xz 5937232 SHA256 
94ecf25a64f4502664e0c45ec25dae0a91f00ad893fb85dd1c2ffe336563e328 SHA512 
f9be6e88af4b41e990b10bb9ed1e56acf7dfa3f45d2698cdd9168cf9d98b232ea78c82a3c6e0b7026a4a08e06ce65c1d28ae125ef98e4e0c1edc9a131c4ab7cb
 WHIRLPOOL 
e11debc1df001eb8af581fae85136601891c8644710fe2f65c6d80d4ab5eba099291ce9941938494414084bc83384822bdb122523104dbb5201e0f52e05b0534
-DIST tracker-1.6.0.tar.xz 4929004 SHA256 
7e2729627224f43f8cd99c18d027a3b984e049fe924a265a9b31857566c9e28a SHA512 
7dfb173cfd9121c34e637b85328b0c5bb7884d71696058a37f86ca3ee1539ce8600abb69172df9cf54b43f8b2b9e62a0acaa6a3c92b097fc3d31e2190450a674
 WHIRLPOOL 
cb51aa3b00abe804cec77ed5d8d4da0485bec1b2aedb4465eaf4b652277740ee125ad1a5d3e707ab2ed1766134fda1b427f0de1140aef7375b824c3295ee834c
 DIST tracker-1.6.1.tar.xz 4905544 SHA256 
653ed73f4f454b836df56bec1f1141c7a8d77cbeba97ea1e38df9f60a5f0c1ed SHA512 
f3002576164cc4ba60b9c2f19bd301be7c1a9ef187216a7e1366d52ed0925f6d9fb29d2527d4bc5a88eb75314765de26621d5183741ecb9f21eb988a19d3f0ae
 WHIRLPOOL 
c3a8a9840528949799be58c212a493e3319e6ad25830ff286d8bf47c13acbbbcf573287bd633cb9ca6b24e907c3bd0491c60c23d8f50f92f2898b022c689048c

diff --git a/app-misc/tracker/files/tracker-1.4.0-have-gstreamer-fix.patch 
b/app-misc/tracker/files/tracker-1.4.0-have-gstreamer-fix.patch
deleted file mode 100644
index de2b774..000
--- a/app-misc/tracker/files/tracker-1.4.0-have-gstreamer-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 32333d707ca2a4a33bbefd051c70f037d81207eb Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue 
-Date: Wed, 3 Jun 2015 23:42:56 +0200
-Subject: [PATCH] Fix AM_CONDITIONAL position HAVE_{GSTREAMER,LIBAV} definition
-

- configure.ac | 9 -
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index b2e3ae8..6ed8801 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -1884,14 +1884,13 @@ fi
- 
- if test "$have_generic_media_handler_app" = "GStreamer"; then
-AC_DEFINE(HAVE_GSTREAMER, [], [Define if we have GStreamer])
--   AM_CONDITIONAL(HAVE_GSTREAMER, true)
--   AM_CONDITIONAL(HAVE_LIBAV, false)
- elif test "$have_generic_media_handler_app" = "libav"; then
--AC_DEFINE(HAVE_GSTREAMER, [], [Define if we have libav])
--AM_CONDITIONAL(HAVE_LIBAV, true)
--AM_CONDITIONAL(HAVE_GSTREAMER, false)
-+   AC_DEFINE(HAVE_LIBAV, [], [Define if we have libav])
- fi
- 
-+AM_CONDITIONAL(HAVE_GSTREAMER, [test "$have_generic_media_handler_app" = 
"GStreamer"])
-+AM_CONDITIONAL(HAVE_LIBAV, [test "$have_generic_media_handler_app" = 
"libav"])
-+
- ###
- # Check for gstreamer backend: tagreadbin/decodebin2/discoverer/gupnp-dlna
- ###
--- 
-2.4.1
-

diff --git a/app-misc/tracker/tracker-1.4.1.ebuild 
b/app-misc/tracker/tracker-1.4.1.ebuild
deleted file mode 100644
index 97abe16..000
--- a/app-misc/tracker/tracker-1.4.1.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.18"
-
-inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib 
python-any-r1 vala versionator virtualx
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker;
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/100"
-IUSE="cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf
-gstreamer gtk iptc +iso +jpeg libav +miner-fs mp3 nautilus networkmanager
-pdf playlist rss stemmer test thunderbird +tiff upnp-av upower +vorbis +xml 
xmp xps"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-REQUIRED_USE="
-   ?? ( gstreamer ffmpeg )
-   cue? ( gstreamer )
-   upnp-av? ( gstreamer )
-   !miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf 
!playlist !tiff !vorbis !xml !xmp !xps )
-"
-
-# According to NEWS, introspection is non-optional
-# glibc-2.12 needed for

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

2016-04-03 Thread Pacho Ramos 
commit: 57356e594f55c45b33a2a5c5679e6b816a2f8478
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Apr  3 12:00:08 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Apr  3 12:41:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57356e59

app-misc/tracker: Version bump

Package-Manager: portage-2.2.28

 app-misc/tracker/Manifest  |   1 +
 .../tracker/files/tracker-1.6.2-include-path.patch |  64 +
 app-misc/tracker/tracker-1.6.2.ebuild  | 263 +
 3 files changed, 328 insertions(+)

diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index c974a58..14ebe99 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1 +1,2 @@
 DIST tracker-1.6.1.tar.xz 4905544 SHA256 
653ed73f4f454b836df56bec1f1141c7a8d77cbeba97ea1e38df9f60a5f0c1ed SHA512 
f3002576164cc4ba60b9c2f19bd301be7c1a9ef187216a7e1366d52ed0925f6d9fb29d2527d4bc5a88eb75314765de26621d5183741ecb9f21eb988a19d3f0ae
 WHIRLPOOL 
c3a8a9840528949799be58c212a493e3319e6ad25830ff286d8bf47c13acbbbcf573287bd633cb9ca6b24e907c3bd0491c60c23d8f50f92f2898b022c689048c
+DIST tracker-1.6.2.tar.xz 6128492 SHA256 
d3583f32e6a06ccb1146ca31939710edb630d7ffe3da37b01f893b45f4480045 SHA512 
280f2feab5c6af611c77ce90db925ecb6278eb4b516f22ac9f8b44ebfd87806fdbca51985ca28eccdabb503ee15ac76ded31d9380ea448cb2dc3fdd1ee4d5914
 WHIRLPOOL 
d5ceca74daf114a3d09b2975d2ae3d21891c2f0a6cb9923ceda89e9f57b5fe049c9f23164f6f5c00806c664b98cc01dc5e8760fe6dcf5046125b520530924852

diff --git a/app-misc/tracker/files/tracker-1.6.2-include-path.patch 
b/app-misc/tracker/files/tracker-1.6.2-include-path.patch
new file mode 100644
index 000..18f62b8
--- /dev/null
+++ b/app-misc/tracker/files/tracker-1.6.2-include-path.patch
@@ -0,0 +1,64 @@
+From a0be9abc0bffdaedd1e64a45da0eb12509b1ab72 Mon Sep 17 00:00:00 2001
+From: David King 
+Date: Wed, 2 Mar 2016 11:10:51 +
+Subject: Ensure embedded sqlite.h is in the include path
+
+https://bugzilla.gnome.org/show_bug.cgi?id=762976
+---
+ src/libtracker-data/Makefile.am   | 1 +
+ src/libtracker-fts/Makefile.am| 1 +
+ src/plugins/evolution/Makefile.am | 1 +
+ src/tracker-store/Makefile.am | 1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git a/src/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am
+index 7835d1f..6ad4c7f 100644
+--- a/src/libtracker-data/Makefile.am
 b/src/libtracker-data/Makefile.am
+@@ -12,6 +12,7 @@ AM_VALAFLAGS = \
+ AM_CPPFLAGS =  \
+   $(BUILD_VALACFLAGS)\
+   -I$(top_srcdir)/src\
++  -I$(top_srcdir)/src/sqlite \
+   -I$(top_builddir)/src  \
+   -DSHAREDIR=\""$(datadir)"\"\
+   $(LIBTRACKER_DATA_CFLAGS)
+diff --git a/src/libtracker-fts/Makefile.am b/src/libtracker-fts/Makefile.am
+index bcb2802..27ff127 100644
+--- a/src/libtracker-fts/Makefile.am
 b/src/libtracker-fts/Makefile.am
+@@ -1,6 +1,7 @@
+ AM_CPPFLAGS =  \
+   $(BUILD_CFLAGS)\
+   -I$(top_srcdir)/src\
++  -I$(top_srcdir)/src/sqlite \
+   -DNDEBUG   \
+   $(LIBTRACKER_FTS_CFLAGS)
+ 
+diff --git a/src/plugins/evolution/Makefile.am 
b/src/plugins/evolution/Makefile.am
+index dcdd886..9448b2f 100644
+--- a/src/plugins/evolution/Makefile.am
 b/src/plugins/evolution/Makefile.am
+@@ -1,6 +1,7 @@
+ AM_CPPFLAGS =  \
+   $(BUILD_CFLAGS)\
+   -I$(top_srcdir)/src\
++  -I$(top_srcdir)/src/sqlite \
+   -I$(top_builddir)/src  \
+   -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \
+   -DLOCALEDIR="\"$(localedir)\"" \
+diff --git a/src/tracker-store/Makefile.am b/src/tracker-store/Makefile.am
+index 83cb77e..26d8a06 100644
+--- a/src/tracker-store/Makefile.am
 b/src/tracker-store/Makefile.am
+@@ -5,6 +5,7 @@ AM_CPPFLAGS =  \
+   
-DMAIL_MODULES_DIR=\""$(libdir)"/tracker-$(TRACKER_API_VERSION)/mail-modules\" \
+   
-DPUSH_MODULES_DIR=\""$(libdir)/tracker-$(TRACKER_API_VERSION)/push-modules/daemon"\"
 \
+   -I$(top_srcdir)/src\
++  -I$(top_srcdir)/src/sqlite \
+   -I$(top_builddir)/src  \
+   $(TRACKER_STORE_CFLAGS)\
+   -include config.h  \
+-- 
+cgit v0.12
+

diff --git a/app-misc/tracker/tracker-1.6.2.ebuild 
b/app-misc/tracker/tracker-1.6.2.ebuild
new file mode 100644
index 000..c51a021
--- /dev/null
+++