From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id GNspLs3qZGf5HAEAe85BDQ:P1 (envelope-from ) for ; Fri, 20 Dec 2024 03:55:57 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id GNspLs3qZGf5HAEAe85BDQ (envelope-from ) for ; Fri, 20 Dec 2024 04:55:57 +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=MNCjK5HE; 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=1734666957; 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=YrK+y3xhxQO5+YHsR6bW78KKJ76xL7h+yhYIDgxRh6o=; b=knuxDesfq+A1JAHZn7m+NKYegsbD2WJc0RVsqnO1QuCtsaP7+yGKDNYvZUMJ2HEP4lD+yE dTx2cSs4+/k8zJqiQyNVFRqxmeDf/v42RoQ9wWyYkNJ42iXOBZ4z1X2G5fcQQaI3trD1zF YTngcxfxhT68lTyvO0O2ZdTgkZBXk2xADEkDLKLqHY7JZ3PaylIczsWn2DbgmBKvbh2w27 6db+xFcnFWydY8DNT3KtaNR1aBLUAf7inn1cihyhwwojNTST46f6M2move6pbqzFqCuYeh WfYARZnIoABGbULaWPmOUg3VbWqzWp96jkv1u1UdiNVibicRfKkgApfVdIcuGw== 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=MNCjK5HE; 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=1734666957; a=rsa-sha256; cv=none; b=piopHXg+y4d5fHBWUWs2GiiFcb+E8zfBp/EeTy2BCGGVhAmSxhuoV3VnQovV/4Y62nv64P vp4PlERVC6/pvHWnhoaDLZEIxktAbw293myA6Nkfw2aQEHxlZ6oBgwEeZ0evn/0rsFOfe0 8Rt6XB8rfZGIBtXDVRYoYy0EfzZS+neb6yZWqRu09Rb9wIvGzUlr16YpcFpU79rQ3uupPl y/wlyYJoUy74r1pJACIBAaPpgs5BWM+ORdMwudZfvDefX6CGFbK/vqLG3iBbRebRoz2sRU a7clw+LUCY3NjXzLbu+Evr3gAjihayeTFe8Ga0qrrZbmLp+i1tCkGZMFGI2hoA== 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 926D932B4B for ; Fri, 20 Dec 2024 04:55:57 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOU6b-0005tY-Ur; Thu, 19 Dec 2024 22:55:13 -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-0005nL-Uf 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-0001X8-Kh 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=YrK+y3xhxQO5+YHsR6bW78KKJ76xL7h+yhYIDgxRh6o=; b=MNCjK5HEGrlwkLcbB9dLf9XhMwMy74gVQItH7xdhQNJuiw0JsEkJvPLFj/0OhPn1aEjDS2cjSoU6hvFhq46oHoJuxVGw3deEXgkAcWhN//tqqH5nWwQzwcViXQoVBygeSUIQJC2KB1X66aCxDLxx/qGzKLxzYGHUILPISGnyDO3VTUlakuvcxqZDv+zr0xPcie7uI4K6TQSTPJwOu+jvaCb6556H4L5ihYE3xmK0G948h8Tajvfe/THyAxgATcZd4IGT8XPFl5rZ41ig0VovDVWYGVXq0WFiGkQnUor9GzV/UFUl2nlBK9Vni36VI8Bzofdq5osc9eNlw5q0l/S9qw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOU6W-0006hf-Bk; Thu, 19 Dec 2024 22:55:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74989] [PATCH 11/23] gnu: xfdesktop: 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:08 +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.173466688225492 (code B ref 74989); Fri, 20 Dec 2024 03:55:08 +0000 Received: (at 74989) by debbugs.gnu.org; 20 Dec 2024 03:54:42 +0000 Received: from localhost ([127.0.0.1]:41035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOU65-0006cz-K0 for submit@debbugs.gnu.org; Thu, 19 Dec 2024 22:54:42 -0500 Received: from mail.envs.net ([5.199.136.28]:35524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOU5x-0006c0-IS for 74989@debbugs.gnu.org; Thu, 19 Dec 2024 22:54:34 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 2C17C38A3DCD; Fri, 20 Dec 2024 03:54:33 +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 SeqgUwYy2AqC; Fri, 20 Dec 2024 03:54:29 +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:24 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id cccd5081; Fri, 20 Dec 2024 03:57:09 +0000 (UTC) Date: Fri, 20 Dec 2024 11:56:42 +0800 Message-ID: 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: mx12.migadu.com X-Migadu-Spam-Score: -6.72 X-Spam-Score: -6.72 X-Migadu-Queue-Id: 926D932B4B X-TUID: nVpnaFMUtdZS From: 宋文武 * gnu/packages/xfce.scm (xfdesktop): Update to 4.20.0. [arguments]: Add 'patch-configure phase. Adjust 'prepare-background-image phase. [native-inputs]: Add glib:bin. [inputs]: Add gtk-layer-shell, libxfce4windowing and libyaml. Change-Id: Ic7f56f7d344b3bd40e0118f8890ece5a69a71e28 --- gnu/packages/xfce.scm | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 0315179ecb..4a502d75a4 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -67,6 +67,7 @@ (define-module (gnu packages xfce) #:use-module (gnu packages python-xyz) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages search) + #:use-module (gnu packages serialization) #:use-module (gnu packages sqlite) #:use-module (gnu packages textutils) #:use-module (gnu packages version-control) @@ -1020,7 +1021,7 @@ (define-public xfwm4-themes (define-public xfdesktop (package (name "xfdesktop") - (version "4.18.1") + (version "4.20.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -1028,7 +1029,7 @@ (define-public xfdesktop "xfdesktop-" version ".tar.bz2")) (sha256 (base32 - "0mpp9znpwkhp1h4cmpxhkhij1qgdr0fa6npzm4i7x1r51hcni4pg")) + "0cjnsrf7788vyq1mfcx4qypdhd9b2gqigj6yk6ffpwy7h2x42w12")) (modules '((guix build utils))) (snippet #~(begin @@ -1038,6 +1039,18 @@ (define-public xfdesktop (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") + (("\\$PKG_CONFIG --variable=glib_compile_resources gio-2.0") + "type -p glib-compile-resources") + (("\\$PKG_CONFIG --variable=glib_genmarshal glib-2.0") + "type -p glib-genmarshal") + (("\\$PKG_CONFIG --variable=glib_mkenums glib-2.0") + "type -p glib-mkenums")))) (add-before 'configure 'prepare-background-image (lambda _ ;; Stick a Guix logo in the background image. XXX: It @@ -1051,23 +1064,26 @@ (define-public xfdesktop "/tmp/guix.png" image "/tmp/final.jpg") (copy-file "/tmp/final.jpg" image)) - '(;; "backgrounds/xfce-blue.jpg" - "backgrounds/xfce-stripes.png" - "backgrounds/xfce-teal.jpg" - "backgrounds/xfce-verticals.png")) + '( ;; "backgrounds/xfce-blue.jpg" + "backgrounds/xfce-stripes.svg" + "backgrounds/xfce-teal.svg" + "backgrounds/xfce-verticals.svg")) #t))) #:disallowed-references (,inkscape/stable ,imagemagick))) (native-inputs - (list pkg-config intltool + (list (list glib "bin") pkg-config intltool ;; For our own ‘prepare-background-image’ phase. inkscape/stable imagemagick)) (inputs (list exo garcon + gtk-layer-shell libnotify libwnck libxfce4ui + libxfce4windowing + libyaml thunar)) (home-page "https://www.xfce.org/") (synopsis "Xfce desktop manager") -- 2.46.0