guix_mirror_bot pushed a commit to branch mesa-updates
in repository guix.
commit 9a0a92755ff4bdbd78426bf90b99a3822bbff519
Author: John Kehayias <[email protected]>
AuthorDate: Sun Sep 21 15:30:17 2025 -0400
gnu: libzmf: Fix build with newer doxygen.
* gnu/packages/libreoffice.scm (libzmf)[source]: Add patch.
* gnu/packages/patches/libzmf-doxygen-1.14.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
Change-Id: Iced77d86eb5ed92d379cc9668182299dd865a5d4
---
gnu/local.mk | 1 +
gnu/packages/libreoffice.scm | 21 ++++++++++++++----
gnu/packages/patches/libzmf-doxygen-1.14.patch | 30 ++++++++++++++++++++++++++
3 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index c1b8d0e7a9..b4f8d716b4 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1676,6 +1676,7 @@ dist_patch_DATA =
\
%D%/packages/patches/librewolf-use-system-wide-dir.patch \
%D%/packages/patches/libvirt-add-install-prefix.patch \
%D%/packages/patches/libvirt-respect-modules-path.patch \
+ %D%/packages/patches/libzmf-doxygen-1.14.patch \
%D%/packages/patches/libziparchive-add-includes.patch \
%D%/packages/patches/lightdm-arguments-ordering.patch \
%D%/packages/patches/lightdm-vnc-ipv6.patch \
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 60fcac4069..24edbfba4d 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -772,15 +772,28 @@ Works word processor file format.")
(uri (string-append "http://dev-www.libreoffice.org/src/libzmf/libzmf-";
version ".tar.xz"))
(sha256 (base32
- "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197"))))
+ "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197"))
+ (patches (search-patches "libzmf-doxygen-1.14.patch"))))
(build-system gnu-build-system)
(arguments
- ;; A harmless 'sign-compare' error pops up on i686 so disable '-Werror'.
- '(#:configure-flags '("--disable-werror")))
+ (list
+ ;; A harmless 'sign-compare' error pops up on i686 so disable '-Werror'.
+ #:configure-flags #~'("--disable-werror")
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'bootstrap
+ (lambda _
+ ;; Override the bootstrap phase as a makefile has been patched.
+ (invoke "autoreconf" "-vif"))))))
(inputs
(list boost icu4c libpng librevenge zlib))
(native-inputs
- (list cppunit doxygen pkg-config))
+ (list autoconf
+ automake
+ libtool
+ cppunit
+ doxygen
+ pkg-config))
(home-page "https://wiki.documentfoundation.org/DLP/Libraries/libzmf";)
(synopsis "Parses file format of Zoner Callisto/Draw documents")
(description "Libzmf is a library that parses the file format of Zoner
diff --git a/gnu/packages/patches/libzmf-doxygen-1.14.patch
b/gnu/packages/patches/libzmf-doxygen-1.14.patch
new file mode 100644
index 0000000000..46d05a2549
--- /dev/null
+++ b/gnu/packages/patches/libzmf-doxygen-1.14.patch
@@ -0,0 +1,30 @@
+From 48f94abff2fcc4943626a62c6180c60862288b08 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <[email protected]>
+Date: Tue, 3 Jun 2025 11:57:29 +0200
+Subject: [PATCH 245/248] Install all files generated by doxygen
+
+Install the whole directory and do not pick only some file-types
+
+Change-Id: I743253696f3e57dfe70c6509b7d620dc2bf39e76
+---
+ docs/doxygen/Makefile.am | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/docs/doxygen/Makefile.am b/docs/doxygen/Makefile.am
+index 4351042..40a02e8 100644
+--- a/docs/doxygen/Makefile.am
++++ b/docs/doxygen/Makefile.am
+@@ -6,9 +6,7 @@ if WITH_LIBZMF_DOCS
+
+ install-data-am:
+ mkdir -p $(DESTDIR)$(docdir)/html
+- $(INSTALL_DATA) html/*.html $(DESTDIR)$(docdir)/html/
+- $(INSTALL_DATA) html/*.png $(DESTDIR)$(docdir)/html/
+- $(INSTALL_DATA) html/*.css $(DESTDIR)$(docdir)/html/
++ $(INSTALL_DATA) html/* $(DESTDIR)$(docdir)/html/
+
+ uninstall-am:
+ -rm -rf $(DESTDIR)$(docdir)/html
+--
+2.51.0
+
