diff options
| author | 宋文武 <iyzsong@member.fsf.org> | 2024-12-20 11:43:12 +0800 |
|---|---|---|
| committer | 宋文武 <iyzsong@member.fsf.org> | 2024-12-22 14:08:47 +0800 |
| commit | b94eba693ec239e9c5411f71669b3e1d4ef5af3e (patch) | |
| tree | 13b1cb1e398827f6b49aae6de0760d551dad1c08 /gnu/packages | |
| parent | 9f292ed5423ccc5d05bcca15fa1a8614d4a82f66 (diff) | |
| download | guix-b94eba693ec239e9c5411f71669b3e1d4ef5af3e.tar.gz guix-b94eba693ec239e9c5411f71669b3e1d4ef5af3e.zip | |
gnu: xfce4-settings: Update to 4.20.0.
* 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
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/patches/xfce4-settings-defaults.patch | 14 | ||||
| -rw-r--r-- | 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 @@ <channel name="xsettings" version="1.0"> <property name="Net" type="empty"> -- <property name="ThemeName" type="empty"/> -- <property name="IconThemeName" type="empty"/> +- <property name="ThemeName" type="string" value="Adwaita"/> +- <property name="IconThemeName" type="string" value="Adwaita"/> + <property name="ThemeName" type="string" value="Greybird"/> + <property name="IconThemeName" type="string" value="elementary-xfce-dark"/> <property name="DoubleClickTime" type="int" value="400"/> @@ -19,12 +17,12 @@ diff -upr xfce4-settings-4.18.2.orig/xfsettingsd/xsettings.xml xfce4-settings-4. @@ -19,9 +19,9 @@ </property> <property name="Xft" type="empty"> - <property name="DPI" type="empty"/> + <property name="DPI" type="int" value="-1"/> - <property name="Antialias" type="int" value="-1"/> + <property name="Antialias" type="int" value="1"/> <property name="Hinting" type="int" value="-1"/> - <property name="HintStyle" type="string" value="hintnone"/> + <property name="HintStyle" type="string" value="hintfull"/> <property name="RGBA" type="string" value="none"/> - <!-- <property name="Lcdfilter" type="string" value="none"/> --> </property> + <property name="Gtk" type="empty"> diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 4a502d75a4..e58b96bd4d 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -731,7 +731,7 @@ allows you to shut down the computer from Xfce.") (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/" @@ -739,20 +739,30 @@ allows you to shut down the computer from Xfce.") 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 |