From aba3abcc3d5b7aed1f84c2c1e7ad3cf801311b4e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 7 Apr 2022 23:48:50 +0200 Subject: [PATCH 1/2] tracker: merge with tracker3 * fix tests --- common/shlibs | 7 +-- srcpkgs/libtracker3 | 2 +- .../tracker/patches/failing-test-musl.patch | 24 -------- srcpkgs/tracker/template | 53 +++++++++++------ srcpkgs/tracker/update | 2 - srcpkgs/tracker3 | 1 + srcpkgs/tracker3-devel | 2 +- srcpkgs/tracker3/template | 57 ------------------- srcpkgs/tracker3/update | 1 - 9 files changed, 41 insertions(+), 108 deletions(-) delete mode 100644 srcpkgs/tracker/patches/failing-test-musl.patch delete mode 100644 srcpkgs/tracker/update create mode 120000 srcpkgs/tracker3 delete mode 100644 srcpkgs/tracker3/template delete mode 100644 srcpkgs/tracker3/update diff --git a/common/shlibs b/common/shlibs index 673c62085f5b..83b53a69bb93 100644 --- a/common/shlibs +++ b/common/shlibs @@ -887,8 +887,6 @@ libepc-ui-1.0.so.3 libepc-0.4.1_1 libgupnp-dlna-2.0.so.3 gupnp-dlna-0.10.0_1 libgupnp-dlna-gst-2.0.so.3 gupnp-dlna-0.10.0_1 libgupnp-dlna-1.0.so.2 gupnp-dlna-0.6.1_1 -libtracker-common.so libtracker-2.2.0_1 -libtracker-data.so libtracker-2.2.0_1 libfm.so.4 libfm-1.2.3_3 libfm-gtk3.so.4 libfm-gtk+3-1.3.1_2 libfm-extra.so.4 libfm-extra-1.2.3_3 @@ -3114,10 +3112,7 @@ libykclient.so.3 ykclient-2.15_1 libbooster.so.0 cppcms-1.0.5_1 libcppcms.so.1 cppcms-1.0.5_1 libcppdb.so.0 cppdb-0.3.1_1 -libtracker-control-2.0.so.0 libtracker-2.0.0_1 -libtracker-sparql-2.0.so.0 libtracker-2.0.0_1 -libtracker-miner-2.0.so.0 libtracker-2.0.1_1 -libtracker-sparql-3.0.so.0 libtracker3-3.0.0_1 +libtracker-sparql-3.0.so.0 libtracker-3.0.0_1 libdockapp.so.3 libdockapp-0.7.2_1 libkrdccore.so.5 krdc-17.04.3_1 libArcus.so.3 libArcus-3.1.0_1 diff --git a/srcpkgs/libtracker3 b/srcpkgs/libtracker3 index 59dd6911b3b3..b471d39eca12 120000 --- a/srcpkgs/libtracker3 +++ b/srcpkgs/libtracker3 @@ -1 +1 @@ -tracker3 \ No newline at end of file +tracker \ No newline at end of file diff --git a/srcpkgs/tracker/patches/failing-test-musl.patch b/srcpkgs/tracker/patches/failing-test-musl.patch deleted file mode 100644 index 4407fe86e9e9..000000000000 --- a/srcpkgs/tracker/patches/failing-test-musl.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 5ee7d58f19542d1dac872badd72669ee288bd316 Mon Sep 17 00:00:00 2001 -From: Daniel Kolesa -Date: Wed, 16 Sep 2020 22:11:50 +0200 -Subject: [PATCH] drop test that fails on musl - ---- - tests/libtracker-common/meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git tests/libtracker-common/meson.build tests/libtracker-common/meson.build -index 55b7ada..69688e0 100644 ---- a/tests/libtracker-common/meson.build -+++ b/tests/libtracker-common/meson.build -@@ -2,7 +2,6 @@ libtracker_common_tests = [ - 'date-time', - 'dbus', - 'file-utils', -- 'sched', - 'type-utils', - 'utils', - ] --- -2.28.0 - diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template index ce41975c713d..9be8022adf6d 100644 --- a/srcpkgs/tracker/template +++ b/srcpkgs/tracker/template @@ -1,23 +1,27 @@ # Template file for 'tracker' pkgname=tracker -version=2.3.6 -revision=3 +version=3.2.1 +revision=1 +wrksrc=tracker-${version} build_style=meson build_helper="gir" -configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false - -Djournal=true -Dman=true -Dnetwork_manager=enabled -Dstemmer=disabled - -Dsystemd_user_services=no" -hostmakedepends="gettext pkg-config glib-devel vala" +configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled + -Dsystemd_user_services=false" +hostmakedepends="gettext pkg-config glib-devel vala asciidoc + python3-gobject" makedepends="dbus-devel libglib-devel icu-devel json-glib-devel - libsoup-devel libxml2-devel sqlite-devel NetworkManager-devel - bash-completion" -checkdepends="tar" + libsoup-devel libxml2-devel sqlite-devel bash-completion" +checkdepends="dbus tar python3-gobject" short_desc="Personal search tool and storage system" -maintainer="Orphaned " -license="GPL-2.0-or-later" -homepage="https://live.gnome.org/Tracker" +maintainer="q66 " +license="GPL-2.0-or-later, LGPL-2.1-or-later" +homepage="https://wiki.gnome.org/Projects/Tracker" distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz" -checksum=bd1eb4122135296fa7b57b1c3fa0ed602cf7d06c0b8e534d0bd17ff5f97feef2 +checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a + +do_check() { + dbus-run-session ninja -C build test +} if [ "$CROSS_BUILD" ]; then hostmakedepends+=" dbus" @@ -31,7 +35,8 @@ post_patch() { } tracker-devel_package() { - depends="libglib-devel libtracker>=${version}_${revision}" + depends="libtracker>=${version}_${revision} libglib-devel json-glib-devel + libsoup-devel" short_desc+=" - development files" pkg_install() { vmove usr/include @@ -43,11 +48,27 @@ tracker-devel_package() { } libtracker_package() { - shlib_provides="libtracker-common.so libtracker-data.so" short_desc+=" - shared libraries" pkg_install() { vmove "usr/lib/*.so.*" - vmove "usr/lib/tracker-2.0/*.so*" vmove usr/lib/girepository-1.0 } } + +tracker3_package() { + depends="tracker>=${version}_${revision}" + short_desc+=" - transitional dummy package" + build_style=meta +} + +tracker3-devel_package() { + depends="tracker-devel>=${version}_${revision}" + short_desc+=" - transitional dummy package" + build_style=meta +} + +libtracker3_package() { + depends="libtracker>=${version}_${revision}" + short_desc+=" - transitional dummy package" + build_style=meta +} diff --git a/srcpkgs/tracker/update b/srcpkgs/tracker/update deleted file mode 100644 index 6213b21d4152..000000000000 --- a/srcpkgs/tracker/update +++ /dev/null @@ -1,2 +0,0 @@ -pattern="\Q$pkgname\E-\K[0-9]+\.[0-9]*\.[0-9.]*[0-9](?=)" -ignore="3.* 2.9[0-9].*" diff --git a/srcpkgs/tracker3 b/srcpkgs/tracker3 new file mode 120000 index 000000000000..b471d39eca12 --- /dev/null +++ b/srcpkgs/tracker3 @@ -0,0 +1 @@ +tracker \ No newline at end of file diff --git a/srcpkgs/tracker3-devel b/srcpkgs/tracker3-devel index 59dd6911b3b3..b471d39eca12 120000 --- a/srcpkgs/tracker3-devel +++ b/srcpkgs/tracker3-devel @@ -1 +1 @@ -tracker3 \ No newline at end of file +tracker \ No newline at end of file diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template deleted file mode 100644 index 3ae12716faa5..000000000000 --- a/srcpkgs/tracker3/template +++ /dev/null @@ -1,57 +0,0 @@ -# Template file for 'tracker3' -pkgname=tracker3 -version=3.2.1 -revision=1 -wrksrc=tracker-${version} -build_style=meson -build_helper="gir" -configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled - -Dsystemd_user_services=false" -hostmakedepends="gettext pkg-config glib-devel vala asciidoc - python3-gobject" -makedepends="dbus-devel libglib-devel icu-devel json-glib-devel - libsoup-devel libxml2-devel sqlite-devel bash-completion" -checkdepends="tar python3-gobject" -short_desc="Personal search tool and storage system" -maintainer="q66 " -license="GPL-2.0-or-later, LGPL-2.1-or-later" -homepage="https://live.gnome.org/Tracker" -distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz" -checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a - -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" dbus" -fi - -# needs a dbus setup -do_check() { - : -} - -post_patch() { - if [ "$CROSS_BUILD" ]; then - # Tell the build system that we have internal fts5 in sqlite3 - vsed -i "/\[properties\]/a sqlite3_has_fts5 = 'true'" xbps_meson.cross - fi -} - -tracker3-devel_package() { - depends="libtracker3>=${version}_${revision} libglib-devel json-glib-devel - libsoup-devel" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/share/gir-1.0 - vmove usr/share/vala - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - } -} - -libtracker3_package() { - short_desc+=" - shared libraries" - pkg_install() { - vmove "usr/lib/*.so.*" - vmove usr/lib/girepository-1.0 - } -} diff --git a/srcpkgs/tracker3/update b/srcpkgs/tracker3/update deleted file mode 100644 index 15e6dbf06d2d..000000000000 --- a/srcpkgs/tracker3/update +++ /dev/null @@ -1 +0,0 @@ -pkgname=tracker From 58527c0b2b937cc745a42816877bece90f49d0cd Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 7 Apr 2022 23:52:50 +0200 Subject: [PATCH 2/2] tracker-miners: merge with tracker3-miners --- .../patches/build.patch | 0 srcpkgs/tracker-miners/template | 34 ++++++++++++------- srcpkgs/tracker-miners/update | 1 - srcpkgs/tracker3-miners | 1 + srcpkgs/tracker3-miners/template | 34 ------------------- srcpkgs/tracker3-miners/update | 1 - 6 files changed, 22 insertions(+), 49 deletions(-) rename srcpkgs/{tracker3-miners => tracker-miners}/patches/build.patch (100%) delete mode 100644 srcpkgs/tracker-miners/update create mode 120000 srcpkgs/tracker3-miners delete mode 100644 srcpkgs/tracker3-miners/template delete mode 100644 srcpkgs/tracker3-miners/update diff --git a/srcpkgs/tracker3-miners/patches/build.patch b/srcpkgs/tracker-miners/patches/build.patch similarity index 100% rename from srcpkgs/tracker3-miners/patches/build.patch rename to srcpkgs/tracker-miners/patches/build.patch diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template index 1d31d2f3882a..b2d1de2f76ca 100644 --- a/srcpkgs/tracker-miners/template +++ b/srcpkgs/tracker-miners/template @@ -1,27 +1,35 @@ # Template file for 'tracker-miners' pkgname=tracker-miners -version=2.3.5 -revision=3 +version=3.2.1 +revision=1 build_style=meson -configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true - -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled +# missing libgrss for miner_rss +configure_args="-Dtracker_core=system -Dextract=true + -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled - -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled - -Dbattery_detection=upower -Dcharset_detection=icu + -Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled + -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer - -Dsystemd_user_services=no -Dminer_rss=false" -hostmakedepends="pkg-config glib-devel intltool" -makedepends="tracker-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel + -Dsystemd_user_services=false -Dnetwork_manager=enabled" +hostmakedepends="pkg-config glib-devel intltool asciidoc" +makedepends="tracker-devel ffmpeg-devel dbus-devel exempi-devel libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel - libvorbis-devel poppler-glib-devel totem-pl-parser-devel - upower-devel zlib-devel gst-plugins-base1-devel giflib-devel libharfbuzz" + poppler-glib-devel totem-pl-parser-devel + upower-devel zlib-devel gst-plugins-base1-devel giflib-devel + NetworkManager-devel libharfbuzz" short_desc="Data miners for tracker" -maintainer="Enno Boland " +maintainer="q66 " license="GPL-2.0-or-later" homepage="https://developer.gnome.org/libtracker-miner/stable" distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz" -checksum=9509d37fb29acd233058f4df5bd1234b692ac6f946bc2e5f7b8dbf51dfe5b9fa +checksum=44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47 make_check=no # relies on unsupported ops in chroot + +tracker3-miners_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - transitional dummy package" + build_style=meta +} diff --git a/srcpkgs/tracker-miners/update b/srcpkgs/tracker-miners/update deleted file mode 100644 index 6dcf64a5163a..000000000000 --- a/srcpkgs/tracker-miners/update +++ /dev/null @@ -1 +0,0 @@ -ignore="3.*" diff --git a/srcpkgs/tracker3-miners b/srcpkgs/tracker3-miners new file mode 120000 index 000000000000..8e0a62a93f22 --- /dev/null +++ b/srcpkgs/tracker3-miners @@ -0,0 +1 @@ +tracker-miners \ No newline at end of file diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template deleted file mode 100644 index adc11e7970c1..000000000000 --- a/srcpkgs/tracker3-miners/template +++ /dev/null @@ -1,34 +0,0 @@ -# Template file for 'tracker3-miners' -pkgname=tracker3-miners -version=3.2.1 -revision=1 -wrksrc=tracker-miners-${version} -build_style=meson -# missing libgrss for miner_rss -configure_args="-Dtracker_core=system -Dextract=true - -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled - -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled - -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled - -Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled - -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu - -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer - -Dsystemd_user_services=false -Dnetwork_manager=enabled" -hostmakedepends="pkg-config glib-devel intltool asciidoc" -makedepends="tracker3-devel ffmpeg-devel dbus-devel exempi-devel - libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel - libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel - libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel - poppler-glib-devel totem-pl-parser-devel - upower-devel zlib-devel gst-plugins-base1-devel giflib-devel - NetworkManager-devel libharfbuzz" -short_desc="Data miners for tracker3" -maintainer="q66 " -license="GPL-2.0-or-later" -homepage="https://developer.gnome.org/libtracker-miner/stable" -distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz" -checksum=44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47 - -# relies on unsupported ops in chroot -do_check() { - : -} diff --git a/srcpkgs/tracker3-miners/update b/srcpkgs/tracker3-miners/update deleted file mode 100644 index 160976ffc453..000000000000 --- a/srcpkgs/tracker3-miners/update +++ /dev/null @@ -1 +0,0 @@ -pkgname=tracker-miners