From unknown Mon Aug 11 21:14:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#72261] [PATCH] gnu: ddcci-driver-linux: Update to 0.4.5. Resent-From: ashish.is@lostca.se Original-Sender: "Debbugs-submit" Resent-CC: leo@famulari.name, w@wmeyer.eu, guix-patches@gnu.org Resent-Date: Tue, 23 Jul 2024 19:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72261 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72261@debbugs.gnu.org Cc: Ashish SHUKLA , Leo Famulari , Wilko Meyer X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Leo Famulari , Wilko Meyer Received: via spool by submit@debbugs.gnu.org id=B.172176251619155 (code B ref -1); Tue, 23 Jul 2024 19:22:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Jul 2024 19:21:56 +0000 Received: from localhost ([127.0.0.1]:60764 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sWL59-0004yt-Ii for submit@debbugs.gnu.org; Tue, 23 Jul 2024 15:21:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:40632) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sWL55-0004yj-QN for submit@debbugs.gnu.org; Tue, 23 Jul 2024 15:21:54 -0400 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 1sWL4y-0006eJ-FN for guix-patches@gnu.org; Tue, 23 Jul 2024 15:21:45 -0400 Received: from anamika.lostca.se ([65.21.75.227]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sWL4w-0005uV-Bj for guix-patches@gnu.org; Tue, 23 Jul 2024 15:21:44 -0400 Received: from sofia.fritz.box (unknown [IPv6:2a10:3781:35df:1:65ac:c2a7:5ed1:d961]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: abbe) by anamika.lostca.se (Postfix) with ESMTPSA id 6F2901C8BA; Tue, 23 Jul 2024 19:21:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1721762499; h=from:from: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; bh=gJj2PxhEa1Uat9ew72vR3zOkw0GeHrs3YR5ooyRHhm0=; b=nLZvb+4fzraC16wWJ6nP4oYZZkqs3WexBiVxiMA/mNhzV5BEWdEZdVwvKlGH7JRvagfDYP rruEL+bzPyQq6AgqbkM7BwzlHDaim/EpezE1YtftXnVWqGZcipcz95cYNogyHytJb4A59J GudpZq+UDPRhdT17wamPrnWaLDWmuAw= From: ashish.is@lostca.se Date: Tue, 23 Jul 2024 21:21:27 +0200 Message-ID: <48e93a7b591ae8b168e33979e76f7ae54fccbded.1721762487.git.ashish.is@lostca.se> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=65.21.75.227; envelope-from=ashish.is@lostca.se; helo=anamika.lostca.se X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) From: Ashish SHUKLA * gnu/packages/linux.scm (ddcci-driver-linux): Update to 0.4.5. [source] remove already upstream patch. * gnu/packages/patches/ddcci-driver-linux-6.8.patch: Remove it. * gnu/local.mk: Unregister it. Change-Id: I1d4920ec84ea2a67554560181e99e9e2d535af2a --- gnu/local.mk | 2 +- gnu/packages/linux.scm | 6 ++-- .../ddcci-driver-linux-linux-6.8.patch | 36 ------------------- 3 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 gnu/packages/patches/ddcci-driver-linux-linux-6.8.patch diff --git a/gnu/local.mk b/gnu/local.mk index ef1e82eb04..982e13ad50 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -65,6 +65,7 @@ # Copyright © 2023 Herman Rimm # Copyright © 2023 Troy Figiel # Copyright © 2024 David Elsing +# Copyright © 2024 Ashish SHUKLA # # This file is part of GNU Guix. # @@ -1111,7 +1112,6 @@ dist_patch_DATA = \ %D%/packages/patches/dbus-c++-gcc-compat.patch \ %D%/packages/patches/dbus-c++-threading-mutex.patch \ %D%/packages/patches/dbxfs-remove-sentry-sdk.patch \ - %D%/packages/patches/ddcci-driver-linux-linux-6.8.patch \ %D%/packages/patches/debops-constants-for-external-program-names.patch \ %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \ %D%/packages/patches/dee-vapi.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4bd5f9c902..0eeac4b094 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -81,6 +81,7 @@ ;;; Copyright © 2024 Gabriel Wicki ;;; Copyright © 2024 Sharlatan Hellseher ;;; Copyright © 2024 Arun Isaac +;;; Copyright © 2024 Ashish SHUKLA ;;; ;;; This file is part of GNU Guix. ;;; @@ -1747,7 +1748,7 @@ (define-public bbswitch-module (define-public ddcci-driver-linux (package (name "ddcci-driver-linux") - (version "0.4.4") + (version "0.4.5") (source (origin (method git-fetch) @@ -1757,8 +1758,7 @@ (define-public ddcci-driver-linux (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "19vi7dk4jv5wm18cznz4lj2fb1c7m7j3ig62x4a6qy9djxf9z472")) - (patches (search-patches "ddcci-driver-linux-linux-6.8.patch")))) + (base32 "0j2bgzadrbcyf3k4zplv7p5yqb9pw2ca6wzkqjhhidaah2722vlf")))) (build-system linux-module-build-system) (arguments (list #:tests? #f ; no tests diff --git a/gnu/packages/patches/ddcci-driver-linux-linux-6.8.patch b/gnu/packages/patches/ddcci-driver-linux-linux-6.8.patch deleted file mode 100644 index 89ded73c14..0000000000 --- a/gnu/packages/patches/ddcci-driver-linux-linux-6.8.patch +++ /dev/null @@ -1,36 +0,0 @@ -Retrieved from: https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/-/commit/3eb20df68a545d07b8501f13fa9d20e9c6f577ed.patch - -From 7f851f5fb8fbcd7b3a93aaedff90b27124e17a7e Mon Sep 17 00:00:00 2001 -From: Bruno Inec -Date: Wed, 20 Mar 2024 10:36:56 +0100 -Subject: [PATCH] Compatibility with Linux 6.8 - ---- - ddcci/ddcci.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ddcci/ddcci.c b/ddcci/ddcci.c -index 87b0818..6073c75 100644 ---- a/ddcci/ddcci.c -+++ b/ddcci/ddcci.c -@@ -1666,7 +1666,7 @@ static int ddcci_detect(struct i2c_client *client, struct i2c_board_info *info) - pr_debug("detected %d:%02x\n", client->adapter->nr, outer_addr); - - /* set device type */ -- strlcpy(info->type, (outer_addr == DDCCI_DEFAULT_DEVICE_ADDR) ? "ddcci" : "ddcci-dependent", I2C_NAME_SIZE); -+ strscpy(info->type, (outer_addr == DDCCI_DEFAULT_DEVICE_ADDR) ? "ddcci" : "ddcci-dependent", I2C_NAME_SIZE); - - return 0; - } -@@ -1824,7 +1824,7 @@ static struct i2c_driver ddcci_driver = { - #else - .remove = ddcci_remove, - #endif -- .class = I2C_CLASS_DDC, -+ .class = I2C_CLASS_SPD, - .detect = ddcci_detect, - .address_list = I2C_ADDRS( - DDCCI_DEFAULT_DEVICE_ADDR>>1 --- -GitLab - base-commit: d007b64356764f49677c78d82643f1125b5353b7 -- 2.45.2 From unknown Mon Aug 11 21:14:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#72261] [PATCH] gnu: ddcci-driver-linux: Update to 0.4.5. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Jul 2024 06:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72261 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72261@debbugs.gnu.org Cc: 72261-done@debbugs.gnu.org, Wilko Meyer , ashish.is@lostca.se, Leo Famulari X-Debbugs-Original-To: "ashish.is--- via Guix-patches" via Received: via spool by submit@debbugs.gnu.org id=B.172232212515045 (code B ref -1); Tue, 30 Jul 2024 06:49:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Jul 2024 06:48:45 +0000 Received: from localhost ([127.0.0.1]:46832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sYgf6-0003uW-RN for submit@debbugs.gnu.org; Tue, 30 Jul 2024 02:48:45 -0400 Received: from lists.gnu.org ([209.51.188.17]:52202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sYgf3-0003uF-G8 for submit@debbugs.gnu.org; Tue, 30 Jul 2024 02:48:42 -0400 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 1sYgep-0005qa-FC for guix-patches@gnu.org; Tue, 30 Jul 2024 02:48:27 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1sYgem-0004bC-QM for guix-patches@gnu.org; Tue, 30 Jul 2024 02:48:27 -0400 Received: from m (unknown [107.174.64.25]) by APP-03 (Coremail) with SMTP id rQCowAB3ngGqjKhmPQYMAg--.11137S2; Tue, 30 Jul 2024 14:48:14 +0800 (CST) From: Zheng Junjie In-Reply-To: <48e93a7b591ae8b168e33979e76f7ae54fccbded.1721762487.git.ashish.is@lostca.se> (ashish is's message of "Tue, 23 Jul 2024 21:21:27 +0200") References: <48e93a7b591ae8b168e33979e76f7ae54fccbded.1721762487.git.ashish.is@lostca.se> Date: Tue, 30 Jul 2024 14:48:08 +0800 Message-ID: <874j87z87r.fsf@iscas.ac.cn> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: rQCowAB3ngGqjKhmPQYMAg--.11137S2 X-Coremail-Antispam: 1UD129KBjvJXoWxGrWUuF13uryrAryfuF1xXwb_yoWrtF1kpF W3ua4avw4fKr4rtrs3GF1akw1rZ3WUWFW0krnrWwnYkrW7Zr4Iqa97Gr4rAFn8Wrn7uw4x AF18KF9rCFWUJFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBjb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_JFI_Gr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwV C2z280aVCY1x0267AKxVW8Jr0_Cr1UM2vj62AExVA0xI801c8C04v26x02cVCv0xWle2I2 62IYc4CY6c8Ij28IcVAaY2xG8wASzI0EjI02j7AqF2xKxwAqx4xG64xvF2IEw4CE5I8CrV C2j2WlYx0E2Ix0cI8IcVAFwI0_Jrv_JF1lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE 7xkEbVWUJVW8JwACjcxG0xvEwIxGrwCY1x0262kKe7AKxVWUAVWUtwCF04k20xvY0x0EwI xGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480 Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0I7 IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k2 6cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxV AFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07ji-B_UUUUU= X-Originating-IP: [107.174.64.25] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.81; envelope-from=zhengjunjie@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable "ashish.is--- via Guix-patches" via writes: > From: Ashish SHUKLA > > * gnu/packages/linux.scm (ddcci-driver-linux): Update to 0.4.5. > [source] remove already upstream patch. No indentation required, capitalize the first letter. > > * gnu/packages/patches/ddcci-driver-linux-6.8.patch: Remove it. > * gnu/local.mk: Unregister it. > > Change-Id: I1d4920ec84ea2a67554560181e99e9e2d535af2a > --- > gnu/local.mk | 2 +- > gnu/packages/linux.scm | 6 ++-- > .../ddcci-driver-linux-linux-6.8.patch | 36 ------------------- > 3 files changed, 4 insertions(+), 40 deletions(-) > delete mode 100644 gnu/packages/patches/ddcci-driver-linux-linux-6.8.pat= ch > > diff --git a/gnu/local.mk b/gnu/local.mk > index ef1e82eb04..982e13ad50 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -65,6 +65,7 @@ > # Copyright =C2=A9 2023 Herman Rimm > # Copyright =C2=A9 2023 Troy Figiel > # Copyright =C2=A9 2024 David Elsing > +# Copyright =C2=A9 2024 Ashish SHUKLA > # > # This file is part of GNU Guix. > # > @@ -1111,7 +1112,6 @@ dist_patch_DATA =3D \ > %D%/packages/patches/dbus-c++-gcc-compat.patch \ > %D%/packages/patches/dbus-c++-threading-mutex.patch \ > %D%/packages/patches/dbxfs-remove-sentry-sdk.patch \ > - %D%/packages/patches/ddcci-driver-linux-linux-6.8.patch \ > %D%/packages/patches/debops-constants-for-external-program-names.patch= \ > %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \ > %D%/packages/patches/dee-vapi.patch \ > diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm > index 4bd5f9c902..0eeac4b094 100644 > --- a/gnu/packages/linux.scm > +++ b/gnu/packages/linux.scm > @@ -81,6 +81,7 @@ > ;;; Copyright =C2=A9 2024 Gabriel Wicki > ;;; Copyright =C2=A9 2024 Sharlatan Hellseher > ;;; Copyright =C2=A9 2024 Arun Isaac > +;;; Copyright =C2=A9 2024 Ashish SHUKLA > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -1747,7 +1748,7 @@ (define-public bbswitch-module > (define-public ddcci-driver-linux > (package > (name "ddcci-driver-linux") > - (version "0.4.4") > + (version "0.4.5") > (source > (origin > (method git-fetch) > @@ -1757,8 +1758,7 @@ (define-public ddcci-driver-linux > (commit (string-append "v" version)))) > (file-name (git-file-name name version)) > (sha256 > - (base32 "19vi7dk4jv5wm18cznz4lj2fb1c7m7j3ig62x4a6qy9djxf9z472")) > - (patches (search-patches "ddcci-driver-linux-linux-6.8.patch")))) > + (base32 "0j2bgzadrbcyf3k4zplv7p5yqb9pw2ca6wzkqjhhidaah2722vlf"))= )) > (build-system linux-module-build-system) > (arguments > (list #:tests? #f ; no tests > diff --git a/gnu/packages/patches/ddcci-driver-linux-linux-6.8.patch b/gn= u/packages/patches/ddcci-driver-linux-linux-6.8.patch > deleted file mode 100644 > index 89ded73c14..0000000000 > --- a/gnu/packages/patches/ddcci-driver-linux-linux-6.8.patch > +++ /dev/null > @@ -1,36 +0,0 @@ > -Retrieved from: https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux= /-/commit/3eb20df68a545d07b8501f13fa9d20e9c6f577ed.patch > - > -From 7f851f5fb8fbcd7b3a93aaedff90b27124e17a7e Mon Sep 17 00:00:00 2001 > -From: Bruno Inec > -Date: Wed, 20 Mar 2024 10:36:56 +0100 > -Subject: [PATCH] Compatibility with Linux 6.8 > - > ---- > - ddcci/ddcci.c | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/ddcci/ddcci.c b/ddcci/ddcci.c > -index 87b0818..6073c75 100644 > ---- a/ddcci/ddcci.c > -+++ b/ddcci/ddcci.c > -@@ -1666,7 +1666,7 @@ static int ddcci_detect(struct i2c_client *client,= struct i2c_board_info *info) > - pr_debug("detected %d:%02x\n", client->adapter->nr, outer_addr); > -=20 > - /* set device type */ > -- strlcpy(info->type, (outer_addr =3D=3D DDCCI_DEFAULT_DEVICE_ADDR) ? "d= dcci" : "ddcci-dependent", I2C_NAME_SIZE); > -+ strscpy(info->type, (outer_addr =3D=3D DDCCI_DEFAULT_DEVICE_ADDR) ? "d= dcci" : "ddcci-dependent", I2C_NAME_SIZE); > -=20 > - return 0; > - } > -@@ -1824,7 +1824,7 @@ static struct i2c_driver ddcci_driver =3D { > - #else > - .remove =3D ddcci_remove, > - #endif > -- .class =3D I2C_CLASS_DDC, > -+ .class =3D I2C_CLASS_SPD, > - .detect =3D ddcci_detect, > - .address_list =3D I2C_ADDRS( > - DDCCI_DEFAULT_DEVICE_ADDR>>1 > ---=20 > -GitLab > - > > base-commit: d007b64356764f49677c78d82643f1125b5353b7 pushed, close. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmaojKgACgkQO1qpk+Gi 3/CtSA/9EBItXaaVaoxge1DciPLxO7P3ttRhtJVXGKg2gMC8FFcdJ9JRStO4HVmF uVt1i7nPh+cUQOm9TM0vL2BkJtL0YmWMaHeB8UklzWaeZtU23t0Q3Hn02MV0H9dY 6TCb/iBsqzAb/t1JdczBoyNVyr0Ty5pAZwYUAIWXUEBswyFqRMBGPxL6pJKiFQmI zx/y2Ady58E94VDMNGFz5it9/4/lr2SwaI+Y3RMjDaI+8DoZ2fT1ItOE0+jeDJkW M74DeDJCl7yRsXvgh3IUtswHNrlpe6WHuiboQEPQdcGsej9vg/TcntHX2sTV+cpL vmrjIEN69D857x7/z0MXyR0VFFwksbSIkISHDGCJ1vw0azvO/4BDbkY8iln7BI3I Zutw65hsFsZZlHKsZYI4m1JjdMWc2xzw0IfY8BaBzZ1H1uTzapHDUvicpCeLnSBE wWS+wn0wLLd3ggaxfY+Q40cWPXveFiK4IN7ZkcUU3AIaQYdc24w+vAvBLNzrDZLW Pyd2os7GVJRXhs+vjmNFhnIg2VLbX/5uK9QRynZT13vQ//WY2iuEsRzzGRqYTmp4 9QPoocgU+xxnndtHW/AginwH0lb3ND3ty1CSU8OjkfY7j4pRTuAL3GDG5X7iV6hL Bmpu1CR0fs98wMYzXJEEHAoPR05bv//ehPQ6uMDyp7lU/5S2oYQ= =jGna -----END PGP SIGNATURE----- --=-=-=-- From unknown Mon Aug 11 21:14:33 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: ashish.is@lostca.se Subject: bug#72261: closed (Re: [bug#72261] [PATCH] gnu: ddcci-driver-linux: Update to 0.4.5.) Message-ID: References: <874j87z87r.fsf@iscas.ac.cn> <48e93a7b591ae8b168e33979e76f7ae54fccbded.1721762487.git.ashish.is@lostca.se> X-Gnu-PR-Message: they-closed 72261 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 72261@debbugs.gnu.org Date: Tue, 30 Jul 2024 06:49:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1722322143-15078-1" This is a multi-part message in MIME format... ------------=_1722322143-15078-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #72261: [PATCH] gnu: ddcci-driver-linux: Update to 0.4.5. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 72261@debbugs.gnu.org. --=20 72261: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D72261 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1722322143-15078-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 72261-done) by debbugs.gnu.org; 30 Jul 2024 06:48:44 +0000 Received: from localhost ([127.0.0.1]:46830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sYgf6-0003uT-3E for submit@debbugs.gnu.org; Tue, 30 Jul 2024 02:48:44 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81]:60838 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sYgf2-0003u8-Tz for 72261-done@debbugs.gnu.org; Tue, 30 Jul 2024 02:48:42 -0400 Received: from m (unknown [107.174.64.25]) by APP-03 (Coremail) with SMTP id rQCowAB3ngGqjKhmPQYMAg--.11137S2; Tue, 30 Jul 2024 14:48:14 +0800 (CST) From: Zheng Junjie To: "ashish.is--- via Guix-patches" via Subject: Re: [bug#72261] [PATCH] gnu: ddcci-driver-linux: Update to 0.4.5. In-Reply-To: <48e93a7b591ae8b168e33979e76f7ae54fccbded.1721762487.git.ashish.is@lostca.se> (ashish is's message of "Tue, 23 Jul 2024 21:21:27 +0200") References: <48e93a7b591ae8b168e33979e76f7ae54fccbded.1721762487.git.ashish.is@lostca.se> Date: Tue, 30 Jul 2024 14:48:08 +0800 Message-ID: <874j87z87r.fsf@iscas.ac.cn> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: rQCowAB3ngGqjKhmPQYMAg--.11137S2 X-Coremail-Antispam: 1UD129KBjvJXoWxGrWUuF13uryrAryfuF1xXwb_yoWrtF1kpF W3ua4avw4fKr4rtrs3GF1akw1rZ3WUWFW0krnrWwnYkrW7Zr4Iqa97Gr4rAFn8Wrn7uw4x AF18KF9rCFWUJFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBjb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_JFI_Gr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwV C2z280aVCY1x0267AKxVW8Jr0_Cr1UM2vj62AExVA0xI801c8C04v26x02cVCv0xWle2I2 62IYc4CY6c8Ij28IcVAaY2xG8wASzI0EjI02j7AqF2xKxwAqx4xG64xvF2IEw4CE5I8CrV C2j2WlYx0E2Ix0cI8IcVAFwI0_Jrv_JF1lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE 7xkEbVWUJVW8JwACjcxG0xvEwIxGrwCY1x0262kKe7AKxVWUAVWUtwCF04k20xvY0x0EwI xGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480 Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0I7 IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k2 6cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxV AFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07ji-B_UUUUU= X-Originating-IP: [107.174.64.25] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72261-done Cc: 72261-done@debbugs.gnu.org, Wilko Meyer , ashish.is@lostca.se, Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable "ashish.is--- via Guix-patches" via writes: > From: Ashish SHUKLA > > * gnu/packages/linux.scm (ddcci-driver-linux): Update to 0.4.5. > [source] remove already upstream patch. No indentation required, capitalize the first letter. > > * gnu/packages/patches/ddcci-driver-linux-6.8.patch: Remove it. > * gnu/local.mk: Unregister it. > > Change-Id: I1d4920ec84ea2a67554560181e99e9e2d535af2a > --- > gnu/local.mk | 2 +- > gnu/packages/linux.scm | 6 ++-- > .../ddcci-driver-linux-linux-6.8.patch | 36 ------------------- > 3 files changed, 4 insertions(+), 40 deletions(-) > delete mode 100644 gnu/packages/patches/ddcci-driver-linux-linux-6.8.pat= ch > > diff --git a/gnu/local.mk b/gnu/local.mk > index ef1e82eb04..982e13ad50 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -65,6 +65,7 @@ > # Copyright =C2=A9 2023 Herman Rimm > # Copyright =C2=A9 2023 Troy Figiel > # Copyright =C2=A9 2024 David Elsing > +# Copyright =C2=A9 2024 Ashish SHUKLA > # > # This file is part of GNU Guix. > # > @@ -1111,7 +1112,6 @@ dist_patch_DATA =3D \ > %D%/packages/patches/dbus-c++-gcc-compat.patch \ > %D%/packages/patches/dbus-c++-threading-mutex.patch \ > %D%/packages/patches/dbxfs-remove-sentry-sdk.patch \ > - %D%/packages/patches/ddcci-driver-linux-linux-6.8.patch \ > %D%/packages/patches/debops-constants-for-external-program-names.patch= \ > %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \ > %D%/packages/patches/dee-vapi.patch \ > diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm > index 4bd5f9c902..0eeac4b094 100644 > --- a/gnu/packages/linux.scm > +++ b/gnu/packages/linux.scm > @@ -81,6 +81,7 @@ > ;;; Copyright =C2=A9 2024 Gabriel Wicki > ;;; Copyright =C2=A9 2024 Sharlatan Hellseher > ;;; Copyright =C2=A9 2024 Arun Isaac > +;;; Copyright =C2=A9 2024 Ashish SHUKLA > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -1747,7 +1748,7 @@ (define-public bbswitch-module > (define-public ddcci-driver-linux > (package > (name "ddcci-driver-linux") > - (version "0.4.4") > + (version "0.4.5") > (source > (origin > (method git-fetch) > @@ -1757,8 +1758,7 @@ (define-public ddcci-driver-linux > (commit (string-append "v" version)))) > (file-name (git-file-name name version)) > (sha256 > - (base32 "19vi7dk4jv5wm18cznz4lj2fb1c7m7j3ig62x4a6qy9djxf9z472")) > - (patches (search-patches "ddcci-driver-linux-linux-6.8.patch")))) > + (base32 "0j2bgzadrbcyf3k4zplv7p5yqb9pw2ca6wzkqjhhidaah2722vlf"))= )) > (build-system linux-module-build-system) > (arguments > (list #:tests? #f ; no tests > diff --git a/gnu/packages/patches/ddcci-driver-linux-linux-6.8.patch b/gn= u/packages/patches/ddcci-driver-linux-linux-6.8.patch > deleted file mode 100644 > index 89ded73c14..0000000000 > --- a/gnu/packages/patches/ddcci-driver-linux-linux-6.8.patch > +++ /dev/null > @@ -1,36 +0,0 @@ > -Retrieved from: https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux= /-/commit/3eb20df68a545d07b8501f13fa9d20e9c6f577ed.patch > - > -From 7f851f5fb8fbcd7b3a93aaedff90b27124e17a7e Mon Sep 17 00:00:00 2001 > -From: Bruno Inec > -Date: Wed, 20 Mar 2024 10:36:56 +0100 > -Subject: [PATCH] Compatibility with Linux 6.8 > - > ---- > - ddcci/ddcci.c | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/ddcci/ddcci.c b/ddcci/ddcci.c > -index 87b0818..6073c75 100644 > ---- a/ddcci/ddcci.c > -+++ b/ddcci/ddcci.c > -@@ -1666,7 +1666,7 @@ static int ddcci_detect(struct i2c_client *client,= struct i2c_board_info *info) > - pr_debug("detected %d:%02x\n", client->adapter->nr, outer_addr); > -=20 > - /* set device type */ > -- strlcpy(info->type, (outer_addr =3D=3D DDCCI_DEFAULT_DEVICE_ADDR) ? "d= dcci" : "ddcci-dependent", I2C_NAME_SIZE); > -+ strscpy(info->type, (outer_addr =3D=3D DDCCI_DEFAULT_DEVICE_ADDR) ? "d= dcci" : "ddcci-dependent", I2C_NAME_SIZE); > -=20 > - return 0; > - } > -@@ -1824,7 +1824,7 @@ static struct i2c_driver ddcci_driver =3D { > - #else > - .remove =3D ddcci_remove, > - #endif > -- .class =3D I2C_CLASS_DDC, > -+ .class =3D I2C_CLASS_SPD, > - .detect =3D ddcci_detect, > - .address_list =3D I2C_ADDRS( > - DDCCI_DEFAULT_DEVICE_ADDR>>1 > ---=20 > -GitLab > - > > base-commit: d007b64356764f49677c78d82643f1125b5353b7 pushed, close. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmaojKgACgkQO1qpk+Gi 3/CtSA/9EBItXaaVaoxge1DciPLxO7P3ttRhtJVXGKg2gMC8FFcdJ9JRStO4HVmF uVt1i7nPh+cUQOm9TM0vL2BkJtL0YmWMaHeB8UklzWaeZtU23t0Q3Hn02MV0H9dY 6TCb/iBsqzAb/t1JdczBoyNVyr0Ty5pAZwYUAIWXUEBswyFqRMBGPxL6pJKiFQmI zx/y2Ady58E94VDMNGFz5it9/4/lr2SwaI+Y3RMjDaI+8DoZ2fT1ItOE0+jeDJkW M74DeDJCl7yRsXvgh3IUtswHNrlpe6WHuiboQEPQdcGsej9vg/TcntHX2sTV+cpL vmrjIEN69D857x7/z0MXyR0VFFwksbSIkISHDGCJ1vw0azvO/4BDbkY8iln7BI3I Zutw65hsFsZZlHKsZYI4m1JjdMWc2xzw0IfY8BaBzZ1H1uTzapHDUvicpCeLnSBE wWS+wn0wLLd3ggaxfY+Q40cWPXveFiK4IN7ZkcUU3AIaQYdc24w+vAvBLNzrDZLW Pyd2os7GVJRXhs+vjmNFhnIg2VLbX/5uK9QRynZT13vQ//WY2iuEsRzzGRqYTmp4 9QPoocgU+xxnndtHW/AginwH0lb3ND3ty1CSU8OjkfY7j4pRTuAL3GDG5X7iV6hL Bmpu1CR0fs98wMYzXJEEHAoPR05bv//ehPQ6uMDyp7lU/5S2oYQ= =jGna -----END PGP SIGNATURE----- --=-=-=-- ------------=_1722322143-15078-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 23 Jul 2024 19:21:56 +0000 Received: from localhost ([127.0.0.1]:60764 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sWL59-0004yt-Ii for submit@debbugs.gnu.org; Tue, 23 Jul 2024 15:21:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:40632) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sWL55-0004yj-QN for submit@debbugs.gnu.org; Tue, 23 Jul 2024 15:21:54 -0400 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 1sWL4y-0006eJ-FN for guix-patches@gnu.org; Tue, 23 Jul 2024 15:21:45 -0400 Received: from anamika.lostca.se ([65.21.75.227]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sWL4w-0005uV-Bj for guix-patches@gnu.org; Tue, 23 Jul 2024 15:21:44 -0400 Received: from sofia.fritz.box (unknown [IPv6:2a10:3781:35df:1:65ac:c2a7:5ed1:d961]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: abbe) by anamika.lostca.se (Postfix) with ESMTPSA id 6F2901C8BA; Tue, 23 Jul 2024 19:21:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1721762499; h=from:from: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; bh=gJj2PxhEa1Uat9ew72vR3zOkw0GeHrs3YR5ooyRHhm0=; b=nLZvb+4fzraC16wWJ6nP4oYZZkqs3WexBiVxiMA/mNhzV5BEWdEZdVwvKlGH7JRvagfDYP rruEL+bzPyQq6AgqbkM7BwzlHDaim/EpezE1YtftXnVWqGZcipcz95cYNogyHytJb4A59J GudpZq+UDPRhdT17wamPrnWaLDWmuAw= From: ashish.is@lostca.se To: guix-patches@gnu.org Subject: [PATCH] gnu: ddcci-driver-linux: Update to 0.4.5. Date: Tue, 23 Jul 2024 21:21:27 +0200 Message-ID: <48e93a7b591ae8b168e33979e76f7ae54fccbded.1721762487.git.ashish.is@lostca.se> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Debbugs-Cc: Leo Famulari , Wilko Meyer Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=65.21.75.227; envelope-from=ashish.is@lostca.se; helo=anamika.lostca.se X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Ashish SHUKLA X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) From: Ashish SHUKLA * gnu/packages/linux.scm (ddcci-driver-linux): Update to 0.4.5. [source] remove already upstream patch. * gnu/packages/patches/ddcci-driver-linux-6.8.patch: Remove it. * gnu/local.mk: Unregister it. Change-Id: I1d4920ec84ea2a67554560181e99e9e2d535af2a --- gnu/local.mk | 2 +- gnu/packages/linux.scm | 6 ++-- .../ddcci-driver-linux-linux-6.8.patch | 36 ------------------- 3 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 gnu/packages/patches/ddcci-driver-linux-linux-6.8.patch diff --git a/gnu/local.mk b/gnu/local.mk index ef1e82eb04..982e13ad50 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -65,6 +65,7 @@ # Copyright © 2023 Herman Rimm # Copyright © 2023 Troy Figiel # Copyright © 2024 David Elsing +# Copyright © 2024 Ashish SHUKLA # # This file is part of GNU Guix. # @@ -1111,7 +1112,6 @@ dist_patch_DATA = \ %D%/packages/patches/dbus-c++-gcc-compat.patch \ %D%/packages/patches/dbus-c++-threading-mutex.patch \ %D%/packages/patches/dbxfs-remove-sentry-sdk.patch \ - %D%/packages/patches/ddcci-driver-linux-linux-6.8.patch \ %D%/packages/patches/debops-constants-for-external-program-names.patch \ %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \ %D%/packages/patches/dee-vapi.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4bd5f9c902..0eeac4b094 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -81,6 +81,7 @@ ;;; Copyright © 2024 Gabriel Wicki ;;; Copyright © 2024 Sharlatan Hellseher ;;; Copyright © 2024 Arun Isaac +;;; Copyright © 2024 Ashish SHUKLA ;;; ;;; This file is part of GNU Guix. ;;; @@ -1747,7 +1748,7 @@ (define-public bbswitch-module (define-public ddcci-driver-linux (package (name "ddcci-driver-linux") - (version "0.4.4") + (version "0.4.5") (source (origin (method git-fetch) @@ -1757,8 +1758,7 @@ (define-public ddcci-driver-linux (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "19vi7dk4jv5wm18cznz4lj2fb1c7m7j3ig62x4a6qy9djxf9z472")) - (patches (search-patches "ddcci-driver-linux-linux-6.8.patch")))) + (base32 "0j2bgzadrbcyf3k4zplv7p5yqb9pw2ca6wzkqjhhidaah2722vlf")))) (build-system linux-module-build-system) (arguments (list #:tests? #f ; no tests diff --git a/gnu/packages/patches/ddcci-driver-linux-linux-6.8.patch b/gnu/packages/patches/ddcci-driver-linux-linux-6.8.patch deleted file mode 100644 index 89ded73c14..0000000000 --- a/gnu/packages/patches/ddcci-driver-linux-linux-6.8.patch +++ /dev/null @@ -1,36 +0,0 @@ -Retrieved from: https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/-/commit/3eb20df68a545d07b8501f13fa9d20e9c6f577ed.patch - -From 7f851f5fb8fbcd7b3a93aaedff90b27124e17a7e Mon Sep 17 00:00:00 2001 -From: Bruno Inec -Date: Wed, 20 Mar 2024 10:36:56 +0100 -Subject: [PATCH] Compatibility with Linux 6.8 - ---- - ddcci/ddcci.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ddcci/ddcci.c b/ddcci/ddcci.c -index 87b0818..6073c75 100644 ---- a/ddcci/ddcci.c -+++ b/ddcci/ddcci.c -@@ -1666,7 +1666,7 @@ static int ddcci_detect(struct i2c_client *client, struct i2c_board_info *info) - pr_debug("detected %d:%02x\n", client->adapter->nr, outer_addr); - - /* set device type */ -- strlcpy(info->type, (outer_addr == DDCCI_DEFAULT_DEVICE_ADDR) ? "ddcci" : "ddcci-dependent", I2C_NAME_SIZE); -+ strscpy(info->type, (outer_addr == DDCCI_DEFAULT_DEVICE_ADDR) ? "ddcci" : "ddcci-dependent", I2C_NAME_SIZE); - - return 0; - } -@@ -1824,7 +1824,7 @@ static struct i2c_driver ddcci_driver = { - #else - .remove = ddcci_remove, - #endif -- .class = I2C_CLASS_DDC, -+ .class = I2C_CLASS_SPD, - .detect = ddcci_detect, - .address_list = I2C_ADDRS( - DDCCI_DEFAULT_DEVICE_ADDR>>1 --- -GitLab - base-commit: d007b64356764f49677c78d82643f1125b5353b7 -- 2.45.2 ------------=_1722322143-15078-1--