From patchwork Fri Apr 11 05:31:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ashish SHUKLA X-Patchwork-Id: 41566 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 575AE27BC49; Fri, 11 Apr 2025 06:32:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2B7A727BC4A for ; Fri, 11 Apr 2025 06:32:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u36zl-0002v8-1k; Fri, 11 Apr 2025 01:32:05 -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 1u36zj-0002us-Qz for guix-patches@gnu.org; Fri, 11 Apr 2025 01:32:03 -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 1u36zi-0004hA-Ks for guix-patches@gnu.org; Fri, 11 Apr 2025 01:32:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=jHbj/0L7EQjaTtj75982r60VKsWIEl2r0rf3Z4R2ZKM=; b=iJKuP90KvMHXdYrwbQ9XQX7BXpsCHgOxH3eofZNZ7L/eL0cQdu2z2txXGrm8pWbs5Ec3e9oAKwFuyI3Z8wYBlN/3rB4ozeFfYZTAsyvB09mp5PSJ3XCxdC6xnVcq3LtrcRYagdBqsY/1r47sFEUxYtI8B3/rxRzMC48wZP/ECq1XxREOo6loY6pWcY6nUFWs5GT6p3+PvWOVq7lL5oq6Oxc0Bt6Ua/Jig92U0Ywr4/BLXBlmsca6OeDvo+enbBTHnBpBU8QlGwQm1+Jt4d29XCFne5dEcJIdS8hrb3aLpfaChddzqfqMRYjoZDxJbz81wJPR2+hmqHyMitIfQaqS5w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u36zi-0007Mm-EZ for guix-patches@gnu.org; Fri, 11 Apr 2025 01:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77719] [PATCH] gnu: fuzzel: Update to 1.12.0. Resent-From: Ashish SHUKLA Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 11 Apr 2025 05:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77719 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77719@debbugs.gnu.org Cc: Ashish SHUKLA X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174434949728266 (code B ref -1); Fri, 11 Apr 2025 05:32:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Apr 2025 05:31:37 +0000 Received: from localhost ([127.0.0.1]:48207 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u36zI-0007Lp-CL for submit@debbugs.gnu.org; Fri, 11 Apr 2025 01:31:36 -0400 Received: from lists.gnu.org ([2001:470:142::17]:42798) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u36zF-0007LS-6q for submit@debbugs.gnu.org; Fri, 11 Apr 2025 01:31:34 -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 1u36z9-0002sN-D3 for guix-patches@gnu.org; Fri, 11 Apr 2025 01:31:27 -0400 Received: from anamika.lostca.se ([2a01:4f9:3b:505c::2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u36z6-0004XU-LW for guix-patches@gnu.org; Fri, 11 Apr 2025 01:31:27 -0400 Received: from localhost.localdomain (host-68waeqk6j1u9n9jlis.pd.zrz1-a.v6.dfn.nl [IPv6:2a02:f6d:b170:0:b90d:ab2e:2a85:3a3e]) (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 37C40187E6; Fri, 11 Apr 2025 05:31:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1744349480; 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=jHbj/0L7EQjaTtj75982r60VKsWIEl2r0rf3Z4R2ZKM=; b=bx+CIWIQhwG+b6AuiC/luPS3FoMfZgnK8RBBipiwKM0hstVX50POqTMDwzbp8NSaO36Sqh XVrkF3T/RtrPaQs2Gp5JYcrfOkHFcQtjGpTiWoPHaK3gMFzdiV3UC63eyOUVz/SOxiOpY3 144J1xvhHlu5D/X9Ocj7g+/Z+EyshH0= Date: Fri, 11 Apr 2025 07:31:10 +0200 Message-ID: <6737ae31c7a1c89004d41e11bbc781bc57c0b84e.1744349470.git.ashish.is@lostca.se> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a01:4f9:3b:505c::2; 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 SHUKLA X-ACL-Warn: , Ashish SHUKLA via Guix-patches X-Patchwork-Original-From: Ashish SHUKLA via Guix-patches via From: Ashish SHUKLA Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/xdisorg.scm (fuzzel): Update to 1.12.0. [source]: Remove patch. * gnu/packages/patches/fuzzel-fix-gcc-error.patch: Remove. * gnu/local.mk (dist_patch_DATA): Unregister it. --- gnu/local.mk | 1 - .../patches/fuzzel-fix-gcc-error.patch | 42 ------------------- gnu/packages/xdisorg.scm | 8 ++-- 3 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 gnu/packages/patches/fuzzel-fix-gcc-error.patch base-commit: f7c41ab31f5023023385500f6eb9083d23dd1ccb diff --git a/gnu/local.mk b/gnu/local.mk index 29bf4c72b8..352d982ab3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1335,7 +1335,6 @@ dist_patch_DATA = \ %D%/packages/patches/fulcrum-1.9.1-unbundled-libraries.patch \ %D%/packages/patches/fuse-glibc-2.34.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \ - %D%/packages/patches/fuzzel-fix-gcc-error.patch \ %D%/packages/patches/fuzzylite-relative-path-in-tests.patch \ %D%/packages/patches/fuzzylite-use-catch2.patch \ %D%/packages/patches/fuzzylite-soften-float-equality.patch \ diff --git a/gnu/packages/patches/fuzzel-fix-gcc-error.patch b/gnu/packages/patches/fuzzel-fix-gcc-error.patch deleted file mode 100644 index 4b5071e0e2..0000000000 --- a/gnu/packages/patches/fuzzel-fix-gcc-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 05b16745a1d26c4e098c39a49c56e9c312771bd2 Mon Sep 17 00:00:00 2001 -From: Ashish SHUKLA -Date: Mon, 23 Sep 2024 12:43:37 +0200 -Subject: [PATCH] Fix release build with GCC 11.x -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -meson in release build mode (with GCC) triggers following compiler error: - - In file included from ../source/clipboard.c:14: - ../source/clipboard.c: In function ‘select_mime_type_for_offer’: - ../source/log.h:58:5: error: ‘%s’ directive argument is null [-Werror=format-overflow=] - 58 | log_msg(LOG_CLASS_DEBUG, LOG_MODULE, __FILE__, __LINE__, fmt, ## __VA_ARGS__) - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ../source/clipboard.c:81:5: note: in expansion of macro ‘LOG_DBG’ - 81 | LOG_DBG("mime-type: %s -> %s (offered type was %s)", - | ^~~~~~~ - ../source/clipboard.c:81:31: note: format string is defined here - 81 | LOG_DBG("mime-type: %s -> %s (offered type was %s)", - | ^~ - -Fixes #420 ---- - clipboard.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/clipboard.c b/clipboard.c -index a4fa2d2..c692503 100644 ---- a/clipboard.c -+++ b/clipboard.c -@@ -79,7 +79,9 @@ select_mime_type_for_offer(const char *_mime_type, - } - - LOG_DBG("mime-type: %s -> %s (offered type was %s)", -- mime_type_map[*type], mime_type_map[mime_type], _mime_type); -+ mime_type_map[*type], -+ (mime_type_map[mime_type] == NULL ? "(null)" : mime_type_map[mime_type]), -+ _mime_type); - - /* Mime-type transition; if the new mime-type is "better" than - * previously offered types, use the new type */ diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 302c0434ca..0013b00ce7 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -64,7 +64,7 @@ ;;; Copyright © 2022 Mehmet Tekman ;;; Copyright © 2024 Artyom V. Poptsov ;;; Copyright © 2024 Igor Goryachev -;;; Copyright © 2024 Ashish SHUKLA +;;; Copyright © 2024, 2025 Ashish SHUKLA ;;; Copyright © 2024 Spencer Peters ;;; Copyright © 2024 Jakob Kirsch ;;; Copyright © 2025 Evgeny Pisemsky @@ -3559,7 +3559,7 @@ (define-public j4-dmenu-desktop (define-public fuzzel (package (name "fuzzel") - (version "1.11.1") + (version "1.12.0") (home-page "https://codeberg.org/dnkl/fuzzel") (source (origin (method git-fetch) @@ -3567,9 +3567,7 @@ (define-public fuzzel (file-name (git-file-name name version)) (sha256 (base32 - "0dz451sjzglznkq9jmmcqm2m5y9kj1nx5zrdln56nmnbyyy4gkhl")) - (patches - (search-patches "fuzzel-fix-gcc-error.patch")))) + "0hsw98v499bz2nxvlw3ykq5qyyad3ci5a7x723r3cl84brabqrp3")))) (build-system meson-build-system) (arguments (list #:build-type "release"