From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 27 13:04:33 2025 Received: (at submit) by debbugs.gnu.org; 27 Feb 2025 18:04:33 +0000 Received: from localhost ([127.0.0.1]:37489 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tniFN-0004Mo-1t for submit@debbugs.gnu.org; Thu, 27 Feb 2025 13:04:33 -0500 Received: from lists.gnu.org ([2001:470:142::17]:38734) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tniFK-0004LC-C4 for submit@debbugs.gnu.org; Thu, 27 Feb 2025 13:04:31 -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 1tniF1-0006VG-47 for guix-patches@gnu.org; Thu, 27 Feb 2025 13:04:11 -0500 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 1tniEy-0005an-EN for guix-patches@gnu.org; Thu, 27 Feb 2025 13:04:10 -0500 Received: from localhost.localdomain (2a02-9140-3880-f600-b003-9adf-e36c-bfd1.red-2a02-914.customerbaf.ipv6.rima-tde.net [IPv6:2a02:9140:3880:f600:b003:9adf:e36c:bfd1]) (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 802B9CB3E; Thu, 27 Feb 2025 18:03:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1740679433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=tICnA/TR+4He/ypvBneiOv/+PARx06fKE9lYYp/WhqM=; b=mzVjToeuPeBlXo7I8uHX3C02oQ6Q3VSpNxnv12mpHfEaV1EuK0wbqt0eoglQAVM9inTTx1 RgA3AUTG/5uJ7TPddARgZDcM5NtawK1Tz8GMqW1TX6dOAqoQ2PPbex2DY7OOJ4toe/vFfY zIYX2NBZD+EiTfJJf/rW871fVyVW/zA= From: ashish.is@lostca.se To: guix-patches@gnu.org Subject: [PATCH] gnu: waybar: Update to 0.12.0. Date: Thu, 27 Feb 2025 19:03:32 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) 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: -0.1 (/) From: Ashish SHUKLA * gnu/packages/patches/waybar-0.11.0-fix-tray-icons.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Unregister it. * gnu/packages/wm.scm (waybar): Update to 0.12.0. [source]: Remove patch. Change-Id: I43b9aa9a69128399e10d8cdc8dd3f1317a94e64d --- gnu/local.mk | 1 - .../waybar-0.11.0-fix-tray-icons.patch | 86 ------------------- gnu/packages/wm.scm | 5 +- 3 files changed, 2 insertions(+), 90 deletions(-) delete mode 100644 gnu/packages/patches/waybar-0.11.0-fix-tray-icons.patch diff --git a/gnu/local.mk b/gnu/local.mk index c8a29bf98b..9040bb4ad4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2394,7 +2394,6 @@ dist_patch_DATA = \ %D%/packages/patches/wacomtablet-add-missing-includes.patch \ %D%/packages/patches/wacomtablet-qt5.15.patch \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ - %D%/packages/patches/waybar-0.11.0-fix-tray-icons.patch \ %D%/packages/patches/wcstools-extend-makefiles.patch \ %D%/packages/patches/wdl-link-libs-and-fix-jnetlib.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ diff --git a/gnu/packages/patches/waybar-0.11.0-fix-tray-icons.patch b/gnu/packages/patches/waybar-0.11.0-fix-tray-icons.patch deleted file mode 100644 index 5c8c98a661..0000000000 --- a/gnu/packages/patches/waybar-0.11.0-fix-tray-icons.patch +++ /dev/null @@ -1,86 +0,0 @@ -Taken from upstream's merged PR #3604 [1]. - -[1] https://github.com/Alexays/Waybar/pull/3604 - -From 0006e4713ae19776528038b3242ded05db884ba5 Mon Sep 17 00:00:00 2001 -From: Aleksei Bavshin -Date: Sat, 14 Sep 2024 07:37:37 -0700 -Subject: [PATCH 2/2] fix(tray): revert ustring formatting changes - -This reverts commit a4d31ab10d1630cb9104c695d7b777ca12468904. ---- - src/modules/sni/item.cpp | 23 +++++++++-------------- - 1 file changed, 9 insertions(+), 14 deletions(-) - -diff --git a/src/modules/sni/item.cpp b/src/modules/sni/item.cpp -index 8afb39fb3..6c4ec8c06 100644 ---- a/src/modules/sni/item.cpp -+++ b/src/modules/sni/item.cpp -@@ -104,11 +104,9 @@ void Item::proxyReady(Glib::RefPtr& result) { - this->updateImage(); - - } catch (const Glib::Error& err) { -- spdlog::error("Failed to create DBus Proxy for {} {}: {}", bus_name, object_path, -- std::string(err.what())); -+ spdlog::error("Failed to create DBus Proxy for {} {}: {}", bus_name, object_path, err.what()); - } catch (const std::exception& err) { -- spdlog::error("Failed to create DBus Proxy for {} {}: {}", bus_name, object_path, -- std::string(err.what())); -+ spdlog::error("Failed to create DBus Proxy for {} {}: {}", bus_name, object_path, err.what()); - } - } - -@@ -126,15 +124,14 @@ ToolTip get_variant(const Glib::VariantBase& value) { - result.text = get_variant(container.get_child(2)); - auto description = get_variant(container.get_child(3)); - if (!description.empty()) { -- result.text = fmt::format("{}\n{}", std::string(result.text), std::string(description)); -+ result.text = fmt::format("{}\n{}", result.text, description); - } - return result; - } - - void Item::setProperty(const Glib::ustring& name, Glib::VariantBase& value) { - try { -- spdlog::trace("Set tray item property: {}.{} = {}", id.empty() ? bus_name : id, -- std::string(name), get_variant(value)); -+ spdlog::trace("Set tray item property: {}.{} = {}", id.empty() ? bus_name : id, name, value); - - if (name == "Category") { - category = get_variant(value); -@@ -179,12 +176,10 @@ void Item::setProperty(const Glib::ustring& name, Glib::VariantBase& value) { - } - } catch (const Glib::Error& err) { - spdlog::warn("Failed to set tray item property: {}.{}, value = {}, err = {}", -- id.empty() ? bus_name : id, std::string(name), get_variant(value), -- std::string(err.what())); -+ id.empty() ? bus_name : id, name, value, err.what()); - } catch (const std::exception& err) { - spdlog::warn("Failed to set tray item property: {}.{}, value = {}, err = {}", -- id.empty() ? bus_name : id, std::string(name), get_variant(value), -- std::string(err.what())); -+ id.empty() ? bus_name : id, name, value, err.what()); - } - } - -@@ -226,9 +221,9 @@ void Item::processUpdatedProperties(Glib::RefPtr& _result) { - - this->updateImage(); - } catch (const Glib::Error& err) { -- spdlog::warn("Failed to update properties: {}", std::string(err.what())); -+ spdlog::warn("Failed to update properties: {}", err.what()); - } catch (const std::exception& err) { -- spdlog::warn("Failed to update properties: {}", std::string(err.what())); -+ spdlog::warn("Failed to update properties: {}", err.what()); - } - update_pending_.clear(); - } -@@ -250,7 +245,7 @@ static const std::map> signal2props - - void Item::onSignal(const Glib::ustring& sender_name, const Glib::ustring& signal_name, - const Glib::VariantContainerBase& arguments) { -- spdlog::trace("Tray item '{}' got signal {}", id, std::string(signal_name)); -+ spdlog::trace("Tray item '{}' got signal {}", id, signal_name); - auto changed = signal2props.find(signal_name.raw()); - if (changed != signal2props.end()) { - if (update_pending_.empty()) { diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 0e6153d7bd..3a0154f161 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2453,7 +2453,7 @@ (define-public swaynotificationcenter (define-public waybar (package (name "waybar") - (version "0.11.0") + (version "0.12.0") (source (origin (method git-fetch) @@ -2462,8 +2462,7 @@ (define-public waybar (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1bw6d3bf8rm4mgrbcprxxljfxbyabbj2lwabk2z19r8lhfz38myy")) - (patches (search-patches "waybar-0.11.0-fix-tray-icons.patch")))) + (base32 "0i9an3yxbsbgpkl4zvwmk2g6vaap8shxix5gid6vx8x6z9wgg52n")))) (build-system meson-build-system) (arguments (list #:configure-flags #~(list "--wrap-mode=nodownload"))) base-commit: f1810c84f72090b02544ac41d0582c4785728ec4 -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 01 04:59:52 2025 Received: (at 76614-done) by debbugs.gnu.org; 1 Mar 2025 09:59:53 +0000 Received: from localhost ([127.0.0.1]:33189 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1toJdQ-0007o6-4u for submit@debbugs.gnu.org; Sat, 01 Mar 2025 04:59:52 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:44608) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1toJdM-0007nF-0T for 76614-done@debbugs.gnu.org; Sat, 01 Mar 2025 04:59:49 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 3F76A1FF; Sat, 1 Mar 2025 10:59:41 +0100 (CET) Authentication-Results: hera.aquilenet.fr; none X-Virus-Scanned: Debian amavis at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavis, port 10024) with ESMTP id ZpRxmcotaA6X; Sat, 1 Mar 2025 10:59:40 +0100 (CET) Received: from jurong (176-179-191-150.abo.bbox.fr [176.179.191.150]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 37648115; Sat, 1 Mar 2025 10:59:38 +0100 (CET) Date: Sat, 1 Mar 2025 10:59:34 +0100 From: Andreas Enge To: 76614-done@debbugs.gnu.org Subject: Close Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Rspamd-Server: hera X-Rspamd-Queue-Id: 3F76A1FF X-Spamd-Result: default: False [8.40 / 15.00]; SPAM_FLAG(5.00)[]; NEURAL_SPAM(3.00)[1.000]; MID_RHS_NOT_FQDN(0.50)[]; MIME_GOOD(-0.10)[text/plain]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; TO_DN_NONE(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Spamd-Bar: ++++++++ X-Rspamd-Action: add header X-Spam-Level: ******** X-Spam: Yes X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 76614-done 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 (-) Applied, thanks! Andreas From unknown Wed Jun 18 23:17:15 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 29 Mar 2025 11:24:16 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator