From abad9bc3606636343656d2f613ced941a4bcc5ae Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 7 Feb 2025 14:22:18 +0100 Subject: [PATCH] Revert "curl: update to 8.12.0" This reverts commit e35744624c71eeefbde691f9766e61fea0f45b91. --- packages/web/curl/package.mk | 4 ++-- .../patches/curl-01-allow_building_debug.patch | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 packages/web/curl/patches/curl-01-allow_building_debug.patch diff --git a/packages/web/curl/package.mk b/packages/web/curl/package.mk index e4d20298ef..26f5ec5ef4 100644 --- a/packages/web/curl/package.mk +++ b/packages/web/curl/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="curl" -PKG_VERSION="8.12.0" -PKG_SHA256="9a4628c764be6b1a9909567c13e8e771041609df43b2158fcac4e05ea7097e5d" +PKG_VERSION="8.10.1" +PKG_SHA256="73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee" PKG_LICENSE="MIT" PKG_SITE="https://curl.haxx.se" PKG_URL="https://curl.haxx.se/download/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/web/curl/patches/curl-01-allow_building_debug.patch b/packages/web/curl/patches/curl-01-allow_building_debug.patch new file mode 100644 index 0000000000..29ad57996d --- /dev/null +++ b/packages/web/curl/patches/curl-01-allow_building_debug.patch @@ -0,0 +1,16 @@ + +When building debug image avoid: + +*/build/curl-8.7.1/lib/easy_lock.h:72:20: error: inlining failed in call to 'curl_simple_lock_lock': function not considered for inlining [-Werror=inline] + + +--- a/CMake/PickyWarnings.cmake.org 2024-03-25 09:48:59.000000000 +0100 ++++ b/CMake/PickyWarnings.cmake 2024-05-03 18:27:04.033468758 +0200 +@@ -60,7 +60,6 @@ if(PICKY_COMPILER) + list(APPEND WPICKY_ENABLE + -Wbad-function-cast # clang 2.7 gcc 2.95 + -Wconversion # clang 2.7 gcc 2.95 +- -Winline # clang 1.0 gcc 1.0 + -Wmissing-declarations # clang 1.0 gcc 2.7 + -Wmissing-prototypes # clang 1.0 gcc 1.0 + -Wnested-externs # clang 1.0 gcc 2.7