From 7f3fecbb5b871825fe9632f46659869cab6a3769 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 May 2024 00:00:19 +0100 Subject: gentoo auto-resync : 04:05:2024 - 00:00:19 --- app-misc/tracker/Manifest | 3 +- .../tracker/files/3.6.0-sqlite-3.45.3-compat.patch | 44 ++++++++ app-misc/tracker/tracker-3.6.0-r1.ebuild | 111 +++++++++++++++++++++ app-misc/tracker/tracker-3.6.0.ebuild | 110 -------------------- 4 files changed, 157 insertions(+), 111 deletions(-) create mode 100644 app-misc/tracker/files/3.6.0-sqlite-3.45.3-compat.patch create mode 100644 app-misc/tracker/tracker-3.6.0-r1.ebuild delete mode 100644 app-misc/tracker/tracker-3.6.0.ebuild (limited to 'app-misc/tracker') diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest index f05141ad4947..31c80f926bae 100644 --- a/app-misc/tracker/Manifest +++ b/app-misc/tracker/Manifest @@ -1,4 +1,5 @@ AUX 3.6.0-configure-c99.patch 1822 BLAKE2B 09ead950a359b0240e8ff1908483ec7583dedf7ae6627b824ed84e3bdb3e65b91675eac1da1f7ea3ee74730d5fda1ae18bbd3eed542c33e4b78f989a78bbbae7 SHA512 eb58f02b730aee91d4cbf69c93e104ccf106db3fff7f5c78ae21a963de56ca28198b701926734928a8bc5d9d505037e471122f3ec9c8cb0d6d8f598a80940e5e +AUX 3.6.0-sqlite-3.45.3-compat.patch 1954 BLAKE2B 567a455663f46252a7616d1d81053c43ff6f7a936b0cc76da9b8c0de1ac29b5203cd286deb59a0095da933faf78f70d0f19bd06f09ddb7c7034b8dbc210b3e75 SHA512 8ec042a012a9ba5d818214672266fe548c2287f850ac9791806c796f4cfdfd9d1f878701b2e8d621848457c1807b2b67bba9de4f356b4a836a1c3614e15e8370 DIST tracker-3.6.0.tar.xz 2560980 BLAKE2B f10720b624b2b00eb510961f7346bb6c1fdc278237126d1b5f4b9af2d0f67cc74896b65bce89de14a085e55441fe64985cb13da06242838fe43dd0739e8d5bce SHA512 d3b7d4c1fd1cdcccc0d78c05f43b85f5cdab584e378cb56a2b568293ff95c887650d41c3c7f65de8864a0b6f80ae26410f4a443f045a80e30bacdf7ef9499697 -EBUILD tracker-3.6.0.ebuild 2511 BLAKE2B f6c37c90401ffdf9cc9ae221dc730995de1d216ed60e44b05e2f76ac863290ccf04f2591afc4a79e66a148223987675f30cbff9a7906d55102464c39b108f501 SHA512 c06a010b9074b78ab359bcdb5d6ddc7208e554ab9bf85adc85d4e35e4ed9cbbfe23c668fdc5cb44a7b1be6f4476e1b0ecc10dbeaa6949ab9cae96fce20b8c867 +EBUILD tracker-3.6.0-r1.ebuild 2559 BLAKE2B 56f5155a5ad786d0cde630c0234c1dd36ec0da7b2ead58458c90e01e0d3e70207976559583003d230345a48b205c7afa4b5191d60645f5530f72906c6b8c96b9 SHA512 ca261d5d7e39f533c3e0d7905d0d13e2f8ad8e2786a02df5a0a478f49bf6a6dc080ccf9b2fbf506e7b84032d878d1d981afa7c3bf85107375cd9c0f410c9051e MISC metadata.xml 586 BLAKE2B 8244e6f8d9491a0c224ed84f17ee6ad64b22e0c373243a319e7911739a7db6223ce47693ed5b31053b4465f35d20108db1469d74afcebb36b4516a53cbd7f98a SHA512 0a60b0e4b077bb03d02b7990511041695c5dff7a8a0972fa80abe9968b643ad5c2ba65182c079e8d5f3d1ef72a2c4dcc659d6ec283bf80813135c94cab2dddef 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 000000000000..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-r1.ebuild b/app-misc/tracker/tracker-3.6.0-r1.ebuild new file mode 100644 index 000000000000..d45a9117cedf --- /dev/null +++ b/app-misc/tracker/tracker-3.6.0-r1.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) + +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 https://gitlab.gnome.org/GNOME/tracker" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="3/0" # libtracker-sparql-3.0 soname version +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" +IUSE="gtk-doc +miners stemmer test vala" +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.99.2:3.0 + >=dev-libs/libxml2-2.7 + >=dev-db/sqlite-3.29.0:3 + stemmer? ( dev-libs/snowball-stemmer:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + app-text/asciidoc + dev-libs/libxslt + $(vala_depend) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + gtk-doc? ( dev-util/gi-docgen ) + test? ( + $(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]') + $(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]') + ) + ${PYTHON_DEPS} +" +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() { + python_has_version -b \ + "dev-python/pygobject[${PYTHON_USEDEP}]" \ + "dev-python/tappy[${PYTHON_USEDEP}]" +} + +pkg_setup() { + local CONFIG_CHECK="~INOTIFY_USER" + linux-info_pkg_setup + + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + vala_setup + xdg_environment_reset +} + +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)" + $(meson_use test tests) + -Dintrospection=enabled + $(meson_feature vala vapi) + -Dsoup=soup3 + ) + meson_src_configure +} + +src_test() { + dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed' +} + +src_install() { + meson_src_install + + if use gtk-doc; then + mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die + mv "${ED}"/usr/share/doc/Tracker-3.0 "${ED}"/usr/share/gtk-doc/html/ || die + fi +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/app-misc/tracker/tracker-3.6.0.ebuild b/app-misc/tracker/tracker-3.6.0.ebuild deleted file mode 100644 index 3ce100022d75..000000000000 --- a/app-misc/tracker/tracker-3.6.0.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) - -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 https://gitlab.gnome.org/GNOME/tracker" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="3/0" # libtracker-sparql-3.0 soname version -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" -IUSE="gtk-doc +miners stemmer test vala" -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.99.2:3.0 - >=dev-libs/libxml2-2.7 - >=dev-db/sqlite-3.29.0:3 - stemmer? ( dev-libs/snowball-stemmer:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - app-text/asciidoc - dev-libs/libxslt - $(vala_depend) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - gtk-doc? ( dev-util/gi-docgen ) - test? ( - $(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]') - $(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]') - ) - ${PYTHON_DEPS} -" -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}]" \ - "dev-python/tappy[${PYTHON_USEDEP}]" -} - -pkg_setup() { - local CONFIG_CHECK="~INOTIFY_USER" - linux-info_pkg_setup - - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - vala_setup - xdg_environment_reset -} - -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)" - $(meson_use test tests) - -Dintrospection=enabled - $(meson_feature vala vapi) - -Dsoup=soup3 - ) - meson_src_configure -} - -src_test() { - dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed' -} - -src_install() { - meson_src_install - - if use gtk-doc; then - mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die - mv "${ED}"/usr/share/doc/Tracker-3.0 "${ED}"/usr/share/gtk-doc/html/ || die - fi -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} -- cgit v1.2.3