From 638c051622508068c7b9e5d23d99438bbcd7e02e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 3 Oct 2025 12:23:07 +0900 Subject: [PATCH] gnu: perl-xml-libxslt: Update to 2.003000, take 2. This is a fixup to commit ef22a23ecf, inadvertently pushed too early. * gnu/packages/xml.scm (perl-xml-libxslt) [arguments]: Delete. [native-inputs]: Add pkg-config. [inputs]: Add comment justifying use of older libxml2-2.11. * gnu/packages/patches/perl-xml-libxslt-fix-configure.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. Fixes: #3175 Change-Id: I850e9bec260bfd527372509bbe8eaa30883840a3 --- gnu/local.mk | 1 - .../perl-xml-libxslt-fix-configure.patch | 34 ------------------- gnu/packages/xml.scm | 18 ++-------- 3 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 gnu/packages/patches/perl-xml-libxslt-fix-configure.patch diff --git a/gnu/local.mk b/gnu/local.mk index 634895703f511caa9cd0431db5faa85b6d3a8aa9..151b781ada3bf8efcdc10b47bc56f883d87b30a2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2103,7 +2103,6 @@ dist_patch_DATA = \ %D%/packages/patches/perl-www-curl-fix-struct-void.patch \ %D%/packages/patches/perl-www-curl-remove-symbol.patch \ %D%/packages/patches/perl-xml-libxml-fix-function-prototypes.patch \ - %D%/packages/patches/perl-xml-libxslt-fix-configure.patch \ %D%/packages/patches/phoronix-test-suite-fsdg.patch \ %D%/packages/patches/picprog-non-intel-support.patch \ %D%/packages/patches/pidgin-add-search-path.patch \ diff --git a/gnu/packages/patches/perl-xml-libxslt-fix-configure.patch b/gnu/packages/patches/perl-xml-libxslt-fix-configure.patch deleted file mode 100644 index 8433c30bedff94316287d041bf2509a852d9e732..0000000000000000000000000000000000000000 --- a/gnu/packages/patches/perl-xml-libxslt-fix-configure.patch +++ /dev/null @@ -1,34 +0,0 @@ -Patch from https://github.com/shlomif/perl-XML-LibXSLT/commit/40fdc7f0.patch - -From 40fdc7f0443949d9556f0ecf15eb7777d543cee1 Mon Sep 17 00:00:00 2001 -From: Florian Weimer -Date: Thu, 9 Feb 2023 19:28:14 +0100 -Subject: [PATCH] Avoid C implicit function declaration in Makefile.PL (C99 - compat) - -Future compilers are likely not to support implicit function -declarations. Add a fake prototype so that the probes will -not always fail with such compilers. ---- - Makefile.PL | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/Makefile.PL b/Makefile.PL -index 079f8ea..d720b48 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -463,10 +463,11 @@ SRC - } - } - else { -- -+ # Use a fake prototype in the style of autoconf. - $result = try_link(<<"SRC", $libs); --blank() { return 0; } --int t() { ${func}(); return 0; } -+char blank(void) { return 0; } -+char ${func}(void); -+int t(void) { ${func}(); return 0; } - SRC - } - } diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index b2665e51ae56f2b3efb39755b77806910d274cb2..fd695d8a8a59be20e4a80718c74160e4dabd76fd 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -707,21 +707,9 @@ XML parser and the high performance DOM implementation.") (base32 "11s5spf0x5h6qzajfsza28m62z50cilcpvl4iffyafzmfbp5makw")))) (build-system perl-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'extend-INCLUDE_PATH - ;; This hack is because the build system does not appear to use - ;; the pkg-config Cflags, and expects the libxml2 headers to be - ;; directly available from the FHS location (or C_INCLUDE_PATH), - ;; but they are nested under a libxml2 subdirectory. - (lambda* (#:key inputs #:allow-other-keys) - (setenv "C_INCLUDE_PATH" - (string-append - (getenv "C_INCLUDE_PATH") - ":" (search-input-directory inputs - "include/libxml2")))))))) + (native-inputs (list pkg-config)) + ;; FIXME: libxml2-2.11 is used instead of latest, due to test failures + ;; (see: ). (inputs (list libxml2-2.11 libxslt)) (propagated-inputs (list perl-xml-libxml)) (home-page "https://metacpan.org/release/XML-LibXSLT")