From 302360910af4051fa36b4ab8aa2d1f9fdc4b255c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 30 Sep 2021 20:23:09 +0000
Subject: [PATCH] =?UTF-8?q?tracker:=203.1.1=20=E2=86=92=203.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.
---
 .../development/libraries/tracker/default.nix | 23 ++++-----------
 .../libraries/tracker/fix-docs.patch          | 28 -------------------
 2 files changed, 6 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/development/libraries/tracker/fix-docs.patch

diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix
index 0ee5e0fa5672..39ac21b7ad6c 100644
--- a/pkgs/development/libraries/tracker/default.nix
+++ b/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
diff --git a/pkgs/development/libraries/tracker/fix-docs.patch b/pkgs/development/libraries/tracker/fix-docs.patch
deleted file mode 100644
index a6ff84cda3e5..000000000000
--- a/pkgs/development/libraries/tracker/fix-docs.patch
+++ /dev/null
@@ -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
- )