From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp0.migadu.com ([2001:41d0:303:e16b::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms13.migadu.com with LMTPS
	id kM4TLpffQmeU6wAAqHPOHw:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 24 Nov 2024 08:11:03 +0000
Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp0.migadu.com with LMTPS
	id kM4TLpffQmeU6wAAqHPOHw
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 24 Nov 2024 09:11:03 +0100
X-Envelope-To: larch@yhetil.org
Authentication-Results: aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=g28OT7es;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=VPZxhDAL;
	dmarc=pass (policy=none) header.from=gnu.org;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1732435863; a=rsa-sha256; cv=none;
	b=VoRo+JVQS//IYUIL/NqEg7XDA+qTsedl8Qe74+ePchJ+ejMywPw8RjVAFdEr3pN1e4k0DI
	OzfqNsgzFi+OQY1f9yleFK76CE29MkjUYYuVBhGS/gw9lu24XXKAcPBNUubBc84y9gzS18
	ldEIcXOIAcCBtLbyH4e6/hNv6BcfqIAr3KqFw1dWlALvNSk32DVxNcFOb0XhvN8nHROimi
	UQ7ogx3F+MVtmtLwDu6cWQrqNRu7QiuaxBglIFRusaVhro0X7Qg4/fcjISj8PCbNSLnPkp
	saFMU966/UzqXxUPlygpHbreHj2gI2vkda6r5rgC2ruKhCYEEF4flRdoZXZqYA==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=g28OT7es;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=VPZxhDAL;
	dmarc=pass (policy=none) header.from=gnu.org;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1732435863;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:mime-version:mime-version:
	 content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:resent-cc:
	 resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to:
	 references:references:list-id:list-help:list-unsubscribe:
	 list-subscribe:list-post:dkim-signature;
	bh=r2afZGbeLEV1GthGz9FwvavZU+BqDHFqDhIeAwA4brk=;
	b=TFM90reK/uWIjfXkTWIr3PjQnZe0RC8N2pCdDmvbHfP9GxfulYfvEpa86js9WO59VSECgP
	PtGjBqxnYxRWjbaQD6/FxI1DIaAy6R1ggjApXp7gQ3StvSz6F0bOKUNA5ghN2NIk578Kqi
	slECdnEiYxgZyQVvJZGgz4L5R50cryyQCbQNeVVqb/6TdfThkEla4zYmKuZl0aoPnRDkxs
	ka0704673O9bCgrMF9W1R145g7W/sunr2+1Anhe8es7kVuuHGG5f31fEmxHnCjOInDUNzw
	EXQl1sBVAiOjX9qVJaoBPgL5m/Oc8fp8mTIxVzExtfWok0DxnXIehQRZ7Ch9bA==
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by aspmx1.migadu.com (Postfix) with ESMTPS id 5624878B4F
	for <larch@yhetil.org>; Sun, 24 Nov 2024 09:11:03 +0100 (CET)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces@gnu.org>)
	id 1tF7Uv-0000Sc-Ao; Sun, 24 Nov 2024 02:57:40 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tF7Ug-0000OK-W5
 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:23 -0500
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tF7Ug-0002Oc-Mi
 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:22 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=MIME-Version:References:In-Reply-To:Date:From:To:Subject;
 bh=r2afZGbeLEV1GthGz9FwvavZU+BqDHFqDhIeAwA4brk=; 
 b=g28OT7esJ1j8srn5Q4fm197Izs01jfAw2smvSSjO2cz6av7Gldm/N9mNMzcAm8ZAr21rDfezNaMgEunEsp652n3txvFwDSZmTh+b4BERiukU+p28ztOlCHrzOAkQ35J/nwsQBaVSwZgd++vRS7BXCgwnFZQDKkOt9jrVJP/HEZyW55wPIntGgBpKbJxLMn5v2ardabzRAQu/kesRscYCS2cpIYZzeZjSIVBiARdE743CTuQZqQqKWyR4Uh6plNh/+oNbjKcf/APIevGsTgmiquUXYzsxgjelI58xiPpkfxrd4ABOi++sfGyEp1kCfFRDmvTPhTEz45j47AmUne4zKg==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tF7Ug-0004lM-DA
 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:22 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#74290] [PATCH v4 33/58] gnu: libpciaccess: Support the 64bit
 Hurd.
Resent-From: Janneke Nieuwenhuizen <janneke@gnu.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: guix-patches@gnu.org
Resent-Date: Sun, 24 Nov 2024 07:57:22 +0000
Resent-Message-ID: <handler.74290.B74290.173243503118074@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 74290
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 74290@debbugs.gnu.org
Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503118074
 (code B ref 74290); Sun, 24 Nov 2024 07:57:22 +0000
Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:11 +0000
Received: from localhost ([127.0.0.1]:60829 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tF7UU-0004hC-9J
 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:11 -0500
Received: from eggs.gnu.org ([209.51.188.92]:58236)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <janneke@gnu.org>) id 1tF7Tq-0004Zh-I9
 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:31 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <janneke@gnu.org>)
 id 1tF7Tl-0002Cs-7E; Sun, 24 Nov 2024 02:56:25 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
 From; bh=r2afZGbeLEV1GthGz9FwvavZU+BqDHFqDhIeAwA4brk=; b=VPZxhDALCW+hbL8KHFv7
 bDt7Uye3Ku8VeozpTwVVsiAIdPpzEBmrkYAwHqUv0rXhnAdBfgFVUvSnutnEj86Y8BtOFwzkGyd2f
 I0Fup1wjz5hyBL7wRA5QJVMYlrWy2ykgzniaSwUXmh+lrYjUdfDo98r76B0lx+8Kz3qgMlZICKmNl
 XQBymCrf7E8ROpnrkSnr30uYcaxtsH6yiMyjT1yp7bvECRkw7yy+Hp368zHqwyUWoiEsS5TXhxUd8
 7Ah7aSlSznyo4Mj5yrJ7V+OrNGhtpgZZN1+hV3V6Z2rRVviizcpnhuZOKhIRimfdgmhtNB6Ztw8px
 fZYBsCcIZgECeA==;
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 24 Nov 2024 08:54:56 +0100
Message-ID: <dceb8a5865922615377aa910390d84c5f8c52409.1732434271.git.janneke@gnu.org>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1732434270.git.janneke@gnu.org>
References: <cover.1732434270.git.janneke@gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
X-BeenThere: guix-patches@gnu.org
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org
Sender: guix-patches-bounces+larch=yhetil.org@gnu.org
X-Migadu-Flow: FLOW_IN
X-Migadu-Country: US
X-Migadu-Queue-Id: 5624878B4F
X-Migadu-Scanner: mx13.migadu.com
X-Migadu-Spam-Score: -7.47
X-Spam-Score: -7.47
X-TUID: jDbDLZoT5YZB

