From 5be588b92969e480bb6bb971e17a1dd0d292a13f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 7 Apr 2022 23:52:50 +0200 Subject: [PATCH] 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 1d31d2f3882..b2d1de2f76c 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 6dcf64a5163..00000000000 --- 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 00000000000..8e0a62a93f2 --- /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 adc11e7970c..00000000000 --- 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 160976ffc45..00000000000 --- a/srcpkgs/tracker3-miners/update +++ /dev/null @@ -1 +0,0 @@ -pkgname=tracker-miners