tracker: 3.1.1 → 3.2.0

https://gitlab.gnome.org/GNOME/tracker/-/blob/3.2.0/NEWS

Notably, both libsoup 2.x and 3.x are linked and selected at runtime (to avoid conflicts).

Also API documentation is now built by hotdoc but the build system copies it from the tarball for now.

pkgs/development/libraries/tracker/default.nix

@@ -1,6 +1,6 @@
-{ lib, stdenv
+{ stdenv
+, lib
 , fetchurl
-, fetchpatch
 , gettext
 , meson
 , ninja
@@ -8,7 +8,6 @@
 , asciidoc
 , gobject-introspection
 , python3
-, gtk-doc
 , docbook-xsl-nons
 , docbook_xml_dtd_45
 , libxml2
@@ -22,6 +21,7 @@
 , icu
 , libuuid
 , libsoup
+, libsoup_3
 , json-glib
 , systemd
 , dbus
@@ -30,13 +30,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tracker";
-  version = "3.1.1";
+  version = "3.2.0";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-Q3bi6YRUBm9E96JC5FuZs7/kwDtn+rGauw7Vhsp0iuc=";
+    sha256 = "sha256-8RelKHXUpNCceqmT+Mio0GRo1dz7FT642qUesThEUTo=";
   };
 
   patches = [
@@ -44,17 +44,6 @@ stdenv.mkDerivation rec {
       src = ./fix-paths.patch;
       inherit asciidoc;
     })
-
-    # Add missing build target dependencies to fix parallel building of docs.
-    # TODO: Upstream this.
-    ./fix-docs.patch
-
-    # Fix 32bit datetime issue, use this upstream patch until 3.1.2 lands
-    # https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/401
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/tracker/merge_requests/401.patch";
-      sha256 = "QEf+ciGkkCzanmtGO0aig6nAxd+NxjvuNi4RbNOwZEA=";
-    })
   ];
 
   nativeBuildInputs = [
@@ -67,7 +56,6 @@ stdenv.mkDerivation rec {
     libxslt
     wrapGAppsNoGuiHook
     gobject-introspection
-    gtk-doc
     docbook-xsl-nons
     docbook_xml_dtd_45
     python3 # for data-generators
@@ -81,6 +69,7 @@ stdenv.mkDerivation rec {
     sqlite
     icu
     libsoup
+    libsoup_3
     libuuid
     json-glib
     libstemmer

pkgs/development/libraries/tracker/fix-docs.patch

@@ -1,28 +0,0 @@
-diff --git a/docs/reference/libtracker-sparql/examples/meson.build b/docs/reference/libtracker-sparql/examples/meson.build
-index 1cb1d9f3f..313c72345 100644
---- a/docs/reference/libtracker-sparql/examples/meson.build
-+++ b/docs/reference/libtracker-sparql/examples/meson.build
-@@ -1,20 +1,20 @@
- executable(
-   'readonly-example',
-   'readonly-example.c',
--  dependencies: tracker_sparql_dep,
-+  dependencies: [tracker_common_dep, tracker_sparql_dep],
-   build_by_default: true
- )
- 
- executable(
-   'writeonly-example',
-   'writeonly-example.c',
--  dependencies: tracker_sparql_dep,
-+  dependencies: [tracker_common_dep, tracker_sparql_dep],
-   build_by_default: true
- )
- 
- executable(
-   'writeonly-with-blank-nodes-example',
-   'writeonly-with-blank-nodes-example.c',
--  dependencies: tracker_sparql_dep,
-+  dependencies: [tracker_common_dep, tracker_sparql_dep],
-   build_by_default: true
- )