From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.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 gMxAInQW9GacCQEAqHPOHw:P1 (envelope-from ) for ; Wed, 25 Sep 2024 13:56:04 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id gMxAInQW9GacCQEAqHPOHw (envelope-from ) for ; Wed, 25 Sep 2024 15:56:04 +0200 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=cYfBrKaU; dkim=fail ("headers rsa verify failed") header.d=lostca.se header.s=anamika header.b=YV+IYxsz; 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=1727272564; 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=VlgvEY79Ij+Guf6YmJpTa8CcB3l/4XBS/PpUOsqBfCY=; b=l7U14elRtGUi3UbBSG+1Gjnq8c6u8W0q6gaQh2wopDKQUVWrVnWeLv5r5YTEQLRsn+Hphy Vkk9sWSSRZ5936Co2xWxzhz4HwaxEf+lYaF3thcrbqGyEoKEf0NeBuBDRRs2rMQ4qCMFCg 6j/JHDMtfuqvDSucIbzJt5r5dEvfswUx2oiSx1r8wTctm7mVuA4JCllr1x3yCbezrxdNKW ptlje/KAiliZBUo2Qx8L6N1jIwHjaB2YWhy7mnF8y+sqrE/pGAKi37YEjCTYEy1VRJIw1I uHC66wInSSKQ5y3NuZhsEDchKjM3ZopM41Se9M5u3Q/UrZxrJCUgb5g2pARX6A== 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=cYfBrKaU; dkim=fail ("headers rsa verify failed") header.d=lostca.se header.s=anamika header.b=YV+IYxsz; 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=1727272564; a=rsa-sha256; cv=none; b=Ckq1QV+ZW6oMBpMcNLFv8eb99YU3nvthkxLLd5Jlj8bu0wiHYc3tgeVquH5oy5oBSCRGfP N33PbKGP/UjqE5n+jdyjbjcMN+6jd2RXZ6/9AeYmFjght9zeV0vtSuDqPVZOd1qEKEYeb6 3fFLv32bQ4kDCXdWSIRtkP9JszsEKAMbTtEWtVPho43e8HZDcug2NV7ut9itLjeA8XvfSc LujUr0pz8l1JSvCzjX/Mr2sdgvBJjQXm7brPbmYCWubRVoRx5Wkwk1bwQWR+r0eATwMuVe Zoh/yThMHtQzRJj6mJUfKsZhYxgDjxtvHPZmHLfPm7PMJbrpU15qDrtUPGkMVw== 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 BFA7486DE8 for ; Wed, 25 Sep 2024 15:56:02 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stSUW-0002AB-9K; Wed, 25 Sep 2024 09:55:40 -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 1stSUU-00028i-Eo for guix-patches@gnu.org; Wed, 25 Sep 2024 09:55:38 -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 1stSUT-0006ya-2Q for guix-patches@gnu.org; Wed, 25 Sep 2024 09:55:38 -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=VlgvEY79Ij+Guf6YmJpTa8CcB3l/4XBS/PpUOsqBfCY=; b=cYfBrKaUHiPlm39YcsaN0yFIYRFqiBVG3XQULcrSJSZaiG86kuhYn9Ba48D/gOrnKr8e2f1YTbjILdUaX3nSE5PsyXgoM+SkfW6AkBUSRh9y/r6AaITjkoc48HIPZWXRuJCHZucG0gLKp7gHIOpY81Kt1baiOMKlLaNA+SUpimEXvJpgOmshZpKyIujauSZpsPv49BXf5UAegcXjrCAC3lA6xTxuxz2QLB48FYEoJ4Wzi6/seTKwYVhj15onXv0YQkCER2cUQU/ZOOWpfMZw8M5Sr8QxA9XrZdUYa/lLxet7Xx/Q3vaN1GbmUX4dO2qThdJ+RlhAkXjwWhpo08/xYw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1stSUs-0004MC-G4 for guix-patches@gnu.org; Wed, 25 Sep 2024 09:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73471] [PATCH] gnu: fuzzel: Update to 1.11.0. Resent-From: ashish.is@lostca.se Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Sep 2024 13:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73471@debbugs.gnu.org Cc: Ashish SHUKLA X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172727251314719 (code B ref -1); Wed, 25 Sep 2024 13:56:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Sep 2024 13:55:13 +0000 Received: from localhost ([127.0.0.1]:36459 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stSU4-0003pC-2z for submit@debbugs.gnu.org; Wed, 25 Sep 2024 09:55:13 -0400 Received: from lists.gnu.org ([209.51.188.17]:34088) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stSPu-0003Wt-1i for submit@debbugs.gnu.org; Wed, 25 Sep 2024 09:50: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 1stSPT-0000Hg-Qr for guix-patches@gnu.org; Wed, 25 Sep 2024 09:50: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 1stSPP-0006HN-4G for guix-patches@gnu.org; Wed, 25 Sep 2024 09:50:26 -0400 Received: from chateau-guix.home.inet6.fi (5.red-81-35-35.dynamicip.rima-tde.net [81.35.35.5]) (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 842732D920; Wed, 25 Sep 2024 13:50:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1727272219; 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=VlgvEY79Ij+Guf6YmJpTa8CcB3l/4XBS/PpUOsqBfCY=; b=YV+IYxszvdn88dTER7/JLv0R3qemgMV6i0ZD3ufdCsLGLSdoCBJtosbp5FwIhvTpibsAtI YlZ3NyEx4Emz031TTzXTk5uuyZL5HCsqtkFDRBzDGYo/W1K4jatRWrqnK1UiqWZFT06bsT UG/3YBaNyGgqr9xksGvXX2UeUFuLV9U= Date: Wed, 25 Sep 2024 15:49:06 +0200 Message-ID: X-Mailer: git-send-email 2.46.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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.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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: BFA7486DE8 X-Migadu-Scanner: mx11.migadu.com X-Spam-Score: -4.92 X-Migadu-Spam-Score: -4.92 X-TUID: uY2llfHUG2Bh From: Ashish SHUKLA * gnu/packages/xdisorg.scm (fuzzel): Update to 1.11.0. [sources](origin): Add patch. * gnu/packages/patches/fuzzel-fix-gcc-error.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. Change-Id: I7ed41e6b23657833369f9d319c22421161559dc7 --- The attached patch fixes a build error, and is submitted upstream[0] References: [0] https://codeberg.org/dnkl/fuzzel/pulls/421 Thanks! Ashish gnu/local.mk | 1 + .../patches/fuzzel-fix-gcc-error.patch | 42 +++++++++++++++++++ gnu/packages/xdisorg.scm | 6 ++- 3 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/fuzzel-fix-gcc-error.patch diff --git a/gnu/local.mk b/gnu/local.mk index 795ff822a4..bdce52987e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1287,6 +1287,7 @@ 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 new file mode 100644 index 0000000000..4b5071e0e2 --- /dev/null +++ b/gnu/packages/patches/fuzzel-fix-gcc-error.patch @@ -0,0 +1,42 @@ +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 00f99ec4a8..59822fff7b 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -3424,7 +3424,7 @@ (define-public j4-dmenu-desktop (define-public fuzzel (package (name "fuzzel") - (version "1.10.2") + (version "1.11.0") (home-page "https://codeberg.org/dnkl/fuzzel") (source (origin (method git-fetch) @@ -3432,7 +3432,9 @@ (define-public fuzzel (file-name (git-file-name name version)) (sha256 (base32 - "024gnddvabf5dwkdffr6qnnia810w1jqn4ll9fvbcaimybgpvs13")))) + "1z4n1i9rdhfcmfsvb5bvsqy8x8fg51kfiakyqnp200n1nl0kd9ll")) + (patches + (search-patches "fuzzel-fix-gcc-error.patch")))) (build-system meson-build-system) (arguments (list #:build-type "release" base-commit: 039635567d17460d8d541caa58897db83a3565a8 -- 2.46.1