From: iyzsong--- via Guix-patches via <guix-patches@gnu.org>
To: 74989@debbugs.gnu.org
Cc: 宋文武 <iyzsong@member.fsf.org>, "Zhu Zihao" <all_but_last@163.com>,
宋文武 <iyzsong@envs.net>
Subject: [bug#74989] [PATCH 11/23] gnu: xfdesktop: Update to 4.20.0.
Date: Fri, 20 Dec 2024 11:56:42 +0800 [thread overview]
Message-ID: <a32b4c6fa5592f42e4c20e1cdeb71086a57c4ffa.1734666530.git.iyzsong@member.fsf.org> (raw)
In-Reply-To: <cover.1734666530.git.iyzsong@member.fsf.org>
From: 宋文武 <iyzsong@member.fsf.org>
* 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
next prev parent reply other threads:[~2024-12-20 3:55 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-20 3:55 [bug#74989] [PATCH 00/23] xfce 4.20 updates iyzsong--- via Guix-patches via
2024-12-20 3:56 ` [bug#74989] [PATCH 01/23] gnu: xfce4-dev-tools: Update to 4.20.0 iyzsong--- via Guix-patches via
2024-12-20 3:56 ` [bug#74989] [PATCH 02/23] gnu: libxfce4util: " iyzsong--- via Guix-patches via
2024-12-20 3:56 ` [bug#74989] [PATCH 03/23] gnu: xfconf: " iyzsong--- via Guix-patches via
2024-12-20 3:56 ` [bug#74989] [PATCH 04/23] gnu: libxfce4ui: " iyzsong--- via Guix-patches via
2024-12-20 3:56 ` [bug#74989] [PATCH 05/23] gnu: elementary-xfce-icon-theme: Update to 0.20 iyzsong--- via Guix-patches via
2024-12-20 3:56 ` [bug#74989] [PATCH 06/23] gnu: exo: Update to 4.20.0 iyzsong--- via Guix-patches via
2024-12-20 3:56 ` [bug#74989] [PATCH 07/23] gnu: garcon: " iyzsong--- via Guix-patches via
2024-12-20 3:56 ` [bug#74989] [PATCH 08/23] gnu: tumbler: Update 4.20.0 iyzsong--- via Guix-patches via
2024-12-20 3:56 ` [bug#74989] [PATCH 09/23] gnu: Add libxfce4windowing iyzsong--- via Guix-patches via
2024-12-20 3:56 ` [bug#74989] [PATCH 10/23] gnu: xfce4-panel: Update to 4.20.0 iyzsong--- via Guix-patches via
2024-12-20 3:56 ` iyzsong--- via Guix-patches via [this message]
2024-12-20 3:56 ` [bug#74989] [PATCH 12/23] gnu: xfce4-session: " iyzsong--- via Guix-patches via
2024-12-20 3:56 ` [bug#74989] [PATCH 13/23] gnu: xfce4-settings: " iyzsong--- via Guix-patches via
2024-12-20 3:56 ` [bug#74989] [PATCH 14/23] gnu: xfce4-power-manager: " iyzsong--- via Guix-patches via
2024-12-20 3:56 ` [bug#74989] [PATCH 15/23] gnu: xfce4-pulseaudio-plugin: Update to 0.4.9 iyzsong--- via Guix-patches via
2024-12-20 3:56 ` [bug#74989] [PATCH 16/23] gnu: xfce4-appfinder: Update to 4.20.0 iyzsong--- via Guix-patches via
2024-12-20 3:56 ` [bug#74989] [PATCH 17/23] gnu: xfce4-session: " iyzsong--- via Guix-patches via
2024-12-20 3:56 ` [bug#74989] [PATCH 18/23] gnu: thunar: " iyzsong--- via Guix-patches via
2024-12-20 3:56 ` [bug#74989] [PATCH 19/23] gnu: thunar-volman: " iyzsong--- via Guix-patches via
2024-12-20 3:56 ` [bug#74989] [PATCH 20/23] gnu: xfwm4: " iyzsong--- via Guix-patches via
2024-12-20 3:56 ` [bug#74989] [PATCH 21/23] gnu: xfce4-dict: Update to 0.8.8 iyzsong--- via Guix-patches via
2024-12-20 3:56 ` [bug#74989] [PATCH 22/23] gnu: mousepad: Update to 0.6.3 iyzsong--- via Guix-patches via
2024-12-20 3:56 ` [bug#74989] [PATCH 23/23] gnu: xfce4-weather-plugin: Update to 0.11.3 iyzsong--- via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a32b4c6fa5592f42e4c20e1cdeb71086a57c4ffa.1734666530.git.iyzsong@member.fsf.org \
--to=guix-patches@gnu.org \
--cc=74989@debbugs.gnu.org \
--cc=all_but_last@163.com \
--cc=iyzsong@envs.net \
--cc=iyzsong@member.fsf.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).