From 4213bee8de46cbf15cf0e6f9675a3f13c3dc9541 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Mon, 19 Apr 2021 18:26:31 +1000 Subject: gnu: Add mate-polkit-for-xfce. gnu/packages/xfce.scm (mate-polkit-for-xfce) New variable. Signed-off-by: Leo Prikler --- gnu/packages/xfce.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages/xfce.scm') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 38240d7b9f..c13bf58a59 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Jonathan Brielmaier ;;; Copyright © 2020, 2021 Michael Rohleder +;;; Copyright © 2021 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,6 +49,7 @@ #:use-module (gnu packages inkscape) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) + #:use-module (gnu packages mate) #:use-module (gnu packages pcre) #:use-module (gnu packages pdf) #:use-module (gnu packages photo) @@ -948,6 +950,23 @@ menubar and the window decorations are hidden) that helps you to save space on your desktop.") (license gpl2+))) +(define-public mate-polkit-for-xfce + (package/inherit mate-polkit + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'patch-desktop + (lambda* (#:key outputs #:allow-other-keys) + (let* ((common (string-append + (assoc-ref outputs "out") "/etc/xdg/autostart/" + "polkit-mate-authentication-agent-")) + (old (string-append common "1.desktop")) + (new (string-append common "for-xfce-1.desktop"))) + (substitute* old (("MATE;") "XFCE;")) + ;; To avoid a conflict if both MATE and XFCE are installed. + (rename-file old new))))))) + (properties `((hidden? . #t))))) + (define-public xfce (package (name "xfce") -- cgit v1.2.3 From a90c47b50e075aa831e134f77b6d26cbc3bed141 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Mon, 19 Apr 2021 20:16:05 +1000 Subject: gnu: xfce: Autostart mate-polkit. * gnu/packages/xfce.scm (xfce):[inputs]: Add mate-polkit-for-xfce. Signed-off-by: Leo Prikler --- gnu/packages/xfce.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/xfce.scm') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index c13bf58a59..cdb0c8adcd 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -990,6 +990,7 @@ on your desktop.") ("gnome-icon-theme" ,gnome-icon-theme) ("gtk-xfce-engine" ,gtk-xfce-engine) ("hicolor-icon-theme" ,hicolor-icon-theme) + ("mate-polkit-for-xfce" ,mate-polkit-for-xfce) ("ristretto" ,ristretto) ("shared-mime-info" ,shared-mime-info) ("thunar" ,thunar) -- cgit v1.2.3 From 289c5e7040b6bccd88d09b907be3492edb833791 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sat, 24 Apr 2021 12:25:24 +0200 Subject: gnu: xfce4-settings: Update to 4.16.1. * gnu/packages/xfce.scm (xfce4-settings): Update to 4.16.1. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xfce.scm') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index cdb0c8adcd..d8addd019e 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -727,7 +727,7 @@ allows you to shut down the computer from Xfce.") (define-public xfce4-settings (package (name "xfce4-settings") - (version "4.16.0") + (version "4.16.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -735,7 +735,7 @@ allows you to shut down the computer from Xfce.") name "-" version ".tar.bz2")) (sha256 (base32 - "1hnx88a8xmi38mdf5gxdvx7n8yax1vzah8hy8g37bijlqx7l18b7")) + "1iim6sbh58hjwdmwsdlbh9bdnrs2k98crapv3kdhwkd3gazf2a5v")) (patches (search-patches "xfce4-settings-defaults.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 69afc5fd2351b2665fdfa7db5b14a70ac96925ba Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 25 Apr 2021 18:04:19 +0200 Subject: gnu: xfdesktop: Add Guix logo to default background. * gnu/packages/xfce.scm (xfdesktop)[arguments]: In 'prepare-background-image' phase, add "xfce-verticals.png". --- gnu/packages/xfce.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/xfce.scm') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index d8addd019e..5782fa9eac 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -894,7 +894,8 @@ on the screen.") (copy-file "/tmp/final.jpg" image)) '(;; "backgrounds/xfce-blue.jpg" "backgrounds/xfce-stripes.png" - "backgrounds/xfce-teal.jpg")) + "backgrounds/xfce-teal.jpg" + "backgrounds/xfce-verticals.png")) #t))) #:disallowed-references (,inkscape ,imagemagick))) -- cgit v1.2.3 From c09e331b25e35dc435af67765a9bdb2e8f4aa296 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 25 Apr 2021 21:37:52 +0200 Subject: gnu: xfce, mate: Propagate 'font-dejavu'. Fixes . Reported by bo0od . This ensures applications such as IceCat can properly text (numbers in the case of IceCat). * gnu/packages/enlightenment.scm (enlightenment)[propagated-inputs]: Add FONT-DEJAVU. * gnu/packages/mate.scm (mate)[propagated-inputs]: New field. * gnu/packages/xfce.scm (xfce)[propagated-inputs]: New field. --- gnu/packages/enlightenment.scm | 6 +++++- gnu/packages/mate.scm | 5 ++++- gnu/packages/xfce.scm | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xfce.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 15ea89454f..079d60e45a 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -36,6 +36,7 @@ #:use-module (gnu packages code) #:use-module (gnu packages compression) #:use-module (gnu packages curl) + #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages fribidi) @@ -370,7 +371,10 @@ Libraries with some extra bells and whistles.") (propagated-inputs `(("efl" ,efl) ("libxkbcommon" ,libxkbcommon) - ("wayland-protocols" ,wayland-protocols))) + ("wayland-protocols" ,wayland-protocols) + + ;; Default font that applications such as IceCat require. + ("font-dejavu" ,font-dejavu))) (home-page "https://www.enlightenment.org/about-enlightenment") (synopsis "Lightweight desktop environment") (description diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 44420147a3..82b2d6e0fd 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2017 Nikita ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2019, 2020 Ludovic Courtès +;;; Copyright © 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2019 Guy Fleury Iteriteka ;;; Copyright © 2020 Jonathan Brielmaier ;;; Copyright © 2020 Mathieu Othacehe @@ -1580,6 +1580,9 @@ used to bring up authentication dialogs.") ("shared-mime-info" ,shared-mime-info) ("yelp" ,yelp) ("zenity" ,zenity))) + (propagated-inputs + ;; Default font that applications such as IceCat require. + `(("font-dejavu" ,font-dejavu))) (synopsis "The MATE desktop environment") (home-page "https://mate-desktop.org/") (description diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 5782fa9eac..299e39115a 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages calendar) #:use-module (gnu packages cdrom) + #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) @@ -1011,6 +1012,9 @@ on your desktop.") ("xfce4-clipman-plugin" ,xfce4-clipman-plugin) ("xfce4-pulseaudio-plugin" ,xfce4-pulseaudio-plugin) ("xfce4-xkb-plugin" ,xfce4-xkb-plugin))) + (propagated-inputs + ;; Default font that applications such as IceCat require. + `(("font-dejavu" ,font-dejavu))) (native-search-paths ;; For finding panel plugins. (package-native-search-paths xfce4-panel)) -- cgit v1.2.3 From 85ead8f75151d6dc403fcb5a45a167e72c737217 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 24 Apr 2021 17:27:04 +0200 Subject: gnu: exo: Update to 4.16.2. * gnu/packages/xfce.scm (exo): Update to 4.16.2. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xfce.scm') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 299e39115a..9655d8ccf7 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -316,7 +316,7 @@ upstream occasionally.") (define-public exo (package (name "exo") - (version "4.16.1") + (version "4.16.2") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -324,7 +324,7 @@ upstream occasionally.") "exo-" version ".tar.bz2")) (sha256 (base32 - "0fxm2aczzbi0z4y6x24934964y9jg4cl4frvlnjc5zqmccjsr3aj")))) + "17cybaml221jnw99aig3zajg2kbnn87p5sycj68wpwgvd99zb2af")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From ed9d890e0e24b10df6f170fe7c9635151e0423c1 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 18 Apr 2021 16:23:26 +1000 Subject: gnu: xfce4-settings: Add gsettings-desktop-schemas. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (xfce4-settings):[propagated-inputs]: Add gsettings-desktop-schemas. This makes it appear in the system profile via the xfce service. This fixes a bug where changing icon theme causes xfce4-appearance-settings to crash with the error: GLib-GIO-ERROR **: 15:41:45.828: Settings schema 'org.gnome.desktop.interface' is not installed Trace/breakpoint trap Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages/xfce.scm') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 9655d8ccf7..0147c48630 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -758,6 +758,10 @@ allows you to shut down the computer from Xfce.") ("upower" ,upower) ;; TODO needs upower-glib ("python" ,python) ;; for xfce4-compose-mail ("xf86-input-libinput" ,xf86-input-libinput))) + (propagated-inputs + ;; Some operations, such as changing icon themes, require these schemas + ;; to be in the search path. + `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) (home-page "https://www.xfce.org/") (synopsis "Xfce settings manager") (description -- cgit v1.2.3 From 8f36967e0ef34e73ae2d0a9975fd89d9f240c7ba Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 7 May 2021 15:45:17 +0200 Subject: gnu: thunar: Update to 4.16.7. * gnu/packages/xfce.scm (thunar): Update to 4.16.7. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xfce.scm') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 0147c48630..9caf78d11c 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -772,7 +772,7 @@ like appearance, display, keyboard and mouse settings.") (define-public thunar (package (name "thunar") - (version "4.16.6") + (version "4.16.7") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -780,7 +780,7 @@ like appearance, display, keyboard and mouse settings.") "thunar-" version ".tar.bz2")) (sha256 (base32 - "1dq238m2bh938gpb058cr2xmhy6f3qkyyya9l0ya95kiwqzislyb")))) + "0qlgy25wgmrddiac3sq61di2rmys1pqgyjg0r3d6rmpw51kxsvgv")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 71e95229043627c01cd2b34e7de58053053e9253 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 7 May 2021 18:00:29 +0200 Subject: gnu: xfce4-clipman-plugin: Update to 1.6.2. * gnu/packages/xfce.scm (xfce4-clipman-plugin): Update to 1.6.2. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xfce.scm') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 9caf78d11c..a0dcf79655 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -495,7 +495,7 @@ applications menu, workspace switcher and more.") (define-public xfce4-clipman-plugin (package (name "xfce4-clipman-plugin") - (version "1.6.1") + (version "1.6.2") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -503,7 +503,7 @@ applications menu, workspace switcher and more.") "xfce4-clipman-plugin-" version ".tar.bz2")) (sha256 (base32 - "1d6fxdzy9b511hqcyj7825fx67q6zqk6cln4g3x9d498jrvk3s5k")))) + "1f4rjdvyplfkrdqg9179chzxx18k3lx29674j28piccgyvk5z2mb")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 3b69c308566f548cd93599e4c0871912c8e4bc18 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Thu, 6 May 2021 12:34:55 +1000 Subject: gnu: xfce4-session: Allow xflock4 to use xset. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (xfce4-session): [inputs]: Add xset. [arguments]: Add 'patch-xflock' phase to use exact store path to 'xset' in 'xflock4'. Co-authored-by: Ludovic Courtès --- gnu/packages/xfce.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xfce.scm') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index a0dcf79655..704e50e7ed 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -707,7 +707,14 @@ your system in categories, so you can quickly find and launch them.") (list (string-append "--with-xsession-prefix=" %output)) ;; Disable icon cache update. #:make-flags - '("gtk_update_icon_cache=true"))) + '("gtk_update_icon_cache=true") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-xflock + (lambda* (#:key inputs #:allow-other-keys) + (let ((xset (assoc-ref inputs "xset"))) + (substitute* "scripts/xflock4" + (("xset") (string-append xset "/bin/xset"))))))))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) @@ -717,7 +724,8 @@ your system in categories, so you can quickly find and launch them.") ("polkit" ,polkit) ("libsm" ,libsm) ("libwnck" ,libwnck) - ("libxfce4ui" ,libxfce4ui))) + ("libxfce4ui" ,libxfce4ui) + ("xset" ,xset))) (home-page "https://www.xfce.org/") (synopsis "Xfce session manager") (description -- cgit v1.2.3 From a4b4331de00961494834e8c0fb6a958d2bf0ba91 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 9 May 2021 14:25:25 +0200 Subject: gnu: thunar: Update to 4.16.8. * gnu/packages/xfce.scm (thunar): Update to 4.16.8. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xfce.scm') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 704e50e7ed..634b6b0784 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -780,7 +780,7 @@ like appearance, display, keyboard and mouse settings.") (define-public thunar (package (name "thunar") - (version "4.16.7") + (version "4.16.8") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -788,7 +788,7 @@ like appearance, display, keyboard and mouse settings.") "thunar-" version ".tar.bz2")) (sha256 (base32 - "0qlgy25wgmrddiac3sq61di2rmys1pqgyjg0r3d6rmpw51kxsvgv")))) + "159ircj0mahx54fqsr3l3ynk690zlpc6ar5pnyhhpk90s8la5303")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From f661e6883ec345258634940ce5d52957e1bb90c3 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 9 May 2021 14:16:48 +0200 Subject: gnu: xfce4-panel: Update to 4.16.3. * gnu/packages/xfce.scm (xfce4-panel): Update to 4.16.3. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xfce.scm') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 634b6b0784..7711b567ca 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -416,7 +416,7 @@ management D-Bus specification.") (define-public xfce4-panel (package (name "xfce4-panel") - (version "4.16.2") + (version "4.16.3") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -424,7 +424,7 @@ management D-Bus specification.") name "-" version ".tar.bz2")) (sha256 (base32 - "1kxm905z6m0mvnki7qxwz638kfa93lvy5xv3qfp8sc8ldxp1cd46")) + "14p0y6d3frphv67vsvnx6c1l4m82c1wwsk3kkg155nknibnyld2r")) (patches (search-patches "xfce4-panel-plugins.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3