tracker: 2.3.4 -> 3.0.0

This commit is contained in:
WORLDofPEACE 2020-09-20 20:51:38 -04:00 committed by Jan Tojnar
parent 05318e22b3
commit d8d4cdc496
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 29 additions and 24 deletions

View File

@ -4,6 +4,7 @@
, meson , meson
, ninja , ninja
, pkgconfig , pkgconfig
, asciidoc
, gobject-introspection , gobject-introspection
, python3 , python3
, gtk-doc , gtk-doc
@ -31,19 +32,19 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tracker"; pname = "tracker";
version = "2.3.4"; version = "3.0.0";
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0vai0qz9jn3z5dlzysynwhbbmslp84ygdql81f5wfxxr98j54yap"; sha256 = "0drqsfqc4smfbpjk74iap114yww5cpldfhn4z6b0aavmylalb1kh";
}; };
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./fix-paths.patch; src = ./fix-paths.patch;
gdbus = "${glib.bin}/bin/gdbus"; inherit asciidoc;
}) })
]; ];
@ -52,6 +53,7 @@ stdenv.mkDerivation rec {
ninja ninja
vala vala
pkgconfig pkgconfig
asciidoc
gettext gettext
libxslt libxslt
wrapGAppsHook wrapGAppsHook
@ -83,8 +85,6 @@ stdenv.mkDerivation rec {
]; ];
mesonFlags = [ mesonFlags = [
# TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas
# "-Dfunctional_tests=true"
"-Ddocs=true" "-Ddocs=true"
]; ];
@ -106,9 +106,17 @@ stdenv.mkDerivation rec {
# though, so we need to replace the absolute path with a local one during build. # though, so we need to replace the absolute path with a local one during build.
# We are using a symlink that will be overridden during installation. # We are using a symlink that will be overridden during installation.
mkdir -p $out/lib mkdir -p $out/lib
ln -s $PWD/src/libtracker-sparql-backend/libtracker-sparql-2.0.so $out/lib/libtracker-sparql-2.0.so.0 ln -s $PWD/src/libtracker-sparql/libtracker-sparql-3.0.so $out/lib/libtracker-sparql-3.0.so.0
ln -s $PWD/src/libtracker-miner/libtracker-miner-2.0.so $out/lib/libtracker-miner-2.0.so.0 '';
ln -s $PWD/src/libtracker-data/libtracker-data.so $out/lib/libtracker-data.so
checkPhase = ''
runHook preCheck
dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
meson test --print-errorlogs
runHook postCheck
''; '';
postCheck = '' postCheck = ''
@ -116,10 +124,6 @@ stdenv.mkDerivation rec {
rm -r $out/lib rm -r $out/lib
''; '';
postInstall = ''
glib-compile-schemas "$out/share/glib-2.0/schemas"
'';
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = pname; packageName = pname;

View File

@ -1,12 +1,13 @@
--- a/src/tracker-store/tracker-store.desktop.in diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build
+++ b/src/tracker-store/tracker-store.desktop.in index f90c757cf..40d9c939d 100644
@@ -1,8 +1,8 @@ --- a/docs/manpages/meson.build
[Desktop Entry] +++ b/docs/manpages/meson.build
Name=Tracker Store @@ -32,7 +32,7 @@ foreach m : manpages
Comment=Metadata database store and lookup manager command: [xsltproc,
-Exec=gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0 '--output', '@OUTPUT@',
+Exec=@gdbus@ call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0 '--stringparam', 'man.authors.section.enabled', '0',
Terminal=false - '/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'],
Type=Application + '@asciidoc@/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'],
Categories=Utility; input: xml,
X-GNOME-Autostart-enabled=true output: manpage,
install: true,