[bug#37121,17/40] gnu: xfce4-session: Update to 4.14.0.
diff mbox series

Message ID 20190820215043.32077-17-guix@lprndn.info
State New
Headers show
Series
  • [bug#37121,01/40] gnu: libxfce4util: Update to 4.14.0.
Related show

Commit Message

L p R n d n Aug. 20, 2019, 9:50 p.m. UTC
* gnu/packages/xfce.scm (xfce4-session): Update to 4.14.0.
[inputs] Add libwnck. Remove libwnck-2.
[source] Remove patch.

* gnu/packages/patches/xfce4-session-fix-xfclock4.patch: Delete file.
---
 .../patches/xfce4-session-fix-xflock4.patch   | 31 -------------------
 gnu/packages/xfce.scm                         |  9 ++----
 2 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100644 gnu/packages/patches/xfce4-session-fix-xflock4.patch

Patch
diff mbox series

diff --git a/gnu/packages/patches/xfce4-session-fix-xflock4.patch b/gnu/packages/patches/xfce4-session-fix-xflock4.patch
deleted file mode 100644
index 74769e4257..0000000000
--- a/gnu/packages/patches/xfce4-session-fix-xflock4.patch
+++ /dev/null
@@ -1,31 +0,0 @@ 
-From cbb9c769316b4d32956a2c78aa01a38b473f0cfc Mon Sep 17 00:00:00 2001
-From: David Thompson <dthompson2@worcester.edu>
-Date: Fri, 30 Oct 2015 08:30:43 -0400
-Subject: [PATCH] xflock4: Do not override PATH with hardcoded value.
-
-The PATH "/bin:/usr/bin" may not be a valid search path on the user's
-machine.  The screen locking program may be in /usr/local/bin or
-elsewhere.  Distros that do not conform to the FHS, such as GuixSD and
-NixOS, will not have their executables in either location.  Thus, we
-simply leave PATH alone.
----
- scripts/xflock4 | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/scripts/xflock4 b/scripts/xflock4
-index ec4d05d..e7981ac 100644
---- a/scripts/xflock4
-+++ b/scripts/xflock4
-@@ -21,9 +21,6 @@
- #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #
- 
--PATH=/bin:/usr/bin
--export PATH
--
- # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
- for lock_cmd in \
-     "xscreensaver-command -lock" \
--- 
-2.5.0
-
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index b8d2999468..6ab299e919 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -540,7 +540,7 @@  your system in categories, so you can quickly find and launch them.")
 (define-public xfce4-session
   (package
     (name "xfce4-session")
-    (version "4.12.1")
+    (version "4.14.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -548,10 +548,7 @@  your system in categories, so you can quickly find and launch them.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "1z88klls3j161n5snpamz4l3p4823q4h87wdnqikczxgs2ig5mwp"))
-              (patches
-               ;; See: https://bugzilla.xfce.org/show_bug.cgi?id=12282
-               (search-patches "xfce4-session-fix-xflock4.patch"))
+                "0gq4a8yiw58hb4d5dhvprxvzamqfg8qblmiqcw0b97mn9svnvyql"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -576,7 +573,7 @@  your system in categories, so you can quickly find and launch them.")
        ("upower" ,upower)
        ("polkit" ,polkit)
        ("libsm" ,libsm)
-       ("libwnck" ,libwnck-2)
+       ("libwnck" ,libwnck)
        ("libxfce4ui" ,libxfce4ui)))
     (home-page "https://www.xfce.org/")
     (synopsis "Xfce session manager")