gnu: libextractor: Update to 1.14.

* gnu/packages/gnunet.scm (libextractor): Update to 1.14.
[#:phases]: Remove 'force-reconfigure phase.
[native-inuts]: Remove autoconf, automake, gettext, libtool, texinfo.
* gnu/packages/patches/libextractor-tidy-support.patch: Delete patch.
* gnu/local.mk (dist_patch_DATA): Remove deleted patch.

Change-Id: Ic0cc4e2c842a7f88fdecf631a07b4d6aff9e4a01
Signed-off-by: Andreas Enge <andreas@enge.fr>

2 files changed, 3 insertions, 94 deletions

diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index c0bcee085bb..db9a550a07e 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -88,16 +88,14 @@
 (define-public libextractor
   (package
     (name "libextractor")
-    (version "1.13")
+    (version "1.14")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/libextractor/libextractor-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "0mgprmwdhdwq9xhfxfhcncd304425nvcc4zi8ci5f0nja4n333xv"))
-              (patches
-               (search-patches "libextractor-tidy-support.patch"))))
+                "1026dg626b0vy55rz3wv9rpmvqsqahbpphsdqqr4mz6a7x1mafhs"))))
     (build-system gnu-build-system)
     (outputs '("out"
                "static"))               ; 420 KiB .a files
@@ -107,9 +105,6 @@
                                   #$(this-package-input "libltdl")))
            #:phases
            #~(modify-phases %standard-phases
-               (add-after 'unpack 'force-reconfigure
-                 (lambda _
-                   (delete-file "configure")))
                (add-after 'install 'move-static-libraries
                  (lambda* (#:key outputs #:allow-other-keys)
                    ;; Move static libraries to the "static" output.
@@ -122,12 +117,7 @@
                                  (delete-file file))
                                (find-files lib "\\.a$"))))))))
     (native-inputs
-     (list autoconf-2.71
-           automake
-           gettext-minimal
-           libtool
-           pkg-config
-           texinfo))
+     (list pkg-config))
     (inputs
      (list bzip2
            exiv2-0.27
diff --git a/gnu/packages/patches/libextractor-tidy-support.patch b/gnu/packages/patches/libextractor-tidy-support.patch
deleted file mode 100644
index 8fe2f21b2b5..00000000000
--- a/gnu/packages/patches/libextractor-tidy-support.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Upstream status: submitted to bug-libextractor@gnu.org.
-
-From 1fc6daaeaf829fb941a176831c011888a73c43b9 Mon Sep 17 00:00:00 2001
-From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
-Date: Mon, 11 Mar 2024 09:36:26 -0400
-Subject: [PATCH] html_extractor: Add support for modern tidy-html.
-
-* configure.ac: Use PKG_PROG_PKG_CONFIG to initialize pkg-config detection.
-<tidy>: Check for library via pkg-config.
-* src/plugins/html_extractor.c: Standardize tidy include file names.
----
- configure.ac                 | 28 +++++++++-------------------
- src/plugins/html_extractor.c |  4 ++--
- 2 files changed, 11 insertions(+), 21 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d17ff39..e89d70c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -176,6 +176,8 @@ AS_CASE(["$target_os"],
- 
- AM_ICONV
- 
-+PKG_PROG_PKG_CONFIG()
-+
- # We define the paths here, because MinGW/GCC expands paths
- # passed through the command line ("-DLOCALEDIR=..."). This would
- # lead to hard-coded paths ("C:\mingw\mingw\bin...") that do
-@@ -424,25 +426,13 @@ AC_CHECK_LIB(magic, magic_open,
-    AM_CONDITIONAL(HAVE_MAGIC, false))],
-   AM_CONDITIONAL(HAVE_MAGIC, false))
- 
--AC_MSG_CHECKING(for tidyNodeGetValue -ltidy)
--AC_LANG_PUSH(C++)
--SAVED_LIBS=$LIBS
--LIBS="$LIBS -ltidy"
--AC_LINK_IFELSE(
--  [AC_LANG_PROGRAM([[#include <tidy/tidy.h>]],
--    [[ Bool b = tidyNodeGetValue (NULL, NULL, NULL); ]])],
--  [AC_MSG_RESULT(yes)
--   AM_CONDITIONAL(HAVE_TIDY, true)
--   AC_DEFINE(HAVE_TIDY,1,[Have tidyNodeGetValue in libtidy])],
--  [AC_MSG_RESULT(no)
--   AM_CONDITIONAL(HAVE_TIDY, false)])
--LIBS=$SAVED_LIBS
--AC_LANG_POP(C++)
--
--# restore LIBS
--LIBS=$LIBSOLD
--
--
-+dnl tidyNodeGetValue was already available in 5.0.0, released in 2015.
-+PKG_CHECK_MODULES([TIDY], [tidy >= 5.0.0],
-+ [AC_DEFINE(HAVE_TIDY, 1, [Have tidy])
-+  AM_CONDITIONAL(HAVE_TIDY, true)],
-+ [AM_CONDITIONAL(HAVE_TIDY, false)])
-+CFLAGS="$CFLAGS $TIDY_CFLAGS"
-+LIBS="$LIBS $TIDY_LIBS"
- 
- # should 'make check' run tests?
- AC_MSG_CHECKING(whether to run tests)
-diff --git a/src/plugins/html_extractor.c b/src/plugins/html_extractor.c
-index 5ebf97b..88100d3 100644
---- a/src/plugins/html_extractor.c
-+++ b/src/plugins/html_extractor.c
-@@ -26,8 +26,8 @@
- #include "platform.h"
- #include "extractor.h"
- #include <magic.h>
--#include <tidy/tidy.h>
--#include <tidy/tidybuffio.h>
-+#include <tidy.h>
-+#include <tidybuffio.h>
- 
- /**
-  * Mapping of HTML META names to LE types.
-
-base-commit: a75f40b64b5868967c95ea214e8eaac4f7088b23
--- 
-2.41.0
-