guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.
commit 6901f6f8736cf1e247eb4c46f9c7de02e6f5bf48
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Wed Aug 26 22:59:56 2026 +0900
gnu: gtk-doc: Update to 1.36.1.
* gnu/packages/gtk.scm (gtk-doc): Update to 1.36.1.
[source]: Delete patches.
* gnu/packages/patches/gtk-doc-mkhtml-test-fix.patch
* gnu/packages/patches/gtk-doc-respect-xml-catalog.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): De-register them.
Signed-off-by: Liliana Marie Prikler <[email protected]>
---
gnu/local.mk | 2 --
gnu/packages/gtk.scm | 7 ++---
gnu/packages/patches/gtk-doc-mkhtml-test-fix.patch | 33 ----------------------
.../patches/gtk-doc-respect-xml-catalog.patch | 16 -----------
4 files changed, 2 insertions(+), 56 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index fb200ca0568..5dc8b45add9 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1616,8 +1616,6 @@ dist_patch_DATA =
\
%D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch \
%D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \
%D%/packages/patches/gtk3-treeview-test-fix.patch \
- %D%/packages/patches/gtk-doc-respect-xml-catalog.patch \
- %D%/packages/patches/gtk-doc-mkhtml-test-fix.patch \
%D%/packages/patches/gtk4-demo-reproducible.patch \
%D%/packages/patches/gtk4-needs-udmabuf.patch \
%D%/packages/patches/gtk4-respect-GUIX_GTK4_PATH.patch \
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 901defbe939..6e682012098 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -2221,7 +2221,7 @@ information.")
(define-public gtk-doc
(package
(name "gtk-doc")
- (version "1.35.1")
+ (version "1.36.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -2229,10 +2229,7 @@ information.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1qi5bgqca1chdcfw7v4h3sw8jg661nmp77d7x658mn6nxlj9y731"))
- (patches
- (search-patches "gtk-doc-respect-xml-catalog.patch"
- "gtk-doc-mkhtml-test-fix.patch"))))
+ "1ifvrap24p96ksqbvwlq4f9b7a4avrmm2xz13cc33606jxgpll8f"))))
(build-system meson-build-system)
(arguments
(list
diff --git a/gnu/packages/patches/gtk-doc-mkhtml-test-fix.patch
b/gnu/packages/patches/gtk-doc-mkhtml-test-fix.patch
deleted file mode 100644
index b6adbbba8e7..00000000000
--- a/gnu/packages/patches/gtk-doc-mkhtml-test-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 951743698610eaaa0cc9030f7d7d02437419ac24 Mon Sep 17 00:00:00 2001
-From: Neil Hanlon <[email protected]>
-Date: Fri, 9 Feb 2024 15:32:38 -0500
-Subject: [PATCH] Add gobject example source code to path for mkhtml test
-
-Fixes #150
-
-I'm not really sure why this is required, but I suspect it has to do
-with changes in how GCC handles path traversal due to recent (ish)
-security issues, as the code here is evaluated to
-`../xml/../../examples/gobject.c` which probably looks unhealthy to
-automatically include.
-
-Signed-off-by: Neil Hanlon <[email protected]>
----
- tests/gobject/docs/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/gobject/docs/meson.build b/tests/gobject/docs/meson.build
-index a1dd66ca..236a1cc0 100644
---- a/tests/gobject/docs/meson.build
-+++ b/tests/gobject/docs/meson.build
-@@ -119,6 +119,7 @@ test(
- '--path=@0@'.format(':'.join([
- gobject_test_docs_dir,
- srcdir,
-+ join_paths(srcdir, 'tests/gobject/examples'),
- ])
- ),
- ],
---
-GitLab
-
diff --git a/gnu/packages/patches/gtk-doc-respect-xml-catalog.patch
b/gnu/packages/patches/gtk-doc-respect-xml-catalog.patch
deleted file mode 100644
index 710f208285b..00000000000
--- a/gnu/packages/patches/gtk-doc-respect-xml-catalog.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Taken from here:
-https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch.
-
---- 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
