From a45917ad303f3391c1a4d0b2e3af49ddcce03ba6 Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Mon, 27 Nov 2023 15:28:14 +0100 Subject: [PATCH] (#21339) mpfr: cleanup patches they were introduced in https://github.com/conan-io/conan-center-index/pull/14687 but never applied also, use more compact archives identified by #21146 and https://ericlemanissier.github.io/conan-center-lint-conandata/ --- recipes/mpfr/all/conandata.yml | 16 +++++++------- .../4.0.2-0001-configure.ac-fixes.patch | 21 ------------------ .../4.1.0-0001-configure.ac-fixes.patch | 22 ------------------- .../4.2.0-0001-configure.ac-fixes.patch | 10 --------- 4 files changed, 8 insertions(+), 61 deletions(-) delete mode 100644 recipes/mpfr/all/patches/4.0.2-0001-configure.ac-fixes.patch delete mode 100644 recipes/mpfr/all/patches/4.1.0-0001-configure.ac-fixes.patch delete mode 100644 recipes/mpfr/all/patches/4.2.0-0001-configure.ac-fixes.patch diff --git a/recipes/mpfr/all/conandata.yml b/recipes/mpfr/all/conandata.yml index bdecd0395c37d..afd84455cac46 100644 --- a/recipes/mpfr/all/conandata.yml +++ b/recipes/mpfr/all/conandata.yml @@ -1,16 +1,16 @@ sources: "4.2.1": - url: "https://ftp.gnu.org/gnu/mpfr/mpfr-4.2.1.tar.gz" - sha256: "116715552bd966c85b417c424db1bbdf639f53836eb361549d1f8d6ded5cb4c6" + url: "https://ftp.gnu.org/gnu/mpfr/mpfr-4.2.1.tar.xz" + sha256: "277807353a6726978996945af13e52829e3abd7a9a5b7fb2793894e18f1fcbb2" "4.2.0": - url: "https://ftp.gnu.org/gnu/mpfr/mpfr-4.2.0.tar.gz" - sha256: "f1cc1c6bb14d18f0c61cc416e083f5e697b6e0e3cf9630b9b33e8e483fc960f0" + url: "https://ftp.gnu.org/gnu/mpfr/mpfr-4.2.0.tar.xz" + sha256: "06a378df13501248c1b2db5aa977a2c8126ae849a9d9b7be2546fb4a9c26d993" "4.1.0": - url: "https://ftp.gnu.org/gnu/mpfr/mpfr-4.1.0.tar.gz" - sha256: "3127fe813218f3a1f0adf4e8899de23df33b4cf4b4b3831a5314f78e65ffa2d6" + url: "https://ftp.gnu.org/gnu/mpfr/mpfr-4.1.0.tar.xz" + sha256: "0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f" "4.0.2": - url: "https://ftp.gnu.org/gnu/mpfr/mpfr-4.0.2.tar.gz" - sha256: "ae26cace63a498f07047a784cd3b0e4d010b44d2b193bab82af693de57a19a78" + url: "https://ftp.gnu.org/gnu/mpfr/mpfr-4.0.2.tar.xz" + sha256: "1d3be708604eae0e42d578ba93b390c2a145f17743a744d8f3f8c2ad5855a38a" patches: "4.2.1": - patch_file: "patches/4.2.0-0002-windows-header-dll.patch" diff --git a/recipes/mpfr/all/patches/4.0.2-0001-configure.ac-fixes.patch b/recipes/mpfr/all/patches/4.0.2-0001-configure.ac-fixes.patch deleted file mode 100644 index c6b67dbae98b2..0000000000000 --- a/recipes/mpfr/all/patches/4.0.2-0001-configure.ac-fixes.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -27,6 +27,7 @@ - - dnl Add check-news when it checks for more than 15 lines - AC_INIT([MPFR],[4.0.2]) -+AC_CANONICAL_TARGET - - dnl Older Automake versions than 1.13 may still be supported, but no longer - dnl tested, and many things have changed in 1.13. Moreover the INSTALL file - ---- acinclude.m4 -+++ acinclude.m4 -@@ -41,7 +41,6 @@ - AC_REQUIRE([AC_OBJEXT]) - AC_REQUIRE([MPFR_CHECK_LIBM]) - AC_REQUIRE([MPFR_CHECK_LIBQUADMATH]) --AC_REQUIRE([AC_HEADER_TIME]) - AC_REQUIRE([AC_CANONICAL_HOST]) - - dnl Features for the MPFR shared cache. This needs to be done diff --git a/recipes/mpfr/all/patches/4.1.0-0001-configure.ac-fixes.patch b/recipes/mpfr/all/patches/4.1.0-0001-configure.ac-fixes.patch deleted file mode 100644 index 888d7d12deb82..0000000000000 --- a/recipes/mpfr/all/patches/4.1.0-0001-configure.ac-fixes.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -27,6 +27,7 @@ - - dnl Add check-news when it checks for more than 15 lines - AC_INIT([MPFR],[4.1.0]) -+AC_CANONICAL_TARGET - - dnl Older Automake versions than 1.13 may still be supported, but no longer - dnl tested, and many things have changed in 1.13. Moreover the INSTALL file - ---- acinclude.m4 -+++ acinclude.m4 -@@ -40,7 +40,6 @@ - AC_REQUIRE([AC_OBJEXT]) - AC_REQUIRE([MPFR_CHECK_LIBM]) - AC_REQUIRE([MPFR_CHECK_LIBQUADMATH]) --AC_REQUIRE([AC_HEADER_TIME]) - AC_REQUIRE([AC_CANONICAL_HOST]) - - dnl Features for the MPFR shared cache. This needs to be done - diff --git a/recipes/mpfr/all/patches/4.2.0-0001-configure.ac-fixes.patch b/recipes/mpfr/all/patches/4.2.0-0001-configure.ac-fixes.patch deleted file mode 100644 index 59480e9bde74c..0000000000000 --- a/recipes/mpfr/all/patches/4.2.0-0001-configure.ac-fixes.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -44,6 +44,7 @@ - dnl as it could cause confusion. But let's keep AC_CANONICAL_HOST here, - dnl since this may be a better place than later. - AC_CANONICAL_HOST -+AC_CANONICAL_TARGET - - dnl Older Automake versions than 1.13 may still be supported, but no longer - dnl tested, and many things have changed in 1.13. Moreover the INSTALL file