3 files changed, 3 insertions(+), 50 deletions(-)

M gnu/local.mk
D gnu/packages/patches/perl-xml-libxslt-fix-configure.patch
M gnu/packages/xml.scm

@@ 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		\

@@ 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 <fweimer@redhat.com>
-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
-         }
-     }

@@ 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: <https://github.com/shlomif/perl-XML-LibXSLT/issues/8>).
     (inputs (list libxml2-2.11 libxslt))
     (propagated-inputs (list perl-xml-libxml))
     (home-page "https://metacpan.org/release/XML-LibXSLT")