From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- app-misc/tracker/Manifest | 7 +- ...d-Add-an-option-to-control-building-tests.patch | 69 +++++++++++++ app-misc/tracker/tracker-2.3.5-r1.ebuild | 103 ------------------- app-misc/tracker/tracker-3.1.2-r1.ebuild | 110 --------------------- app-misc/tracker/tracker-3.2.1.ebuild | 5 +- 5 files changed, 75 insertions(+), 219 deletions(-) create mode 100644 app-misc/tracker/files/tracker-3.2.1-build-Add-an-option-to-control-building-tests.patch delete mode 100644 app-misc/tracker/tracker-2.3.5-r1.ebuild delete mode 100644 app-misc/tracker/tracker-3.1.2-r1.ebuild (limited to 'app-misc/tracker') diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest index 2eb387e9f94a..c6fe50251459 100644 --- a/app-misc/tracker/Manifest +++ b/app-misc/tracker/Manifest @@ -1,12 +1,9 @@ AUX 2.3.6-sqlite-3.34-compat.patch 2204 BLAKE2B 1b7602fee14de9c4ec2ca9dc55bf9b92a6f5f08fab5984184ac158fbde4537cb55f396e2b017b86f32e36a01c04c82f0c58946ffa0d2ce1025ae823f5788607a SHA512 3112fa20d4a8aacd008b0b5430b33329fcfbd2e3de886537cbde91c4f55fbaa5d254fefbd8f26a4e19824262d87e86b73c2192b1f5bde764ae8f182ac5ee9675 AUX tracker-3.1.1-Fix-asciidoc-manpage.xsl-location.patch 835 BLAKE2B 70e949f1e385b237a154cbd7c3f3130acdb53761f6f6eb265ec591d43aa951db538765fb8b6d16f73a8ba99a53691610434a54e491cb85c8fb9350d5a00e8456 SHA512 adaa1d7f468186de0ec3d5ddecbf84518f08b3802c2d62d2f6511c68ae2b455c154e7fce14b57cb091f4a221a7fe32042ceeffa5095c22f8ec70ffbfe49f7de9 AUX tracker-3.2.1-Add-config-options-for-libsoup.patch 1693 BLAKE2B 0ea29fff9bfd365973c293ad4f6cc6c59605dfe97ea6b1074f70c11b3ef2de7ec8fbbf31d076110a84b8d5829232eb372faec3331685ed8bdb6724d1be02f446 SHA512 0b602ada1d12f01b9f46e53a84eca228a997da782ae1fdd97a35743069fee35eec930eacd6481571af12bdf4b6dbfe5db802834fcc2832358be6280b6a1a09f8 -DIST tracker-2.3.5.tar.xz 1604004 BLAKE2B ad79682cb703056fd927649021a5f37fddb2e978ecc710d020c23ef5dd076f88c7e0c2cd9d4385343e9d6c2c2ac7473af7508d86793c505e2361a8021bf27d50 SHA512 74cd3b2671b811f3267a516e6f6047594fffa7c8a4a23fa5be4f7d71f581c417a88f12f614757418a848077a9231c0c876617d4486f3bb5b103382b871913d34 +AUX tracker-3.2.1-build-Add-an-option-to-control-building-tests.patch 2585 BLAKE2B 72cdee92e578e64a4016e27dbd42a7a5fd9e7e1370abe52aa3b4d41aafcc708d805446d99f5ede70e1b17429aaecfd5e2dc14d570436c1be5465dc639dae42c8 SHA512 6fb94961339ac8ec45f4244ce23f7421515cd99066faa8a7d052706959708f0f1b07158bc091fb35e2ec6bb7529ebfbf989f64ddb512d24d2de763900be45b39 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 -EBUILD tracker-2.3.5-r1.ebuild 2593 BLAKE2B 35207de87a09ba270540c770dd492f6abe3684dfd3fe25e8e525006d370775b667047b92d60cd68542483f6bcee4684b478e91ba4d30738c58e31bd8dc911c25 SHA512 53a43d859aee9e278d9df6000c62a469a8fc038f02a55b3d28fb76c7ac4cb4d25f00366104acc89ee5566d20c046d784f7e62db3a0431c12bc60b56b76e112a3 EBUILD tracker-2.3.6-r1.ebuild 2694 BLAKE2B 7ed178e71d1eca8bea4acee5c5f73c047793592a3b1696b95c858aa1f459aa3ac21a546c42fd97f30fc40727512f053c76a960e00712e68e54a3d8facf1baaf3 SHA512 2a190bcb1104afc7ad5809c19aa882b4ecad92ffc9a9e01a80d5ffc159a90ca8c665bd81cea5d59109581690b37c710d432fc001735d68f1bc28d5373ab93880 -EBUILD tracker-3.1.2-r1.ebuild 2522 BLAKE2B e8acf928bc4d54c696258e59e5f14a176c39bfc56f813f0e6109775c89ebd52e6b83459149997de91e47bb40d1f963a7d88fb6ecbc181e8a94b445c858f978f6 SHA512 62ba4fcfed9205e2581032c2cad4df3c52c6d3fa801e129da634ad6093b589289b4c76869cc3a714fe4290342ca380852c14325a4ac805cf30512989cd138245 -EBUILD tracker-3.2.1.ebuild 2728 BLAKE2B 384fb4fd5d56aab5b087dbfa7a319469c3ff35e5def95bf7550ae0154a77ce1f18e98a24a95744254b453c43bb2afbcb5094958e459b9ba97f91af9b0359ae4e SHA512 d4208d221fe2502b664ea291e1e6e924ff8bb04232608db63f4b06d1ef9d58aaa4a41c33935649570db5bf06efa7b46ed05341cf3976218de4cb637e5bc57bc9 +EBUILD tracker-3.2.1.ebuild 2895 BLAKE2B eb7ca2ef765ba72afb857f28589b74acb33f6a3787a497b5b360c63d71eb00765ea7c8554e1d8d50812a277abf15cd83bd9f7fe2d06992cca45159dc8ed5c999 SHA512 624f62c6f6a8a2a214ed18b1e04b7c311492374c13a28b9f5861faf37d23e214231dc7a289f9e114ac706be0ee792f172f83207379132ea6cb0dccbcc3aade4b MISC metadata.xml 498 BLAKE2B 53cd3148f5755776613afbd38fa6b0eac4d10bb60765e7af7922ff70c5875f78ba25a78ef81af69f7767bc9da9fc854d9c833f4aa8bf18e52811fc4292dc47f7 SHA512 b81b2eb4705e5280286c6b6d9cc37945c671cd9ab635d31d7cef7d7ed2a3cf7a2ba5107e37363a78d8c707a2095a3d002e4ca6c233555a075ae21a9f8885d6db 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 000000000000..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-2.3.5-r1.ebuild b/app-misc/tracker/tracker-2.3.5-r1.ebuild deleted file mode 100644 index 075fe61e41e7..000000000000 --- a/app-misc/tracker/tracker-2.3.5-r1.ebuild +++ /dev/null @@ -1,103 +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" -HOMEPAGE="https://wiki.gnome.org/Projects/Tracker" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0/2.0" -IUSE="gtk-doc +miners networkmanager stemmer" - -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" -#RESTRICT="!test? ( test )" - -PV_SERIES=$(ver_cut 1-2) - -# In 2.2.0 util-linux should only be necessary if glib is older than 2.52 at compile-time -# But build still needs it - https://gitlab.gnome.org/GNOME/tracker/issues/131 -RDEPEND=" - >=dev-libs/glib-2.46: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.0 - >=net-libs/libsoup-2.40.1:2.4 - >=dev-libs/libxml2-2.7 - >=dev-db/sqlite-3.20.0 - networkmanager? ( >=net-misc/networkmanager-0.8 ) - stemmer? ( dev-libs/snowball-stemmer:= ) - sys-apps/util-linux -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - $(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 - ${PYTHON_DEPS} -" -PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )" - -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 -} - -pkg_setup() { - linux-info_pkg_setup - inotify_enabled - - python-any-r1_pkg_setup -} - -src_prepare() { - xdg_src_prepare - vala_src_prepare -} - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc docs) - -Dfts=true - -Dfunctional_tests=false # many fail in 2.2; retry with 2.3 - #$(meson_use test functional_tests) - -Dman=true - $(meson_feature networkmanager network_manager) - $(meson_feature stemmer) - -Dunicode_support=icu - -Dbash_completion="$(get_bashcompdir)" - -Dsystemd_user_services="$(systemd_get_userunitdir)" - ) - 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 -} diff --git a/app-misc/tracker/tracker-3.1.2-r1.ebuild b/app-misc/tracker/tracker-3.1.2-r1.ebuild deleted file mode 100644 index 1c0b8e6d0acb..000000000000 --- a/app-misc/tracker/tracker-3.1.2-r1.ebuild +++ /dev/null @@ -1,110 +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" -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 -) - -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() { - 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_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 -} diff --git a/app-misc/tracker/tracker-3.2.1.ebuild b/app-misc/tracker/tracker-3.2.1.ebuild index 81ebe3d808b7..3106a0b44c3a 100644 --- a/app-misc/tracker/tracker-3.2.1.ebuild +++ b/app-misc/tracker/tracker-3.2.1.ebuild @@ -12,7 +12,7 @@ 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" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="gtk-doc +miners stemmer test" RESTRICT="!test? ( test )" @@ -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 -- cgit v1.2.3