From aa0d002aa72ef360a1d011b0e90d01743965f5f3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 25 Sep 2019 11:03:45 +0200
Subject: [PATCH] perl-WWW-Curl: rebuild against perl-5.30.0_1

---
 .../perl-WWW-Curl/patches/CURL_STRICTER.patch | 32 -------------------
 .../perl-WWW-Curl/patches/curl-7.50.2.patch   | 24 ++++++++++++++
 srcpkgs/perl-WWW-Curl/template                |  2 +-
 3 files changed, 25 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/perl-WWW-Curl/patches/CURL_STRICTER.patch
 create mode 100644 srcpkgs/perl-WWW-Curl/patches/curl-7.50.2.patch

diff --git a/srcpkgs/perl-WWW-Curl/patches/CURL_STRICTER.patch b/srcpkgs/perl-WWW-Curl/patches/CURL_STRICTER.patch
deleted file mode 100644
index 3220b248877..00000000000
--- a/srcpkgs/perl-WWW-Curl/patches/CURL_STRICTER.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0be0223422e6e5f4091c6e4e058d213623eed105 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-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ř <ppisar@redhat.com>
----
- Makefile.PL | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- Makefile.PL
-+++ 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/srcpkgs/perl-WWW-Curl/patches/curl-7.50.2.patch b/srcpkgs/perl-WWW-Curl/patches/curl-7.50.2.patch
new file mode 100644
index 00000000000..3fb8c78e833
--- /dev/null
+++ b/srcpkgs/perl-WWW-Curl/patches/curl-7.50.2.patch
@@ -0,0 +1,24 @@
+--- Makefile.PL
++++ Makefile.PL
+@@ -127,7 +127,7 @@
+     close H;
+ 
+     for my $e (sort @syms) {
+-       if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) {
++       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z|^CURLINC_CURL_H\z)/) {
+           next;
+        }
+        my ($group) = $e =~ m/^([^_]+_)/;
+--- Curl.xs
++++ Curl.xs
+@@ -18,6 +18,10 @@
+ #include <curl/easy.h>
+ #include <curl/multi.h>
+ 
++#ifdef CURLINC_MULTI_H
++#define __CURL_MULTI_H
++#endif
++
+ #define header_callback_func writeheader_callback_func
+ 
+ /* Do a favor for older perl versions */
diff --git a/srcpkgs/perl-WWW-Curl/template b/srcpkgs/perl-WWW-Curl/template
index 423bba481c6..d74a7f39216 100644
--- a/srcpkgs/perl-WWW-Curl/template
+++ b/srcpkgs/perl-WWW-Curl/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-WWW-Curl'.
 pkgname=perl-WWW-Curl
 version=4.17
-revision=9
+revision=10
 wrksrc="WWW-Curl-${version}"
 build_style=perl-module
 hostmakedepends="perl"