01/11: squash! gnu: libpciaccess: Support the 64bit Hurd.

[guix-commits]

janneke pushed a commit to branch hurd-team
in repository guix.

commit 10d4552de6c4bc5abf92037cbd9deb7406a5adc1
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Thu Nov 7 17:47:16 2024 +0100

    squash! gnu: libpciaccess: Support the 64bit Hurd.
    
    solid_black on #hurd found the upstream patch; better to take that.
    
    Change-Id: I6f492d0dd71c1d9ce23e6758ce7ea6b7094bd4f0
---
 gnu/packages/patches/libpciaccess-hurd64.patch | 39 ++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/patches/libpciaccess-hurd64.patch 
b/gnu/packages/patches/libpciaccess-hurd64.patch
index 97707398c0..f7e11059b1 100644
--- a/gnu/packages/patches/libpciaccess-hurd64.patch
+++ b/gnu/packages/patches/libpciaccess-hurd64.patch
@@ -1,6 +1,31 @@
---- libpciaccess-0.17/src/hurd_pci.c.orig      2024-11-07 15:37:13.301597379 
+0100
-+++ libpciaccess-0.17/src/hurd_pci.c   2024-11-07 15:36:59.453360868 +0100
-@@ -82,7 +82,7 @@
+Upstream-status: Taken from upstream:
+
+<https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/commit/6cd5a4afbb70868c7746de8d50dea59e02e9acf2>.
+
+From 6cd5a4afbb70868c7746de8d50dea59e02e9acf2 Mon Sep 17 00:00:00 2001
+From: Flavio Cruz <flaviocruz@gmail.com>
+Date: Wed, 28 Jun 2023 01:02:34 -0400
+Subject: [PATCH] Fix compilation warnings when building against hurd-amd64.
+Content-Transfer-Encoding: 8bit
+Content-Type: text/plain; charset=UTF-8
+
+Passes mach_msg_type_number_t instead of size_t which have different
+sizes. Example warning:
+
+/hurd_pci.c:101:53: warning: passing argument 3 of 'pci_get_dev_regions' from 
incompatible pointer type [-Wincompatible-pointer-types]
+  101 |     err = pci_get_dev_regions(d->device_port, &buf, &size);
+      |                                                     ^~~~~
+      |                                                     |
+      |                                                     size_t * {aka long 
unsigned int *}
+---
+ src/hurd_pci.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/hurd_pci.c b/src/hurd_pci.c
+index 8653e1b..9ac3813 100644
+--- a/src/hurd_pci.c
++++ b/src/hurd_pci.c
+@@ -82,7 +82,7 @@ pci_device_hurd_probe(struct pci_device *dev)
      struct pci_bar regions[6];
      struct pci_xrom_bar rom;
      struct pci_device_private *d;
@@ -9,7 +34,7 @@
      char *buf;
  
      /* Many of the fields were filled in during initial device enumeration.
-@@ -323,7 +323,7 @@
+@@ -323,7 +323,7 @@ pciclient_cfg_read(mach_port_t device_port, int reg, char 
*buf,
                     size_t * nbytes)
  {
      int err;
@@ -18,7 +43,7 @@
      char *data;
  
      data = buf;
-@@ -473,7 +473,7 @@
+@@ -473,7 +473,7 @@ simple_readdir(mach_port_t port, uint32_t *first_entry)
  {
      char *data;
      int nentries = 0;
@@ -27,3 +52,7 @@
  
      dir_readdir (port, &data, &size, *first_entry, 1, 0, &nentries);
  
+-- 
+Janneke Nieuwenhuizen <janneke@gnu.org>  | GNU LilyPond https://LilyPond.org
+Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com
+