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 cK3bAdfqZGdkHQAAe85BDQ:P1 (envelope-from ) for ; Fri, 20 Dec 2024 03:56:07 +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 cK3bAdfqZGdkHQAAe85BDQ (envelope-from ) for ; Fri, 20 Dec 2024 04:56:07 +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="i8H/EVGO"; 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=1734666966; 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=Qy1I2ujcYgDSZBLe4VNyA4oAVmy7+W5WmmooeKREWgE=; b=u3MdAXlgm262Wu18ii7E4WRxdRISyYDIUMTS79VId1tdQGBvT1MuOaigGlP9wh1e3OE6sF 3JsKevgoP8/skSf6fkw04utLzQmkG3AYlJ8XjR6wR/UhCeIUxJZ3eqvULclLlcOKdMJH9s ggWN2VOZOvKF9u/R2mHsPjqFcIEZF5n/0clVhC6rxpMcE+VhBorNFzqLNe/vvj901iHMtU tCW6Dpb4lcugrgYegqtv/PEAg7h5rHyFNs7SY0fW4dP9a/OmQHxiJmAMGXj9JUm7Nf+Iks barQgj2DR27GVC7nO0zmvdTAUqSyxs5h2Gitz89SM5DqOBnj1fsa3gde2ahTfQ== 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="i8H/EVGO"; 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=1734666966; a=rsa-sha256; cv=none; b=mxhDduS7ulTQMnbgz0b2YiIXjs52u6k2kO/glZjgOT+yzmko7I/0DyuG1RKTNB/UeXpRCL CqIbIH9qY9oUdRpEKsRgkKbRZVZooym17hkmEU9k/u1OcuJbXEuvODIYkqPlzO0loFKn/o BqRiAuZvsSnJKp+zhtPtVR5gjcdiZyqQtZiAc9dQ79S1Q74AzxqepT4UaPomq1KjfNCY0Y LWIqLlLwCDOTc/b3Csu5+KTTNOHVpoitvAAwTEm1MlvKurHy79SxR10GUzjR5z2UoAHYau 8W/dkqW5NXcgROd9MTWmM+4zLcDv0BqRrcBSOo8iPm5CqeeaPDye4CzDd/OveQ== 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 C15BA4136A for ; Fri, 20 Dec 2024 04:56:06 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOU6Z-0005qY-Qn; 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 1tOU6Y-0005oX-Bi for guix-patches@gnu.org; Thu, 19 Dec 2024 22:55:10 -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 1tOU6X-0001Xf-Os for guix-patches@gnu.org; Thu, 19 Dec 2024 22:55:10 -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=Qy1I2ujcYgDSZBLe4VNyA4oAVmy7+W5WmmooeKREWgE=; b=i8H/EVGOo0JFBLLXpG620O+SfoHYHD3kTqZ6cWG8IgjdEbpB51LwLtXlBxUoErbhkWfIdO2WbUbMfWXtHmChn/QpUeCBRJV0ZgIvT5K/nPqA6ZHWe0sy2WNjOo7IpRuKDRBxMDBC2BiWytlncBZCvR8cHFo9i+xosYDISyH1r4rFTRmTWZZwIbhh65fQvXYRuVrqd7SOrQPeIhr5vJMSUbFMpHGLbaXRJRCJ6XoWiYBBPEJtdwcQeuFK9fbAnrBhTYyRt9XpG3Z1ysi8Yy/dM9gCm9MLeRz8B1+rAv2RAn/G0/JZFNEAlhkB2hxjIHZjV6+j5M7oxRrxk2DQT19BmA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOU6X-0006hz-J2; Thu, 19 Dec 2024 22:55:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74989] [PATCH 13/23] gnu: xfce4-settings: 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:09 +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.173466688325519 (code B ref 74989); Fri, 20 Dec 2024 03:55:09 +0000 Received: (at 74989) by debbugs.gnu.org; 20 Dec 2024 03:54:43 +0000 Received: from localhost ([127.0.0.1]:41040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOU66-0006dM-OH for submit@debbugs.gnu.org; Thu, 19 Dec 2024 22:54:43 -0500 Received: from mail.envs.net ([5.199.136.28]:32978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOU60-0006cU-Tk for 74989@debbugs.gnu.org; Thu, 19 Dec 2024 22:54:37 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 801B738A3DCD; Fri, 20 Dec 2024 03:54:36 +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 nLiHPjRIgr2j; Fri, 20 Dec 2024 03:54:33 +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:26 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id f8588c02; Fri, 20 Dec 2024 03:57:09 +0000 (UTC) Date: Fri, 20 Dec 2024 11:56:44 +0800 Message-ID: <140adeb1bb25f00683f099765feee8b42191084c.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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -2.94 X-Spam-Score: -2.94 X-Migadu-Queue-Id: C15BA4136A X-TUID: lSm8TZHJLwus From: 宋文武 * gnu/packages/patches/xfce4-settings-defaults.patch: Adjust patch. * gnu/packages/xfce.scm (xfce4-settings): Update to 4.20.0. [arguments]: Use G-Expressions. Add 'patch-configure phase. [inputs]: Add gtk-layer-shell. [native-inputs]: Add glib:bin. Change-Id: I114e9605dafec5f3ab2b09618cfacd071464e5f7 --- .../patches/xfce4-settings-defaults.patch | 14 +++++------ gnu/packages/xfce.scm | 24 +++++++++++++------ 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/gnu/packages/patches/xfce4-settings-defaults.patch b/gnu/packages/patches/xfce4-settings-defaults.patch index ce5865c481..63976f4334 100644 --- a/gnu/packages/patches/xfce4-settings-defaults.patch +++ b/gnu/packages/patches/xfce4-settings-defaults.patch @@ -1,16 +1,14 @@ This patch make Xfce use "elementary-xfce-dark" as the default icon theme, "Greybird" as the default GTK theme and enable font antialias. - -diff -upr xfce4-settings-4.18.2.orig/xfsettingsd/xsettings.xml xfce4-settings-4.18.2/xfsettingsd/xsettings.xml ---- xfce4-settings-4.18.2.orig/xfsettingsd/xsettings.xml 2023-02-11 16:55:53.000000000 +0800 -+++ xfce4-settings-4.18.2/xfsettingsd/xsettings.xml 2023-05-14 19:20:43.919701586 +0800 +--- xfce4-settings-4.20.0/xfsettingsd/xsettings.xml.orig 2024-12-20 09:53:09.518493612 +0800 ++++ xfce4-settings-4.20.0/xfsettingsd/xsettings.xml 2024-12-20 09:55:15.506496473 +0800 @@ -6,8 +6,8 @@ -- -- +- +- + + @@ -19,12 +17,12 @@ diff -upr xfce4-settings-4.18.2.orig/xfsettingsd/xsettings.xml xfce4-settings-4. @@ -19,9 +19,9 @@ - + - + - + - + diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 925ea17d71..5fa84b4063 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -734,7 +734,7 @@ (define-public xfce4-session (define-public xfce4-settings (package (name "xfce4-settings") - (version "4.18.6") + (version "4.20.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -742,20 +742,30 @@ (define-public xfce4-settings name "-" version ".tar.bz2")) (sha256 (base32 - "1zkvcsgx3bnk8gwcgwg7656pw5p9a4xl1fv4divddv96c0dhbafr")) + "1ag5pimprxc12zgdbs27vngin97fc6l9ig7xzc0naacs8aiqsm13")) (patches (search-patches "xfce4-settings-defaults.patch")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--enable-pluggable-dialogs" - "--enable-sound-settings" - "--enable-upower-glib" - "--enable-xrandr"))) + (list #:configure-flags + #~(list "--enable-pluggable-dialogs" + "--enable-sound-settings" + "--enable-upower-glib" + "--enable-xrandr") + #: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"))))))) (native-inputs - (list pkg-config intltool)) + (list (list glib "bin") pkg-config intltool)) (inputs (list colord exo garcon + gtk-layer-shell libnotify libxcursor libxi -- 2.46.0