| 1 |
commit: c2bce6bb75b6f51f9481fe5a28ab3cc39fc682e6 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 30 06:13:44 2020 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 30 06:14:52 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2bce6bb |
| 7 |
|
| 8 |
dev-perl/WWW-Curl: compile-fix for newer net-misc/curl |
| 9 |
|
| 10 |
Reference: https://rt.cpan.org/Public/Bug/Display.html?id=132197 |
| 11 |
Closes: https://bugs.gentoo.org/713008 |
| 12 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild | 1 + |
| 15 |
.../WWW-Curl/files/WWW-Curl-4.17-RT132197.patch | 41 ++++++++++++++++++++++ |
| 16 |
2 files changed, 42 insertions(+) |
| 17 |
|
| 18 |
diff --git a/dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild b/dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild |
| 19 |
index d9eb8c504ab..55cab9448db 100644 |
| 20 |
--- a/dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild |
| 21 |
+++ b/dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild |
| 22 |
@@ -23,5 +23,6 @@ PATCHES=( |
| 23 |
"${FILESDIR}"/${PN}-4.17-networktests.patch |
| 24 |
"${FILESDIR}"/${PN}-4.17-RT117793.patch |
| 25 |
"${FILESDIR}"/${PN}-4.17-RT130591.patch |
| 26 |
+ "${FILESDIR}"/${PN}-4.17-RT132197.patch |
| 27 |
) |
| 28 |
PERL_RM_FILES=("t/meta.t" "t/pod-coverage.t" "t/pod.t") |
| 29 |
|
| 30 |
diff --git a/dev-perl/WWW-Curl/files/WWW-Curl-4.17-RT132197.patch b/dev-perl/WWW-Curl/files/WWW-Curl-4.17-RT132197.patch |
| 31 |
new file mode 100644 |
| 32 |
index 00000000000..77a97dd7186 |
| 33 |
--- /dev/null |
| 34 |
+++ b/dev-perl/WWW-Curl/files/WWW-Curl-4.17-RT132197.patch |
| 35 |
@@ -0,0 +1,41 @@ |
| 36 |
+From ee910449bf764d9f582e612c9b8b61b1d18e3a7c Mon Sep 17 00:00:00 2001 |
| 37 |
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@××××××.com> |
| 38 |
+Date: Thu, 9 Apr 2020 14:31:05 +0200 |
| 39 |
+Subject: [PATCH] Adapt to changes in cURL 7.69.0 |
| 40 |
+MIME-Version: 1.0 |
| 41 |
+Content-Type: text/plain; charset=UTF-8 |
| 42 |
+Content-Transfer-Encoding: 8bit |
| 43 |
+ |
| 44 |
+WIN32 macro was removed (1adebe7886ddf20b0733bf9ccbae4ed4866dcfb6) and |
| 45 |
+then added under a CURL_WIN32 name |
| 46 |
+(8bd863f97b6c79f561bc063e634cecdf4badf776). This a C preprocessor |
| 47 |
+macro for driving the C compiler, not a cURL option. Thus this fix |
| 48 |
+ignores it. |
| 49 |
+ |
| 50 |
+CURLOPT(na,t,nu) macro was added |
| 51 |
+(920deff8618a19ae80bd319851722f1b05751f69) as replacement for CINIT() |
| 52 |
+macro. It's not a cURL option. This fix also ignores it. |
| 53 |
+ |
| 54 |
+CPAN RT#132197 |
| 55 |
+ |
| 56 |
+Signed-off-by: Petr Písař <ppisar@××××××.com> |
| 57 |
+--- |
| 58 |
+ Makefile.PL | 2 +- |
| 59 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 60 |
+ |
| 61 |
+diff --git a/Makefile.PL b/Makefile.PL |
| 62 |
+index ad2bd3d..b9e6a46 100644 |
| 63 |
+--- a/Makefile.PL |
| 64 |
++++ b/Makefile.PL |
| 65 |
+@@ -127,7 +127,7 @@ if (!defined($curl_h)) { |
| 66 |
+ close H; |
| 67 |
+ |
| 68 |
+ for my $e (sort @syms) { |
| 69 |
+- if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z|^CURLINC_)/) { |
| 70 |
++ if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z|^CURLINC_|^CURL_WIN32\z|^CURLOPT\z)/) { |
| 71 |
+ next; |
| 72 |
+ } |
| 73 |
+ my ($group) = $e =~ m/^([^_]+_)/; |
| 74 |
+-- |
| 75 |
+2.21.1 |
| 76 |
+ |
Archives