From d8d4cdc496777f91263a517fd832abb300e82ce4 Mon Sep 17 00:00:00 2001 From: WORLDofPEACE Date: Sun, 20 Sep 2020 20:51:38 -0400 Subject: [PATCH] tracker: 2.3.4 -> 3.0.0 --- .../development/libraries/tracker/default.nix | 28 +++++++++++-------- .../libraries/tracker/fix-paths.patch | 25 +++++++++-------- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index fb111829c7e1..cde81146d4c4 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -4,6 +4,7 @@ , meson , ninja , pkgconfig +, asciidoc , gobject-introspection , python3 , gtk-doc @@ -31,19 +32,19 @@ stdenv.mkDerivation rec { pname = "tracker"; - version = "2.3.4"; + version = "3.0.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0vai0qz9jn3z5dlzysynwhbbmslp84ygdql81f5wfxxr98j54yap"; + sha256 = "0drqsfqc4smfbpjk74iap114yww5cpldfhn4z6b0aavmylalb1kh"; }; patches = [ (substituteAll { src = ./fix-paths.patch; - gdbus = "${glib.bin}/bin/gdbus"; + inherit asciidoc; }) ]; @@ -52,6 +53,7 @@ stdenv.mkDerivation rec { ninja vala pkgconfig + asciidoc gettext libxslt wrapGAppsHook @@ -83,8 +85,6 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas - # "-Dfunctional_tests=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. # We are using a symlink that will be overridden during installation. 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-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 + ln -s $PWD/src/libtracker-sparql/libtracker-sparql-3.0.so $out/lib/libtracker-sparql-3.0.so.0 + ''; + + checkPhase = '' + runHook preCheck + + dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + meson test --print-errorlogs + + runHook postCheck ''; postCheck = '' @@ -116,10 +124,6 @@ stdenv.mkDerivation rec { rm -r $out/lib ''; - postInstall = '' - glib-compile-schemas "$out/share/glib-2.0/schemas" - ''; - passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/tracker/fix-paths.patch b/pkgs/development/libraries/tracker/fix-paths.patch index f5c13c3fcdaf..5e4d8657f7bc 100644 --- a/pkgs/development/libraries/tracker/fix-paths.patch +++ b/pkgs/development/libraries/tracker/fix-paths.patch @@ -1,12 +1,13 @@ ---- a/src/tracker-store/tracker-store.desktop.in -+++ b/src/tracker-store/tracker-store.desktop.in -@@ -1,8 +1,8 @@ - [Desktop Entry] - Name=Tracker Store - Comment=Metadata database store and lookup manager --Exec=gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0 -+Exec=@gdbus@ call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0 - Terminal=false - Type=Application - Categories=Utility; - X-GNOME-Autostart-enabled=true +diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build +index f90c757cf..40d9c939d 100644 +--- a/docs/manpages/meson.build ++++ b/docs/manpages/meson.build +@@ -32,7 +32,7 @@ foreach m : manpages + command: [xsltproc, + '--output', '@OUTPUT@', + '--stringparam', 'man.authors.section.enabled', '0', +- '/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'], ++ '@asciidoc@/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'], + input: xml, + output: manpage, + install: true,