From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id YNdqHED/b2dYSAAAe85BDQ:P1 (envelope-from ) for ; Sat, 28 Dec 2024 13:38:08 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id YNdqHED/b2dYSAAAe85BDQ (envelope-from ) for ; Sat, 28 Dec 2024 14:38:08 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=AmebeVwr; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1735393088; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=X0eGHAIVhaqVxQ1IMtbplgiN1X72e3XOsF6tXvvSsWs=; b=KR3k2hy+TWLW4zu46W/tkbGjoaDv6qX3EKZT3Zkvrp20z7XzJdKe71upjmsZG3SvnUe43s uJzujGuHU31N7q9HH3wqah8bCYstcYIjeSeWfn1hElbgZHxYYuN4d4ELYvUlnCCYTyHZ/X fyJLQNvRsmlWincx7osRbQKR9gbKh+Id4e1UaZ4gzNuLgE9Wq+Cie9twBB+ZOyiCv4tR+A 53pHwwKv4YCrjGay91XZiXIsoAXAv2tIqEuIqbWlFtL2Z882XdZUygJdWy8DWq2oHX5qc8 NhJb20xBAkksKbO9PNny3p0oUPHvhJzarTVAF6O2TC6FLC7QgpdyoAm2XUEozA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=AmebeVwr; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1735393088; a=rsa-sha256; cv=none; b=RXvP67CR9LulTyd+Q2FGMcCw6JFsyZROA84TuN4BmchdBu9Wuu2hLuSycVIW96OhC8S2kX UFWZKiPV8uMEeGY8rsT+Xa88XTimp5kzo3sNO2TOLOvsMzInD2NMwBaWZVH0eRuvOOC+eB qivsihV/ekOLKeZyOjZlc+IVZWiY4EFyujq68JYoFPNx8D+mfwy4vxrFu+NU75KJJDjGXq F1FrA3FsXzCjHTAX4/T05ZodcRQlvsBsrFX8gik0lVWvqsbcgokyVo7M5e63PeUrw5St/J arW8CkNatOeYbGlS+xBXmRY4C6UNGVPHDEsjHK3u74nRSYoLQPKfF0TJv/I8yA== 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 F3C21885B0 for ; Sat, 28 Dec 2024 14:38:07 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tRUmp-0002L9-4a; Sat, 28 Dec 2024 06:15:15 -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 ) id 1tRUmn-0002KD-PG for guix-patches@gnu.org; Sat, 28 Dec 2024 06:15:13 -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 ) id 1tRUmn-0008Uj-FG; Sat, 28 Dec 2024 06:15:13 -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=X0eGHAIVhaqVxQ1IMtbplgiN1X72e3XOsF6tXvvSsWs=; b=AmebeVwrVyrjYJX3MrzYdiUHFCrO//yOCqpA2BtdRr1lkioiVFC48FG8kbYAQTAS7pJuPCamhDpOyLD52RTd5DFzGQaPfmHJmN8CDyIbsupfuSW330ROEklR9jws/ILDHSYcAYj1whw4HSzI0xbbh3fztRTwforeZJMukebvbKnptqR/vQ2lL9UEHgFFum2JMl5YWs77Sf3cTI4mV6S5AAFnAYKoqE+FAVOBKoYN0CMRLqDcs8OrOF7LweQ9oPBA9mniPh2NApq+XHMtAOdhlw/qLMjVFZ/famak+puzGfeofonzrEqfZaMk8YjWacG6KskgC3RXF7yb/Ewa2u8oOg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tRUmn-0006qu-7X; Sat, 28 Dec 2024 06:15:13 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75160] [PATCH xorg-updates 018/109] gnu: libpciaccess: Update to 0.18.1. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: janneke@gnu.org, guix-patches@gnu.org Resent-Date: Sat, 28 Dec 2024 11:15:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75160 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75160@debbugs.gnu.org Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= , Janneke Nieuwenhuizen X-Debbugs-Original-Xcc: Janneke Nieuwenhuizen Received: via spool by 75160-submit@debbugs.gnu.org id=B75160.173538450326075 (code B ref 75160); Sat, 28 Dec 2024 11:15:13 +0000 Received: (at 75160) by debbugs.gnu.org; 28 Dec 2024 11:15:03 +0000 Received: from localhost ([127.0.0.1]:49059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRUmb-0006m8-Hl for submit@debbugs.gnu.org; Sat, 28 Dec 2024 06:15:02 -0500 Received: from mail.envs.net ([5.199.136.28]:58140) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRUm2-0006iV-Sj for 75160@debbugs.gnu.org; Sat, 28 Dec 2024 06:14:28 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 7BFF738A3E62; Sat, 28 Dec 2024 11:14:26 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id iy-gsMm8H_-c; Sat, 28 Dec 2024 11:14:23 +0000 (UTC) Received: from localhost (unknown [112.44.73.41]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Sat, 28 Dec 2024 11:14:18 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 396a92fa; Sat, 28 Dec 2024 11:16:58 +0000 (UTC) Date: Sat, 28 Dec 2024 19:14:49 +0800 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: <2b8157bebabbffec03739fcad2c79bb7314b7173.1735384288.git.iyzsong@member.fsf.org> References: <2b8157bebabbffec03739fcad2c79bb7314b7173.1735384288.git.iyzsong@member.fsf.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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches From: iyzsong--- via Guix-patches via 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-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -6.71 X-Spam-Score: -6.71 X-Migadu-Queue-Id: F3C21885B0 X-TUID: fx3W0irGmsTU From: 宋文武 * gnu/packages/xorg.scm (libpciaccess): Update to 0.18.1. Switch to meson-build-system. (libpciaccess-0.17): Remove package. * gnu/packages/patches/libpciaccess-hurd64.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/hurd.scm (hurd, netdde, rumpkernel): Use libpciaccess. Change-Id: I12c2ca80f7e9e404d80303b326bcfd36a8839723 --- gnu/local.mk | 1 - gnu/packages/hurd.scm | 8 +-- .../patches/libpciaccess-hurd64.patch | 58 ------------------- gnu/packages/xorg.scm | 58 ++++--------------- 4 files changed, 16 insertions(+), 109 deletions(-) delete mode 100644 gnu/packages/patches/libpciaccess-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index 84160f407a..90a4896fa1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1731,7 +1731,6 @@ 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/hurd.scm b/gnu/packages/hurd.scm index 4342686517..7a7f621e40 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -48,7 +48,7 @@ (define-module (gnu packages hurd) #:use-module (gnu packages bash) #:use-module (gnu packages texinfo) #:use-module (gnu packages onc-rpc) - #:use-module (gnu packages xorg) ;libpciaccess-0.17 + #:use-module (gnu packages xorg) ;libpciaccess #:use-module (guix git-download) #:use-module (ice-9 match)) @@ -572,7 +572,7 @@ (define-public hurd `(("libgcrypt" ,libgcrypt) ;for /hurd/random ("libdaemon" ,libdaemon) ;for /bin/console --daemonize ("unifont" ,unifont) - ("libpciaccess" ,libpciaccess-0.17) ;need libpciaccess > 0.16 + ("libpciaccess" ,libpciaccess) ;; For NFS support ("libtirpc" ,libtirpc/hurd) @@ -700,7 +700,7 @@ (define-public netdde (install-file "netdde" hurd) (install-file "netdde.static" hurd))))))) (inputs - (list hurd libpciaccess-0.17 zlib `(,zlib "static"))) + (list hurd libpciaccess zlib `(,zlib "static"))) (native-inputs `(("coreutils" ,coreutils) ("gawk" ,gawk) @@ -912,7 +912,7 @@ (define-public rumpkernel (append (find-files "buildrump.sh/src" "librump.*[.](a|so.*)") (find-files "obj" "librump.*[.](a|so.*)"))))))))) (inputs - (list gnumach-headers libpciaccess-0.17)) + (list gnumach-headers libpciaccess)) (native-inputs (list autoconf automake diff --git a/gnu/packages/patches/libpciaccess-hurd64.patch b/gnu/packages/patches/libpciaccess-hurd64.patch deleted file mode 100644 index f7e11059b1..0000000000 --- a/gnu/packages/patches/libpciaccess-hurd64.patch +++ /dev/null @@ -1,58 +0,0 @@ -Upstream-status: Taken from upstream: - -. - -From 6cd5a4afbb70868c7746de8d50dea59e02e9acf2 Mon Sep 17 00:00:00 2001 -From: Flavio Cruz -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 | 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 9f067acf87..2b403ec9f2 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1172,72 +1172,38 @@ (define-public libfs (define-public libpciaccess (package (name "libpciaccess") - (version "0.16") + (version "0.18.1") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/lib/libpciaccess-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11")))) - (build-system gnu-build-system) + "0xpslrjnfrc1a7y8f8qwnd3wq24ndpj2q77ds12mbnwand239x2a")))) + (build-system meson-build-system) (arguments (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 - (add-after 'install 'add-L-zlib - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Provide '-LZLIB/lib' next to '-lz' in the .la file. - (let ((zlib (assoc-ref inputs "zlib")) - (out (assoc-ref outputs "out"))) - (substitute* (string-append out "/lib/libpciaccess.la") - (("-lz") - (string-append "-L" zlib "/lib -lz"))) - #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))))) - #~())))) + #~(list "-Dzlib=enabled" + (string-append "-Dpci-ids=" + (assoc-ref %build-inputs "pciutils") + "/share/hwdata")))) (inputs - (list zlib pciutils)) ;for 'pci.ids.gz' + (list pciutils)) ;for 'pci.ids.gz' + (propagated-inputs + (list zlib)) ;in Requires.private of pciaccess.pc (native-inputs - (list pkg-config)) + (list pkg-config)) (home-page "https://www.x.org/wiki/") (synopsis "Xorg PCI access library") (description "Xorg Generic PCI access library.") (license license:x11))) -(define-public libpciaccess-0.17 - (package - (inherit libpciaccess) - (name "libpciaccess") - (version "0.17") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/lib/libpciaccess-" - version - ".tar.xz")) - (sha256 - (base32 - "0wsvv5d05maqbidvnavka7n0fnql55m4jix5wwlk14blr6ikna3l")))))) - (define-public libpthread-stubs (package (name "libpthread-stubs") -- 2.46.0