From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.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 sEWbBeUCoGbFwwAAe85BDQ:P1 (envelope-from ) for ; Tue, 23 Jul 2024 19:22:13 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id sEWbBeUCoGbFwwAAe85BDQ (envelope-from ) for ; Tue, 23 Jul 2024 21:22:13 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lostca.se header.s=anamika header.b=nLZvb+4f; 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=1721762533; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=gJj2PxhEa1Uat9ew72vR3zOkw0GeHrs3YR5ooyRHhm0=; b=ILg7xaojQaHk2xI5mP381dipd64WNFQ/wQO5E+dhh3opl6f1SqRvSypDqLSlPy9uy9083A sTX+iY44p41ZxYKlGSEveWwHuc+km7zIy2/F815bXiNJdLVtQ5PmLwH6FBqNuONEbfxyFs HncwkAGkVU+fyJt88s89Iv1xFx01FjH2+QB7Gke/Ja12nFOqb+QKoPL3YOwqERsTXQaBIl GvM2NcnCcbp0s2o0solgS1bf/3Mb4EBV7K7fVU3NMRNfy4CF9uc+zEzZi/j3Uag7eo/N/i 7eVyav3T09dU7PupknVR7x3m8nH1AHbD162TDF1wrZfCdbQkwxkIUfHURpGnoA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lostca.se header.s=anamika header.b=nLZvb+4f; 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=1721762533; a=rsa-sha256; cv=none; b=mYGQeAhs4BUF87XFomfum8GqgxH1x+X2t63dUmr9Ehc+UK54sNdy/PVCqsp1PwO6RoyaYe PKSDtojA8bdYDeacY3qN+AoA4OpaNYww1fo44qfo4wdREvR8f6zHDgXQye3viT2GuxXsB3 5UEhFAtK3TIM61Cjce2wlGmpR6bZ/kZd5GbVrAHqcXZXFR8JZrnrJ4gaRv6hr3tDLqEMF9 4v3/t9s6jJBdxv3Em/yQm+ML4SDfSapV+3DMaZ5g7mjpXSAO/47zkJW/ptXkpkDXxw9Uop UusaGgNscj2/MM3G/wz+IHIN7UecLk1yNRKEInx0+j2dP1hg3YnomKIDSU7sCA== 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 6F8A4670E9 for ; Tue, 23 Jul 2024 21:22:12 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sWL5F-0006fU-03; Tue, 23 Jul 2024 15:22:01 -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 1sWL5C-0006fD-Ik for guix-patches@gnu.org; Tue, 23 Jul 2024 15:21:58 -0400 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 1sWL5C-0005vB-3v for guix-patches@gnu.org; Tue, 23 Jul 2024 15:21:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sWL5G-0004zH-CY; Tue, 23 Jul 2024 15:22:02 -0400 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= 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-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: ashish.is@lostca.se X-ACL-Warn: , "ashish.is--- via Guix-patches" From: "ashish.is--- 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 6F8A4670E9 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -7.11 X-Spam-Score: -7.11 X-TUID: ugqaiNaK3T8v 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