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 cImTDt/qZGdvPwAAqHPOHw:P1 (envelope-from ) for ; Fri, 20 Dec 2024 03:56:15 +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 cImTDt/qZGdvPwAAqHPOHw (envelope-from ) for ; Fri, 20 Dec 2024 04:56:15 +0100 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="U5tG403/"; 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=1734666974; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=a4iGO4RLz7JP7ET/ow5T6vbMQA9Gg8ZoYAZlvbuIxd4=; b=tiS8VUxrBUSTc8CIu5DS/A7tendfeI0ORlabnw8orflL1T4alugP+hIBNXnmlvS3A2QVWd MYiXECaSIfICMwzyhxR/pS/BTdA5as7CFlSBatY3jyu+LVC+ujoDLWSzny7Y2Rp7rw/kzk B6Sc8/WvHI4SkZk6nSxnGdxm7lkoGSt5761uejJJgCHJg2Y2FgvXhRNSZgneU5oaBNqZyM FErAtCkJg4unhix/xpLW+z7kkXA0n2IsG66JJayI7fNdgCdMYTSk3I9mMyqb+j4ZAedlL0 f5vxWS3pIJBUEJLgbcLgQMpx42Y2cdQ55PMLkVMiFeHh/jsLXMLgh1NiBlIW/A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734666974; a=rsa-sha256; cv=none; b=db7WJUBBoMp2zZlzbzhABpL8wn8kkLKrOuM72ivzwQijAlS8U+E39xAhAeZ8LyXZCc2IkX 9lI1Fk6ph+sJQc9QRFgEuFzbpd9xtG4ww0+X0blmwsv9uP81h4rpICCx3Wgt7xPQKdEXwt yZCuGD8G9S2seoA4jdQcqdJc+zKoyNM4U/MDN5JmF4QUd0HSBhDB8V6tyrGMwt7MNKPPUm LbGQNA+152reauX9uWn3Opz8170uVVZsQdy6slTsBE+2FHM98ae0BFTp3ESOHkJEiyY81z 23whpWWKsng0RPnFObuDukaGwD6xcR1WnUBHTw18kHVez1kldyVCnR07J6EJ5w== 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="U5tG403/"; 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 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 BFFEF45CB8 for ; Fri, 20 Dec 2024 04:56:14 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOU6Z-0005qI-Ff; Thu, 19 Dec 2024 22:55:11 -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 1tOU6W-0005mc-FR for guix-patches@gnu.org; Thu, 19 Dec 2024 22:55:08 -0500 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 1tOU6W-0001Wx-1a for guix-patches@gnu.org; Thu, 19 Dec 2024 22:55:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=a4iGO4RLz7JP7ET/ow5T6vbMQA9Gg8ZoYAZlvbuIxd4=; b=U5tG403/eZqmvDcCwaZg5wqNsUFznHbXKYr9YguMOiVtuXg9FZUH9vQLCfl0J/xvr6RdjvCGR4FuLwMbb5hWTPsyMjEgS407wFoxH1YjUYKJ2t5q8mdEhcypcVutOd7N510flLH3lHwkFtwRa1fdSP9JzBTpOu4VtBHn7F53WRRYexOYFphsydqiaE9T3iKCS0moPr9OQT9mLlE5i4Wq0FUUiT+VL+dUj8Al+pid658EsAVRdTAtwJwgzbvo7vukcQ4ddMbMBlQOuhSXfkDC45JOhr0X7R6bxRkPgBXsZRyhmVr0diPOfVJPYE5abgV9cG0rEW060IHTi6z7DAmlgg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOU6V-0006hV-SZ; Thu, 19 Dec 2024 22:55:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74989] [PATCH 10/23] gnu: xfce4-panel: Update to 4.20.0. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: all_but_last@163.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Fri, 20 Dec 2024 03:55:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74989 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74989@debbugs.gnu.org Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= , Zhu Zihao , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-Xcc: Zhu Zihao , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 74989-submit@debbugs.gnu.org id=B74989.173466688125485 (code B ref 74989); Fri, 20 Dec 2024 03:55:07 +0000 Received: (at 74989) by debbugs.gnu.org; 20 Dec 2024 03:54:41 +0000 Received: from localhost ([127.0.0.1]:41033 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOU64-0006cw-Sp for submit@debbugs.gnu.org; Thu, 19 Dec 2024 22:54:41 -0500 Received: from mail.envs.net ([5.199.136.28]:35512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOU5t-0006bY-VM for 74989@debbugs.gnu.org; Thu, 19 Dec 2024 22:54:30 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 8CDFF38A3E2F; Fri, 20 Dec 2024 03:54:29 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id ZEZsrKgk0KAd; Fri, 20 Dec 2024 03:54:26 +0000 (UTC) Received: from localhost (unknown [112.44.101.251]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Fri, 20 Dec 2024 03:54:23 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id a6031dad; Fri, 20 Dec 2024 03:57:08 +0000 (UTC) Date: Fri, 20 Dec 2024 11:56:41 +0800 Message-ID: <80e8f2a49c750adf574e03910569dfe6341a60a8.1734666530.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches From: iyzsong--- 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-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -6.72 X-Spam-Score: -6.72 X-Migadu-Queue-Id: BFFEF45CB8 X-TUID: hcltL3jS1FcY From: 宋文武 * gnu/packages/xfce.scm (xfce4-panel): Update to 4.20.0. [source]: Remove 'xfce4-panel-plugins.patch'. [arguments]: Add 'patch-configure phase for 'gdbus-codegen'. [inputs]: Remove gtk+-2. Add gtk-layer-shell and libxfce4windowing. [native-search-paths]: Replace 'X_XFCE4_LIB_DIRS' with 'XDG_DATA_DIRS'. * gnu/packages/patches/xfce4-panel-plugins.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Remove it. Change-Id: I8104a9a9e0fcd69b12ebc1346681f6f4bb29e17d --- gnu/local.mk | 1 - .../patches/xfce4-panel-plugins.patch | 115 ------------------ gnu/packages/xfce.scm | 20 +-- 3 files changed, 13 insertions(+), 123 deletions(-) delete mode 100644 gnu/packages/patches/xfce4-panel-plugins.patch diff --git a/gnu/local.mk b/gnu/local.mk index fbe9dfbb0e..4f052da781 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2366,7 +2366,6 @@ dist_patch_DATA = \ %D%/packages/patches/xfig-Enable-error-message-for-missing-libraries.patch \ %D%/packages/patches/xfig-Fix-double-free-when-requesting-MediaBox.patch \ %D%/packages/patches/xfig-Use-pkg-config-to-set-fontconfig-CFLAGS-and-LIBS.patch \ - %D%/packages/patches/xfce4-panel-plugins.patch \ %D%/packages/patches/xfce4-settings-defaults.patch \ %D%/packages/patches/xgboost-use-system-dmlc-core.patch \ %D%/packages/patches/xmonad-dynamic-linking.patch \ diff --git a/gnu/packages/patches/xfce4-panel-plugins.patch b/gnu/packages/patches/xfce4-panel-plugins.patch deleted file mode 100644 index df5a0a914d..0000000000 --- a/gnu/packages/patches/xfce4-panel-plugins.patch +++ /dev/null @@ -1,115 +0,0 @@ -Search for xfce4 panel plugins in the directories specified -in XDG_DATA_DIRS and X_XFCE4_LIB_DIRS. For discussion of the -relevant issues, see: - - https://bugzilla.xfce.org/show_bug.cgi?id=5455 - -Patch by Mark H Weaver - ---- xfce4-panel-4.10.0/panel/panel-module.c.orig 2012-04-28 16:31:35.000000000 -0400 -+++ xfce4-panel-4.10.0/panel/panel-module.c 2014-12-14 01:31:55.728107386 -0500 -@@ -35,8 +35,14 @@ - #include - #include - --#define PANEL_PLUGINS_LIB_DIR (LIBDIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins") --#define PANEL_PLUGINS_LIB_DIR_OLD (LIBDIR G_DIR_SEPARATOR_S "panel-plugins") -+#define PANEL_PLUGINS_LIB_DIR_TAIL (G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins") -+#define PANEL_PLUGINS_LIB_DIR_TAIL_OLD (G_DIR_SEPARATOR_S "panel-plugins") -+ -+static const gchar *plugins_lib_dir_tails[] = -+{ -+ PANEL_PLUGINS_LIB_DIR_TAIL, -+ PANEL_PLUGINS_LIB_DIR_TAIL_OLD -+}; - - - typedef enum _PanelModuleRunMode PanelModuleRunMode; -@@ -335,21 +341,39 @@ - /* show a messsage if the old module path key still exists */ - g_message ("Plugin %s: The \"X-XFCE-Module-Path\" key is " - "ignored in \"%s\", the panel will look for the " -- "module in %s. See bug #5455 why this decision was made", -- name, filename, PANEL_PLUGINS_LIB_DIR); -+ "module in DIR%s for each DIR in $X_XFCE4_LIB_DIRS " -+ "(%s by default). See bug #5455 for discussion.", -+ name, filename, PANEL_PLUGINS_LIB_DIR_TAIL, LIBDIR); - } - #endif - -- path = g_module_build_path (PANEL_PLUGINS_LIB_DIR, module_name); -- found = g_file_test (path, G_FILE_TEST_EXISTS); -+ /* search for module */ -+ { -+ gchar *dirs_string; -+ gchar **dirs; -+ int i, j; -+ -+ dirs_string = (gchar *) g_getenv ("X_XFCE4_LIB_DIRS"); -+ if (!dirs_string) -+ dirs_string = LIBDIR; -+ dirs = g_strsplit (dirs_string, G_SEARCHPATH_SEPARATOR_S, 0); -+ -+ found = FALSE; -+ path = NULL; -+ -+ for (i = 0; !found && dirs[i] != NULL; i++) -+ for (j = 0; !found && j < G_N_ELEMENTS (plugins_lib_dir_tails); j++) -+ { -+ gchar *dir = g_strconcat (dirs[i], plugins_lib_dir_tails[j], NULL); -+ -+ g_free (path); -+ path = g_module_build_path (dir, module_name); -+ found = g_file_test (path, G_FILE_TEST_EXISTS); -+ g_free (dir); -+ } - -- if (!found) -- { -- /* deprecated location for module plugin directories */ -- g_free (path); -- path = g_module_build_path (PANEL_PLUGINS_LIB_DIR_OLD, module_name); -- found = g_file_test (path, G_FILE_TEST_EXISTS); -- } -+ g_strfreev (dirs); -+ } - - if (G_LIKELY (found)) - { ---- xfce4-panel-4.10.0/panel/panel-module-factory.c.orig 2012-04-28 16:31:35.000000000 -0400 -+++ xfce4-panel-4.10.0/panel/panel-module-factory.c 2014-12-13 23:55:27.439404812 -0500 -@@ -42,6 +42,11 @@ - #define PANEL_PLUGINS_DATA_DIR (DATADIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins") - #define PANEL_PLUGINS_DATA_DIR_OLD (DATADIR G_DIR_SEPARATOR_S "panel-plugins") - -+static const gchar *plugins_data_dir_tails[] = -+{ -+ (G_DIR_SEPARATOR_S "xfce4" G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins"), -+ (G_DIR_SEPARATOR_S "xfce4" G_DIR_SEPARATOR_S "panel-plugins") -+}; - - - static void panel_module_factory_finalize (GObject *object); -@@ -223,8 +228,22 @@ - panel_module_factory_load_modules (PanelModuleFactory *factory, - gboolean warn_if_known) - { -+ const gchar * const * system_data_dirs; -+ int i, j; -+ - panel_return_if_fail (PANEL_IS_MODULE_FACTORY (factory)); - -+ system_data_dirs = g_get_system_data_dirs (); -+ for (i = 0; system_data_dirs[i] != NULL; i++) -+ for (j = 0; j < G_N_ELEMENTS (plugins_data_dir_tails); j++) -+ { -+ gchar *dir; -+ -+ dir = g_strconcat (system_data_dirs[i], plugins_data_dir_tails[j], NULL); -+ panel_module_factory_load_modules_dir (factory, dir, warn_if_known); -+ g_free (dir); -+ } -+ - /* load from the new and old location */ - panel_module_factory_load_modules_dir (factory, PANEL_PLUGINS_DATA_DIR, warn_if_known); - panel_module_factory_load_modules_dir (factory, PANEL_PLUGINS_DATA_DIR_OLD, warn_if_known); diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index e6499987e4..0315179ecb 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -441,7 +441,7 @@ (define-public libxfce4windowing (define-public xfce4-panel (package (name "xfce4-panel") - (version "4.18.6") + (version "4.20.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -449,12 +449,17 @@ (define-public xfce4-panel name "-" version ".tar.bz2")) (sha256 (base32 - "0qkw1msrvq7hc4mjg9iai0kymgkrpj1nijv04zjbdfcbymhp2cr1")) - (patches (search-patches "xfce4-panel-plugins.patch")))) + "1f235lwmqavvsay9899gm7p2z3fdha6qgx05wczikhhnbmgwsczz")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases + (add-before 'configure 'patch-configure + (lambda _ + (substitute* "configure" + ;; XDG_CHECK_PACKAGE_BINARY requires an absolute path. + (("\\$PKG_CONFIG --variable=gdbus_codegen gio-2.0") + "type -p gdbus-codegen")))) (add-after 'unpack 'fix-tzdata-path (lambda* (#:key inputs #:allow-other-keys) (substitute* (string-append "plugins/clock/clock.c") @@ -470,15 +475,16 @@ (define-public xfce4-panel (inputs (list tzdata ;; For fix-tzdata-path phase only. exo - gtk+-2 xfconf garcon + gtk-layer-shell libwnck - libxfce4ui)) + libxfce4ui + libxfce4windowing)) (native-search-paths (list (search-path-specification - (variable "X_XFCE4_LIB_DIRS") - (files '("lib/xfce4"))))) + (variable "XDG_DATA_DIRS") + (files '("share"))))) (home-page "https://www.xfce.org/") (synopsis "Xfce desktop panel") (description -- 2.46.0