From 2c560aa217284c3152378e5c79f0519d78cba226 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 14 Nov 2020 15:47:00 +0100 Subject: [PATCH] gnu: perl-www-curl: Fix build with curl@7.69.1. * gnu/packages/web.scm (perl-www-curl)[source]: Add perl-www-curl-fix-struct-void.patch. * gnu/packages/patches/perl-www-curl-remove-symbol.patch: Update. * gnu/packages/patches/perl-www-curl-fix-struct-void.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + .../perl-www-curl-fix-struct-void.patch | 24 ++++++++++++++++++ .../patches/perl-www-curl-remove-symbol.patch | Bin 1177 -> 984 bytes gnu/packages/web.scm | 4 +-- 4 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/perl-www-curl-fix-struct-void.patch diff --git a/gnu/local.mk b/gnu/local.mk index b5f9c56324..6a0f378bb0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1450,6 +1450,7 @@ dist_patch_DATA = \ %D%/packages/patches/perl-text-markdown-discount-unbundle.patch \ %D%/packages/patches/perl-module-pluggable-search.patch \ %D%/packages/patches/perl-reproducible-build-date.patch \ + %D%/packages/patches/perl-www-curl-fix-struct-void.patch \ %D%/packages/patches/perl-www-curl-remove-symbol.patch \ %D%/packages/patches/picard-fix-id3-rename-test.patch \ %D%/packages/patches/picprog-non-intel-support.patch \ diff --git a/gnu/packages/patches/perl-www-curl-fix-struct-void.patch b/gnu/packages/patches/perl-www-curl-fix-struct-void.patch new file mode 100644 index 0000000000..b150950668 --- /dev/null +++ b/gnu/packages/patches/perl-www-curl-fix-struct-void.patch @@ -0,0 +1,24 @@ +From: Tobias Geerinckx-Rice +Date: Sat, 14 Nov 2020 15:40:56 +0100 +Subject: [PATCH] gnu: perl-www-curl: Fix struct void* usage. + +Copied verbatim from Gentoo[0]. Fixes: + + Curl.xs:76:12: error: expected ‘{’ before ‘void’ + struct void *curlm; + ^~~~ + Curl.xs:76:12: error: two or more data types in declaration specifiers + +[0]: https://694466.bugs.gentoo.org/attachment.cgi?id=595098 + +--- WWW-Curl-4.17/Curl.xs 2014-02-21 18:08:30.000000000 +0200 ++++ WWW-Curl-4.17.new/Curl.xs 2019-11-05 21:44:55.434395739 +0200 +@@ -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/gnu/packages/patches/perl-www-curl-remove-symbol.patch b/gnu/packages/patches/perl-www-curl-remove-symbol.patch index ae3486708b3bd15c8385075a31edff3a8effa0a7..c32a34897be01ac5d97495368821f37be09a2b56 100644 GIT binary patch literal 984 zcmZ8fVRM>55bf9UE4I`RSUfmTqakU=6ty~&7)Q-GX__*qrx1~&2Zp3=^4q&0W?~rT z4&J`Kd;4~~f^RIC@R{$%@SQQ?hx7F#8ToStryJHv@`$z)XHwfum<3}usen;~0e=9K zniPz>Rijq52`V)xmB!oIJ)0*M+z!ttcJB^W;nsqPiGZYOO6FS;STJH6{=i@xF4#P9 z1zSM;w3+cB)+EX1k&nOw6EipQH?Ty7ka!Hbg0XMoHbh(`xAYFFxLV*PNfcYUj;Cu& z!D26q#~K%_4AP@InNFv~#(O1+5CX1#>8{z*512N*_-In2MyN?l18CFA-eZmKA0V`e zC8??kvv*l0CA3C%3BcG5AsRD+&n=Gt%=|KmpnIi=1~M+fu2Zeeqc^p`%&P>3F5y~y$E2` zz8+mT?S9+2>|9=rZk+D*z;-4#!%n-?9lxWEC!@YS>5LBHJ|^U+^bT=n+8v$8wM-#V2=ahK z%Ej6bSCBcPls=U;fT1hm9C~$jh~tNz<}EReyd`F{(s=DiCJ~e#N;`ckj0;%!3>4XR z!;mMC(+b%Z$QoW(s7*bbC*`zvcA(Nme^iqN%>V!Z literal 1177 zcma)5?{3>R5dY4nxMBHVL)Bl)cC1WuQpZ6HB&lJm#fG*qD2bA|%A`h8Yusgfk3B@6 zqS$-wBqv=B?868G)SZsMyWic9SNtB*me)BHl-I3dkkMAN9MU~7rKDi8)qoz51yBL4 z$XQlXg%NtcOJ(g4vZ5xdAd?M8Z=vK4+D042=nkPvP^^*4M5HpN(UI#a<75pLj#Q<) zYSWr$?(?>EFS%}Nx_2tGtLHqAeSbQgjR?8w0KJrXK`;t~fKAxA2)&t~O<2gh@o66T zqe(DgEcd-J+(-c%)_^|+&x`sEf#>->Oa$@#b#i5&&VQY+m{D=yt>VQfzPQvhUX0_} zY#zf8O~W-+=SZ=lSgPFpNG_>iQHT8u{Gi7VJbway7=>OGhG2P^gKXOL7nYd_-mWf^ z#f$f_`M?`!kiU`{(^{&>o`Dqg9u}|H*V|39ez{1NYjX4QW@*1+N^>b9@EwmVq%cev zJJ~mw+^~D&VuQFigRG)TGZXh*{*6;q=z=MGDKeRJQATi@azn^bBB&YtfOF!)NXS}M z+nE&FP+_!_!N-b;gC6ic&=S*WL;A3(GxnUofu!OZaMNREJ*6GZl!TAmRI)V~@f)pM zh6-7%E^c9+eE&4l4KD@DZCMm{x{sin1+2b&*7Wbc{%%dTHu7 zG!N2zl!NbilQ1M$%<*kvSr!~4oS%d32h(R$unq@0cmad&a-@LN2Pa)mx7Bb6zZ2+I zR!e+jFU|-Y>;l!Y+rtTi0Sd>!IX*YtMcaKiAlv|d#(#o4c=deq>UxNIN&{L^a<g0><)oaMIMjqkFQ@yXK+#~ g*)~InJ7!q?&b=GFz1zOGwnO&}TMHy`rcOx6KXdbBr2qf` diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0bfaa3b9d7..8947889cd7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4423,14 +4423,14 @@ RFC 6570.") (uri (string-append "mirror://cpan/authors/id/S/SZ/SZBALINT/WWW-Curl-" version".tar.gz")) - (patches (search-patches "perl-www-curl-remove-symbol.patch")) + (patches (search-patches "perl-www-curl-fix-struct-void.patch" + "perl-www-curl-remove-symbol.patch")) (sha256 (base32 "1fmp9aib1kaps9vhs4dwxn7b15kgnlz9f714bxvqsd1j1q8spzsj")))) (build-system perl-build-system) (arguments '(#:tests? #f ;XXX: tests require network access - #:phases (modify-phases %standard-phases (add-before 'configure 'set-search-path (lambda _