perl-www-curl: fix compilation error with new cURL version

Add patch removing internal macro CURL_HAS_DECLSPEC_ATTRIBUTE.

This fix a compilation error for the package.

Also improve the old 7.88 patch with wrong whitespace.

Signed-off-by: Christian Marangi <[email protected]>

diff --git a/lang/perl/perl-www-curl/Makefile b/lang/perl/perl-www-curl/Makefile
index ae6846d29bab1992490b5d98fb94fd74f32f80b3..e02873b9241b263dfe5f880d203806dd9545ddbf 100644 (file)
--- a/lang/perl/perl-www-curl/Makefile
+++ b/lang/perl/perl-www-curl/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=perl-www-curl
 PKG_VERSION:=4.17
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 
 PKG_SOURCE_URL:=https://www.cpan.org/authors/id/S/SZ/SZBALINT/
 PKG_SOURCE:=WWW-Curl-$(PKG_VERSION).tar.gz

diff --git a/lang/perl/perl-www-curl/patches/230-curl_7.88_compat.patch b/lang/perl/perl-www-curl/patches/230-curl_7.88_compat.patch
index 58a6160835ee947d579385320c184a6372d270a7..806eee5cb497734741f6520a59380aac0888a113 100644 (file)
--- a/lang/perl/perl-www-curl/patches/230-curl_7.88_compat.patch
+++ b/lang/perl/perl-www-curl/patches/230-curl_7.88_compat.patch
@@ -5,7 +5,7 @@
  
      for my $e (sort @syms) {
 -       if($e =~ /(OBSOLETE|^CURL_EXTERN|CURLOPT\z|^CURL_STRICTER\z|_LAST\z|_LASTENTRY\z|WIN32)/) {
-+      if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z|^CURLINC_|^CURL_WIN32\z|^CURL_DEPRECATED\z|^CURL_IGNORE_DEPRECATION\z|^CURLOPTDEPRECATED\z|^CURLOPT\z)/) {
++       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z|^CURLINC_|^CURL_WIN32\z|^CURL_DEPRECATED\z|^CURL_IGNORE_DEPRECATION\z|^CURLOPTDEPRECATED\z|^CURLOPT\z)/) {
            next;
         }
         my ($group) = $e =~ m/^([^_]+_)/;

diff --git a/lang/perl/perl-www-curl/patches/240-curl_8.13_compat.patch b/lang/perl/perl-www-curl/patches/240-curl_8.13_compat.patch
new file mode 100644 (file)
index 0000000..d4c0a81
--- /dev/null
+++ b/lang/perl/perl-www-curl/patches/240-curl_8.13_compat.patch
@@ -0,0 +1,11 @@
+--- 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|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z|^CURLINC_|^CURL_WIN32\z|^CURL_DEPRECATED\z|^CURL_IGNORE_DEPRECATION\z|^CURLOPTDEPRECATED\z|^CURLOPT\z)/) {
++       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z|^CURLINC_|^CURL_WIN32\z|^CURL_DEPRECATED\z|^CURL_IGNORE_DEPRECATION\z|^CURLOPTDEPRECATED\z|^CURLOPT\z|^CURL_HAS_DECLSPEC_ATTRIBUTE\z)/) {
+           next;
+        }
+        my ($group) = $e =~ m/^([^_]+_)/;