From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Mon, 20 May 2019 04:52:33 +0200
Subject: [PATCH] gnu: xf86-video-voodoo: Don't use PCITAG.

Copied verbatim from upstream repository[0].

[0]: https://cgit.freedesktop.org/xorg/driver/-xf86-video-voodoo/patch/?id=9172ae566a0e85313fc80ab62b4455393eefe593

From 9172ae566a0e85313fc80ab62b4455393eefe593 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 22 Sep 2014 10:56:02 +1000
Subject: don't use PCITAG in struct anymore

---
 src/voodoo.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/voodoo.h b/src/voodoo.h
index bfed497..c3eb64e 100644
--- a/src/voodoo.h
+++ b/src/voodoo.h
@@ -23,7 +23,9 @@ typedef struct {
   
   Bool		      Voodoo2;		/* Set if Voodoo2 */
   pciVideoPtr	      PciInfo;		/* PCI data */
+#ifndef XSERVER_LIBPCIACCESS
   PCITAG	      PciTag;
+#endif
   CARD32	      PhysBase;
   
   CARD32	      Width;		/* Current width */
-- 
cgit v1.0

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=e5619147d4ec12dfdc3eb15d6a1cb563ac0b7712'>refs</a><a class='active' href='/guix/log/build-aux/test-env.in'>log</a><a href='/guix/tree/build-aux/test-env.in?id=e5619147d4ec12dfdc3eb15d6a1cb563ac0b7712'>tree</a><a href='/guix/commit/build-aux/test-env.in?id=e5619147d4ec12dfdc3eb15d6a1cb563ac0b7712'>commit</a><a href='/guix/diff/build-aux/test-env.in?id=e5619147d4ec12dfdc3eb15d6a1cb563ac0b7712'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/build-aux/test-env.in'>
<input type='hidden' name='id' value='e5619147d4ec12dfdc3eb15d6a1cb563ac0b7712'/><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=e5619147d4ec12dfdc3eb15d6a1cb563ac0b7712'>root</a>/<a href='/guix/log/build-aux?id=e5619147d4ec12dfdc3eb15d6a1cb563ac0b7712'>build-aux</a>/<a href='/guix/log/build-aux/test-env.in?id=e5619147d4ec12dfdc3eb15d6a1cb563ac0b7712'>test-env.in</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/build-aux/test-env.in?id=e5619147d4ec12dfdc3eb15d6a1cb563ac0b7712&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-12-22 10:53:19 +0100'>2021-12-22</span></td><td><a href='/guix/commit/build-aux/test-env.in?id=9ebc9ca070a21ba0aeb3f61202a8071bb250ccc8'>tests: Move keys into ./tests/keys/ and add a third ed25519 key.</a><span class='msg-avail'>...<span class='msg-tooltip'>The third key will be used in an upcoming commit.

Rename public keys to .pub.

* guix/tests/gnupg.scm (%ed25519-3-public-key-file): New variable.
(%ed25519-3-secret-key-file): New variable.
(%ed25519-2-public-key-file): Renamed from %ed25519bis-public-key-file.
(%ed25519-2-secret-key-file): Renamed from %ed25519bis-secret-key-file.
* tests/keys/ed25519-3.key: New file.
* tests/keys/ed25519-3.sec: New file.

Signed-off-by: Mathieu Othacehe &lt;othacehe@gnu.org&gt;
</span></span></td><td>Attila Lendvai</td></tr>
<tr><td><span title='2021-04-20 12:13:16 +0200'>2021-04-20</span></td><td><a href='/guix/commit/build-aux/test-env.in?id=d95168321f4a9bf6857b598da0a183b45a868d54'>import: Remove Nix importer.</a><span class='msg-avail'>...<span class='msg-tooltip'>This importer has suffered from bitrot and no longer works with current
Nix and Nixpkgs.  See &lt;https://bugs.gnu.org/32339&gt; and
&lt;https://bugs.gnu.org/36255&gt;.

* guix/import/snix.scm, guix/scripts/import/nix.scm,
tests/snix.scm: Remove.
* Makefile.am (MODULES, SCM_TESTS): Remove them.
* guix/scripts/import.scm (importers): Remove "nix".
* build-aux/test-env.in: Remove NIXPKGS variable.
* configure.ac: Remove '--with-nixpkgs' option.
* doc/guix.texi (Invoking guix import): Remove bit about "guix import
nix".
* etc/completion/fish/guix.fish: Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>