From be4c9c60c2e9cd447805b1cd8d0f2493d2e6f323 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 10 May 2022 20:58:19 +0300
Subject: [PATCH] dbus: 1.12.20 -> 1.14.0

fprintd: remove dbus patch
---
 pkgs/development/libraries/dbus/default.nix   | 20 +++----------------
 .../dbus/docs-reproducible-ids.patch          | 15 --------------
 pkgs/tools/security/fprintd/default.nix       | 11 +---------
 3 files changed, 4 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/development/libraries/dbus/docs-reproducible-ids.patch

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 025a107191c..29b76e59243 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -20,28 +20,14 @@
 
 stdenv.mkDerivation rec {
   pname = "dbus";
-  version = "1.12.20";
+  version = "1.14.0";
 
   src = fetchurl {
-    url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
-    sha256 = "1zp5gpx61v1cpqf2zwb1cidhp9xylvw49d3zydkxqk6b1qa20xpp";
+    url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz";
+    sha256 = "sha256-zNfM43WW4KGVWP1mSNEnKrQ/AR2AyGNa6o/QutWK69Q=";
   };
 
   patches = [
-    # 'generate.consistent.ids=1' ensures reproducible docs, for further details see
-    # http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html
-    # Also applied upstream in https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/189,
-    # expected in version 1.14
-    ./docs-reproducible-ids.patch
-    # AC_PATH_XTRA doesn't seem to find X11 libs even though libX11 seems
-    # to provide valid pkg-config files. This replace AC_PATH_XTRA with
-    # PKG_CHECK_MODULES.
-    # MR merged cf https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/212/diffs?commit_id=23880a181e82ee7f
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/dbus/dbus/-/commit/6bfaea0707ba1a7788c4b6d30c18fb094f3a1dd4.patch";
-      sha256 = "1d8ay55n2ksw5faqx3hsdpfni3xl3gq9hnjl65073xcfnx67x8d2";
-    })
-
     # Fix dbus-daemon crashing when running tests due to long XDG_DATA_DIRS.
     # https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/302
     (fetchpatch {
diff --git a/pkgs/development/libraries/dbus/docs-reproducible-ids.patch b/pkgs/development/libraries/dbus/docs-reproducible-ids.patch
deleted file mode 100644
index 2356b64d95c..00000000000
--- a/pkgs/development/libraries/dbus/docs-reproducible-ids.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --color -Naur dbus-1.12.20-original/doc/Makefile.in dbus-1.12.20-hacked2/doc/Makefile.in
---- dbus-1.12.20-original/doc/Makefile.in	2020-07-02 12:10:41.000000000 +0200
-+++ dbus-1.12.20-hacked2/doc/Makefile.in	2020-11-07 09:57:15.297694773 +0100
-@@ -870,8 +870,10 @@
- .PRECIOUS: Makefile
- 
- 
-+# 'generate.consistent.ids=1' ensures reproducible docs, for further details see
-+# http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html
- @DBUS_XML_DOCS_ENABLED_TRUE@%.html: %.xml
--@DBUS_XML_DOCS_ENABLED_TRUE@	$(XMLTO) html-nochunks $<
-+@DBUS_XML_DOCS_ENABLED_TRUE@	$(XMLTO) --stringparam generate.consistent.ids=1 html-nochunks $<
- 
- @DBUS_XML_DOCS_ENABLED_TRUE@%.1: %.1.xml
- @DBUS_XML_DOCS_ENABLED_TRUE@	$(XMLTO) man $<
diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix
index d9c17f935ed..50148195754 100644
--- a/pkgs/tools/security/fprintd/default.nix
+++ b/pkgs/tools/security/fprintd/default.nix
@@ -44,16 +44,7 @@ stdenv.mkDerivation rec {
     gettext
     gtk-doc
     libxslt
-    # TODO: apply this to D-Bus so that other packages can benefit.
-    # https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/202
-    (dbus.overrideAttrs (attrs: {
-      postInstall = attrs.postInstall or "" + ''
-        ln -s ${fetchurl {
-          url = "https://gitlab.freedesktop.org/dbus/dbus/-/raw/b207135dbd8c09cf8da28f7e3b0a18bb11483663/doc/catalog.xml";
-          sha256 = "1/43XwAIcmRXfM4OXOPephyQyUnW8DSveiZbiPvW72I=";
-        }} $out/share/xml/dbus-1/catalog.xml
-      '';
-    }))
+    dbus
     docbook-xsl-nons
     docbook_xml_dtd_412
   ];