From: Tobias Geerinckx-Rice <me@tobias.gr>
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;
 
'>
<option value='koszko' selected='selected'>koszko</option>
<option value='koszko-scripts'>koszko-scripts</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=402a3a4e80d49dc5d9e3e8f79aa5858783ce9e33'>refs</a><a class='active' href='/guix/log/gnu/packages/genimage.scm'>log</a><a href='/guix/tree/gnu/packages/genimage.scm?id=402a3a4e80d49dc5d9e3e8f79aa5858783ce9e33'>tree</a><a href='/guix/commit/gnu/packages/genimage.scm?id=402a3a4e80d49dc5d9e3e8f79aa5858783ce9e33'>commit</a><a href='/guix/diff/gnu/packages/genimage.scm?id=402a3a4e80d49dc5d9e3e8f79aa5858783ce9e33'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/genimage.scm'>
<input type='hidden' name='id' value='402a3a4e80d49dc5d9e3e8f79aa5858783ce9e33'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=402a3a4e80d49dc5d9e3e8f79aa5858783ce9e33'>root</a>/<a href='/guix/log/gnu?id=402a3a4e80d49dc5d9e3e8f79aa5858783ce9e33'>gnu</a>/<a href='/guix/log/gnu/packages?id=402a3a4e80d49dc5d9e3e8f79aa5858783ce9e33'>packages</a>/<a href='/guix/log/gnu/packages/genimage.scm?id=402a3a4e80d49dc5d9e3e8f79aa5858783ce9e33'>genimage.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/genimage.scm?id=402a3a4e80d49dc5d9e3e8f79aa5858783ce9e33&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-09-28 00:20:18 +0200'>2024-09-28</span></td><td><a href='/guix/commit/gnu/packages/genimage.scm?id=b21118a2df0f851832068dd5dc1e0b0706e2e38c'>gnu: genimage: Update to version 18.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/genimage.scm (genimage): Update from 15 to 18.
[arguments]: Disable some tests.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Herman Rimm</td></tr>
<tr><td><span title='2024-08-31 10:42:19 +0200'>2024-08-31</span></td><td><a href='/guix/commit/gnu/packages/genimage.scm?id=5a20752ae55e064d281061e0d899f83bb015d6c1'>gnu: genimage: Import the correct set of modules.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/genimage.scm (genimage) [arguments]
&lt;modules&gt;: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I65a2e2b371ae9b6f822ba54d09ba6741e403432b
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2024-08-31 10:42:16 +0200'>2024-08-31</span></td><td><a href='/guix/commit/gnu/packages/genimage.scm?id=f59df1aa3c104aabff3291f6b8b155fb01aebc06'>build-systems: gnu: Export %default-gnu-imported-modules and %default-gnu-mod...</a><span class='msg-avail'>...<span class='msg-tooltip'>Until now users would have to cargo cult or inspect the private
%default-modules variable of (guix build-systems gnu) to discover which
modules to include when extending the used modules via the #:modules argument.

The renaming was automated via the command:

  $ git grep -l %gnu-build-system-modules
    | xargs sed 's/%gnu-build-system-modules/%default-gnu-imported-modules/' -i

* guix/build-system/gnu.scm (%gnu-build-system-modules): Rename to...
(%default-gnu-imported-modules): ... this.
(%default-modules): Rename to...
(%default-gnu-modules): ... this.  Export.
(dist-package, gnu-build, gnu-cross-build): Adjust accordingly.

Change-Id: Idef307fff13cb76f3182d782b26e1cd3a5c757ee
</span></span></td><td>Maxim Cournoyer</td></tr>