* gnu/packages/patches/libpciaccess-hurd64.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/xorg.scm (libpciaccess) [arguments]: Use g-expressions.  When
building for the 64bit Hurd, use it in new "apply-hurd64-patch" phase.

Change-Id: I8936377da726681b748cc010e1fbae3fb19dee05
---
 gnu/local.mk                                  |  1 +
 .../patches/libpciaccess-hurd64.patch         | 58 +++++++++++++++++++
 gnu/packages/xorg.scm                         | 23 +++++---
 3 files changed, 75 insertions(+), 7 deletions(-)
 create mode 100644 gnu/packages/patches/libpciaccess-hurd64.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index ceddce8f78..adcbb55847 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1711,6 +1711,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/libmpeg2-global-symbol-test.patch	\
   %D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch		\
   %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch	\
+  %D%/packages/patches/libpciaccess-hurd64.patch		\
   %D%/packages/patches/libphonenumber-reproducible-build.patch	\
   %D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch	\
   %D%/packages/patches/libquicktime-ffmpeg.patch 		\
diff --git a/gnu/packages/patches/libpciaccess-hurd64.patch b/gnu/packages/patches/libpciaccess-hurd64.patch
new file mode 100644
index 0000000000..f7e11059b1
--- /dev/null
+++ b/gnu/packages/patches/libpciaccess-hurd64.patch
@@ -0,0 +1,58 @@
+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;
+-    size_t size;
++    mach_msg_type_number_t size;
+     char *buf;
+ 
+     /* Many of the fields were filled in during initial device enumeration.
+@@ -323,7 +323,7 @@ pciclient_cfg_read(mach_port_t device_port, int reg, char *buf,
+                    size_t * nbytes)
+ {
+     int err;
+-    size_t nread;
++    mach_msg_type_number_t nread;
+     char *data;
+ 
+     data = buf;
+@@ -473,7 +473,7 @@ simple_readdir(mach_port_t port, uint32_t *first_entry)
+ {
+     char *data;
+     int nentries = 0;
+-    vm_size_t size;
++    mach_msg_type_number_t size;
+ 
+     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
+
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 554dc21ba7..e78264ec6f 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -36,7 +36,7 @@
 ;;; Copyright © 2021 Lu Hui <luhux76@gmail.com>
 ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
 ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
-;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2023, 2024 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2023, 2024 Kaelyn Takata <kaelyn.alexi@protonmail.com>
 ;;;
@@ -1169,16 +1169,17 @@ (define-public libpciaccess
             "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11"))))
     (build-system gnu-build-system)
     (arguments
-     '(;; Make sure libpciaccess can read compressed 'pci.ids' files as
-       ;; provided by pciutils.
-       #:configure-flags
-       (list "--with-zlib"
+     (list
+      ;; Make sure libpciaccess can read compressed 'pci.ids' files as
+      ;; provided by pciutils.
+      #:configure-flags
+      #~(list "--with-zlib"
              (string-append "--with-pciids-path="
                             (assoc-ref %build-inputs "pciutils")
                             "/share/hwdata"))
 
        #:phases
-       (modify-phases %standard-phases
+       #~(modify-phases %standard-phases
          (add-after 'install 'add-L-zlib
            (lambda* (#:key inputs outputs #:allow-other-keys)
              ;; Provide '-LZLIB/lib' next to '-lz' in the .la file.
@@ -1187,7 +1188,15 @@ (define-public libpciaccess
                (substitute* (string-append out "/lib/libpciaccess.la")
                  (("-lz")
                   (string-append "-L" zlib "/lib -lz")))
-               #t))))))
+               #t)))
+         #$@(if (target-hurd64?)
+                #~((add-after 'unpack 'apply-hurd64-patch
+                     (lambda _
+                       (let ((patch-file
+                              #$(local-file
+                                 (search-patch "libpciaccess-hurd64.patch"))))
+                         (invoke "patch" "--force" "-p1" "-i" patch-file)))))
+                #~()))))
     (inputs
      (list zlib pciutils))                   ;for 'pci.ids.gz'
     (native-inputs
-- 
2.46.0