From 5a9c85ccce989df44b76d84d057c89d235aa6fc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 31 May 2026 20:08:52 -0700
Subject: [PATCH] gtk-doc: 1.35.1 -> 1.36.1

Diff: https://gitlab.gnome.org/GNOME/gtk-doc/-/compare/1.35.1...1.36.1

Changelog: https://gitlab.gnome.org/GNOME/gtk-doc/-/blob/1.36.1/NEWS
---
 pkgs/by-name/gt/gtk-doc/package.nix                 | 13 ++++---------
 .../gt/gtk-doc/respect-xml-catalog-files-var.patch  | 13 -------------
 2 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/by-name/gt/gtk-doc/respect-xml-catalog-files-var.patch

diff --git a/pkgs/by-name/gt/gtk-doc/package.nix b/pkgs/by-name/gt/gtk-doc/package.nix
index a2db2fee4788..9f58e9fb8f75 100644
--- a/pkgs/by-name/gt/gtk-doc/package.nix
+++ b/pkgs/by-name/gt/gtk-doc/package.nix
@@ -16,7 +16,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gtk-doc";
-  version = "1.35.1";
+  version = "1.36.1";
 
   outputDevdoc = "out";
 
@@ -26,14 +26,10 @@ python3.pkgs.buildPythonApplication rec {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "gtk-doc";
-    rev = version;
-    hash = "sha256-EqU7lnBnOn3gR3hT95yjdTUb3cqX2XJK5UAKsFw2Q10=";
+    tag = version;
+    hash = "sha256-8hB43BCAtT1B7/ak2i0FAlYD3Kb4rNCWfsJ+wqGu3FA=";
   };
 
-  patches = [
-    passthru.respect_xml_catalog_files_var_patch
-  ];
-
   postPatch = ''
     substituteInPlace meson.build \
       --replace "pkg-config" "$PKG_CONFIG"
@@ -83,8 +79,6 @@ python3.pkgs.buildPythonApplication rec {
   '';
 
   passthru = {
-    # Consumers are expected to copy the m4 files to their source tree, let them reuse the patch
-    respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch;
     updateScript = gnome.updateScript {
       packageName = "gtk-doc";
       versionPolicy = "none";
@@ -92,6 +86,7 @@ python3.pkgs.buildPythonApplication rec {
   };
 
   meta = {
+    changelog = "https://gitlab.gnome.org/GNOME/gtk-doc/-/blob/${src.tag}/NEWS";
     description = "Tools to extract documentation embedded in GTK and GNOME source code";
     homepage = "https://gitlab.gnome.org/GNOME/gtk-doc";
     license = lib.licenses.gpl2Plus;
diff --git a/pkgs/by-name/gt/gtk-doc/respect-xml-catalog-files-var.patch b/pkgs/by-name/gt/gtk-doc/respect-xml-catalog-files-var.patch
deleted file mode 100644
index 95f6879a0069..000000000000
--- a/pkgs/by-name/gt/gtk-doc/respect-xml-catalog-files-var.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/m4/gtkdoc_jh_check_xml_catalog.m4
-+++ b/m4/gtkdoc_jh_check_xml_catalog.m4
-@@ -5,8 +5,8 @@
- [
- 	AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
- 	AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
--	if $jh_found_xmlcatalog && \
--		AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
-+	# empty argument forces libxml to use XML_CATALOG_FILES variable
-+	if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then
- 		AC_MSG_RESULT([found])
- 		ifelse([$3],,,[$3])
- 	else