From 6d690cfabb3fb871748c66e3d225bcb41410c782 Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Wed, 1 Mar 2023 20:27:40 +0100 Subject: [PATCH] perl-WWW-Curl: Add patchset to compile with newer curl. Signed-off-by: Stefan Schantl --- ...eprocessor-symbol-only-CURL_STRICTER.patch | 34 +++++++++++++++ ...02-WWW-Curl-4.17-define-CURL-as-void.patch | 21 ++++++++++ ...4.17-Adapt-to-changes-in-cURL-7.69.0.patch | 41 +++++++++++++++++++ perl-WWW-Curl/perl-WWW-Curl.nm | 4 +- 4 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 perl-WWW-Curl/patches/01-WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch create mode 100644 perl-WWW-Curl/patches/02-WWW-Curl-4.17-define-CURL-as-void.patch create mode 100644 perl-WWW-Curl/patches/03-WWW-Curl-4.17-Adapt-to-changes-in-cURL-7.69.0.patch diff --git a/perl-WWW-Curl/patches/01-WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch b/perl-WWW-Curl/patches/01-WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch new file mode 100644 index 000000000..34221c0d2 --- /dev/null +++ b/perl-WWW-Curl/patches/01-WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch @@ -0,0 +1,34 @@ +From 0be0223422e6e5f4091c6e4e058d213623eed105 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Mon, 12 Sep 2016 14:40:44 +0200 +Subject: [PATCH] Skip preprocessor symbol only CURL_STRICTER +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +CURL_STRICTER leaked into curl-constants.c when building against +curl-7.50.2. This is a preprocessor only macro without a value. + +CPAN RT#117793 + +Signed-off-by: Petr Písař +--- + Makefile.PL | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.PL b/Makefile.PL +index f9170bb..ad2bd3d 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -127,7 +127,7 @@ if (!defined($curl_h)) { + close H; + + for my $e (sort @syms) { +- if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) { ++ if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|_LAST\z|_LASTENTRY\z)/) { + next; + } + my ($group) = $e =~ m/^([^_]+_)/; +-- +2.7.4 + diff --git a/perl-WWW-Curl/patches/02-WWW-Curl-4.17-define-CURL-as-void.patch b/perl-WWW-Curl/patches/02-WWW-Curl-4.17-define-CURL-as-void.patch new file mode 100644 index 000000000..1fa9b5457 --- /dev/null +++ b/perl-WWW-Curl/patches/02-WWW-Curl-4.17-define-CURL-as-void.patch @@ -0,0 +1,21 @@ +diff -up ./Curl.xs.orig ./Curl.xs +--- ./Curl.xs.orig 2019-10-18 07:45:38.380881448 +0200 ++++ ./Curl.xs 2019-10-18 07:46:20.712032844 +0200 +@@ -47,7 +47,7 @@ typedef enum { + + typedef struct { + /* The main curl handle */ +- struct CURL *curl; ++ CURL *curl; + I32 *y; + /* Lists that can be set via curl_easy_setopt() */ + struct curl_slist *slist[SLIST_LAST]; +@@ -73,7 +73,7 @@ typedef struct { + #ifdef __CURL_MULTI_H + struct CURLM *curlm; + #else +- struct void *curlm; ++ void *curlm; + #endif + } perl_curl_multi; + diff --git a/perl-WWW-Curl/patches/03-WWW-Curl-4.17-Adapt-to-changes-in-cURL-7.69.0.patch b/perl-WWW-Curl/patches/03-WWW-Curl-4.17-Adapt-to-changes-in-cURL-7.69.0.patch new file mode 100644 index 000000000..3d6829b0c --- /dev/null +++ b/perl-WWW-Curl/patches/03-WWW-Curl-4.17-Adapt-to-changes-in-cURL-7.69.0.patch @@ -0,0 +1,41 @@ +From ee910449bf764d9f582e612c9b8b61b1d18e3a7c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Thu, 9 Apr 2020 14:31:05 +0200 +Subject: [PATCH] Adapt to changes in cURL 7.69.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +WIN32 macro was removed (1adebe7886ddf20b0733bf9ccbae4ed4866dcfb6) and +then added under a CURL_WIN32 name +(8bd863f97b6c79f561bc063e634cecdf4badf776). This a C preprocessor +macro for driving the C compiler, not a cURL option. Thus this fix +ignores it. + +CURLOPT(na,t,nu) macro was added +(920deff8618a19ae80bd319851722f1b05751f69) as replacement for CINIT() +macro. It's not a cURL option. This fix also ignores it. + +CPAN RT#132197 + +Signed-off-by: Petr Písař +--- + Makefile.PL | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.PL b/Makefile.PL +index ad2bd3d..b9e6a46 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -127,7 +127,7 @@ if (!defined($curl_h)) { + close H; + + for my $e (sort @syms) { +- if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|_LAST\z|_LASTENTRY\z)/) { ++ if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_WIN32\z|^CURLOPT\z|_LAST\z|_LASTENTRY\z)/) { + next; + } + my ($group) = $e =~ m/^([^_]+_)/; +-- +2.21.1 + diff --git a/perl-WWW-Curl/perl-WWW-Curl.nm b/perl-WWW-Curl/perl-WWW-Curl.nm index 736a80ede..20619266a 100644 --- a/perl-WWW-Curl/perl-WWW-Curl.nm +++ b/perl-WWW-Curl/perl-WWW-Curl.nm @@ -5,7 +5,7 @@ name = perl-WWW-Curl version = 4.17 -release = 1.1 +release = 1.2 thisapp = WWW-Curl-%{version} groups = Development/Libraries @@ -21,8 +21,10 @@ source_dl = http://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT/ build requires + perl(FindBin) perl(ExtUtils::MakeMaker) perl(ExtUtils::ParseXS) + perl(Module::Install) libcurl-devel pakfire >= 0.9.26-3.1 end -- 2.39.2