[bug#37121] [PATCH 00/40] Update Xfce to 4.14

[bug#37121] [PATCH 00/40] Update Xfce to 4.14

[L p R n d n]

Hello,

Here is my take on updating xfce to 4.14.
The update switches Xfce to gtk-3 but gtk-2 compatibility is kept.
Also there a few changes to add or clarify some features like vala API
or gobject introspection.
Testing is welcome.
Most changes are trivial but libxklavier's update might need some
rework.

Thanks,

L  p R n  d n

[bug#37121] [PATCH 01/40] gnu: libxfce4util: Update to 4.14.0.

[L p R n d n]

* gnu/packages/xfce.scm (libxfce4util): Update to 4.14.0.
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 93c36dac1e..f8bb191404 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -86,7 +86,7 @@
 (define-public libxfce4util
   (package
     (name "libxfce4util")
-    (version "4.12.1")
+    (version "4.14.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://archive.xfce.org/xfce/"
@@ -94,7 +94,7 @@
                                   "/src/" name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "07c8r3xwx5is298zk77m3r784gmr5y4mh8bbca5zdjqk5vxdwsw7"))))
+                "093338faqqsrlc8dkmzr7qv411ysxczg1wlg7s3gvhrfk6vpkb9j"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-- 
2.22.0

[bug#37121] [PATCH 02/40] gnu: libxfce4util: Add gobject-introspection support.

[L p R n d n]

* gnu/packages/xfce.scm (libxfce4util): Add gobject-introspection to native-inputs.
---
 gnu/packages/xfce.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index f8bb191404..dd8c832579 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -98,6 +98,7 @@
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
+       ("gobject-introspection" ,gobject-introspection)
        ("intltool" ,intltool)))
     (propagated-inputs `(("glib" ,glib))) ; required by libxfce4util-1.0.pc
     (home-page "https://www.xfce.org/")
-- 
2.22.0

[bug#37121] [PATCH 03/40] gnu: xfconf: Update to 4.14.1.

[L p R n d n]

* gnu/packages/xfce.scm (xfconf): Update to 4.14.1.
* gnu/packages/xfce.csm (xfconf): Add glib:bin to native-inputs.
---
 gnu/packages/xfce.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index dd8c832579..32918ef451 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -111,7 +111,7 @@ Xfce Desktop Environment.")
 (define-public xfconf
   (package
     (name "xfconf")
-    (version "4.12.1")
+    (version "4.14.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -119,7 +119,7 @@ Xfce Desktop Environment.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "0dns190bwb615wy9ma2654sw4vz1d0rcv061zmaalkv9wmj8bx1m"))))
+                "0n8d55c98ff7wgwv3qa4g369sv4iasgm1w62zq10kq5f56iy14xq"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases
@@ -137,7 +137,9 @@ Xfce Desktop Environment.")
          (delete 'check))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("intltool" ,intltool)))
+       ("intltool" ,intltool)
+       ("glib:bin" ,glib "bin")         ;; for gdbus-codegen
+       ))
     (propagated-inputs
      ;; libxfconf-0.pc refers to all these.
      `(("glib" ,glib)
-- 
2.22.0

[bug#37121] [PATCH 04/40] gnu: xfconf: Add support for gobject-introspection.

[L p R n d n]

* gnu/packages/xfce.scm (xfconf): Add gobject-introspection to native-inputs.
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 32918ef451..fea5d68327 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -138,8 +138,8 @@ Xfce Desktop Environment.")
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)
-       ("glib:bin" ,glib "bin")         ;; for gdbus-codegen
-       ))
+       ("glib:bin" ,glib "bin") ;; for gdbus-codegen
+       ("gobject-introspection" ,gobject-introspection)))
     (propagated-inputs
      ;; libxfconf-0.pc refers to all these.
      `(("glib" ,glib)
-- 
2.22.0

[bug#37121] [PATCH 05/40] gnu: xfconf: Add vala support.

[L p R n d n]

* gnu/packages/xfce.scm (xfconf): Add vala to native-inputs.
---
 gnu/packages/xfce.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index fea5d68327..146fa00e7f 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -139,7 +139,8 @@ Xfce Desktop Environment.")
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)
        ("glib:bin" ,glib "bin") ;; for gdbus-codegen
-       ("gobject-introspection" ,gobject-introspection)))
+       ("gobject-introspection" ,gobject-introspection)
+       ("vala" ,vala)))
     (propagated-inputs
      ;; libxfconf-0.pc refers to all these.
      `(("glib" ,glib)
-- 
2.22.0

[bug#37121] [PATCH 06/40] gnu: libxfce4ui: Update to 4.14.1.

[L p R n d n]

* gnu/packages/xfce.scm (libxfce4ui): Update to 4.14.1.
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 146fa00e7f..eae74acbfb 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -158,7 +158,7 @@ storage system.")
 (define-public libxfce4ui
   (package
     (name "libxfce4ui")
-    (version "4.12.1")
+    (version "4.14.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -166,7 +166,7 @@ storage system.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "0hzzhiiwmqsrbv17nninhs2x1b8ck0ym85jck2xphx5ypw8rhq9x"))))
+                "1npjhznmnckhnylsv3l7p1zvhckhmp9d7vifs8w12kdfmrg0fjf4"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-- 
2.22.0

[bug#37121] [PATCH 07/40] gnu: libxfce4ui: Add gobject-introspection support.

[L p R n d n]

* gnu/packages/xfce.scm (libxfce4ui): Add gobject-introspection to native-inputs.
---
 gnu/packages/xfce.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index eae74acbfb..dda40ff72f 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -170,7 +170,8 @@ storage system.")
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("intltool" ,intltool)))
+       ("intltool" ,intltool)
+       ("gobject-introspection" ,gobject-introspection)))
     (propagated-inputs
      `(("gtk+-3" ,gtk+)    ; required by libxfce4ui-2.pc
        ;; libxfce4kbd-private-2.pc refers to all these.
-- 
2.22.0

[bug#37121] [PATCH 08/40] gnu: libxfce4ui: Add vendor.

[L p R n d n]

* gnu/packages/xfce.scm (libxfce4ui)[arguments]: Add #:configure-flags.
---
 gnu/packages/xfce.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index dda40ff72f..f624e87f51 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -168,6 +168,9 @@ storage system.")
                (base32
                 "1npjhznmnckhnylsv3l7p1zvhckhmp9d7vifs8w12kdfmrg0fjf4"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags
+       (list "--with-vendor-info=Guix")))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)
-- 
2.22.0

[bug#37121] [PATCH 09/40] gnu: exo: Update to 0.12.8.

[L p R n d n]

* gnu/packages/xfce.scm (exo): Update to 0.12.8.
[propagated-inputs] Add gtk+-3. Remove gtk+-2.
[inputs] Add gtk+-2.
---
 gnu/packages/xfce.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index f624e87f51..8238df91b9 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -196,7 +196,7 @@ to share commonly used Xfce widgets among the Xfce applications.")
 (define-public exo
   (package
     (name "exo")
-    (version "0.12.6")
+    (version "0.12.8")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -204,17 +204,19 @@ to share commonly used Xfce widgets among the Xfce applications.")
                                   "exo-" version ".tar.bz2"))
               (sha256
                (base32
-                "00qh8ihrf09jvd26kilybihkgvv6rvi0l1bvlldxc99jb7ygy5ql"))))
+                "1ppwi6n40aphh0dqsnfrk234zsp7pl4lkjnspqjxw7m49bka401l"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)))
     (propagated-inputs
-     ;; exo-1.pc refers to all these.
-     `(("gtk+" ,gtk+-2)
+     ;; exo-2.pc refers to all these.
+     `(("gtk+-3" ,gtk+)
        ("libxfce4util" ,libxfce4util)))
     (inputs
-     `(("libxfce4ui" ,libxfce4ui)
+     `(;; FIXME Refered to in exo-1.pc but conflict with gtk+-3
+       ("gtk+-2" ,gtk+-2)
+       ("libxfce4ui" ,libxfce4ui)
        ("perl-uri" ,perl-uri)))
     (home-page "https://www.xfce.org/")
     (synopsis "Extension library for Xfce")
-- 
2.22.0

[bug#37121] [PATCH 10/40] gnu: garcon: Update to 0.6.4.

[L p R n d n]

* gnu/packages/xfce.scm (garcon): Update to 0.6.4.
[inputs] Rename gtk+ to gtk+-2.
[propagated-inputs] Add gtk+-3.
---
 gnu/packages/xfce.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 8238df91b9..09ff788d8e 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -230,7 +230,7 @@ development.")
 (define-public garcon
   (package
     (name "garcon")
-    (version "0.6.3")
+    (version "0.6.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -238,16 +238,17 @@ development.")
                                   "garcon-" version ".tar.bz2"))
               (sha256
                (base32
-                "00c4g4gmbr8710k0yv1zybnm9s2gkc1rj63zfrg9qgin66jzxcbn"))))
+                "0bbngb4bn1m325j7y40gky36kn2nlsvqs6xp0wy76x3s0d9lfpnp"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)
        ("glib:bin" ,glib "bin")))
     (inputs
-     `(("gtk+" ,gtk+-2)))
+     `(("gtk+-2" ,gtk+-2))); required by garcon-gtk2-1.pc
     (propagated-inputs
-     `(("libxfce4ui" ,libxfce4ui))) ; required by garcon-gtk2-1.pc
+     `(("gtk+-3" ,gtk+)                 ; required by garcon-gtk3-1.pc
+       ("libxfce4ui" ,libxfce4ui))) ; required by garcon-gtk3-1.pc
     (home-page "https://www.xfce.org/")
     (synopsis "Implementation of the freedesktop.org menu specification")
     (description
-- 
2.22.0

[bug#37121] [PATCH 11/40] gnu: tumbler: Update to 0.2.7.

[L p R n d n]

* gnu/packages/xfce.scm (tumbler): Update to 0.2.7.
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 09ff788d8e..f6b3e2dc5d 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -261,7 +261,7 @@ merging features essential for loading menus modified with menu editors.")
 (define-public tumbler
   (package
     (name "tumbler")
-    (version "0.2.5")
+    (version "0.2.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -269,7 +269,7 @@ merging features essential for loading menus modified with menu editors.")
                                   "tumbler-" version ".tar.bz2"))
               (sha256
                (base32
-                "0nfld1lvrdpsjfvm08y5487km45pm1mdr928hgqm8j0shrx6jiv4"))))
+                "1r0l0ghcrj71ax7yil1m4p7yjrfqm3icx0s8r7ivwv3i2rgw617p"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-- 
2.22.0

[bug#37121] [PATCH 12/40] gnu: tumbler: Fix pdf thumbnailer.

[L p R n d n]

* gnu/packages/xfce.scm (tumbler)[inputs]: Add cairo.
---
 gnu/packages/xfce.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index f6b3e2dc5d..d749002a05 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -281,6 +281,7 @@ merging features essential for loading menus modified with menu editors.")
     (inputs
      `(("dbus" ,dbus)
        ("gdk-pixbuf" ,gdk-pixbuf)
+       ("cairo" ,cairo) ;; Needed for pdf thumbnails (poppler-glibc.pc)
        ("freetype" ,freetype)
        ("libjpeg" ,libjpeg)
        ("libgsf" ,libgsf)
-- 
2.22.0

[bug#37121] [PATCH 13/40] gnu: tumbler: Remove unused gstreamer.

[L p R n d n]

* gnu/packages/xfce.scm (tumbler)[inputs]: Remove gstreamer.
---
 gnu/packages/xfce.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index d749002a05..1a3f08eb93 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -286,7 +286,9 @@ merging features essential for loading menus modified with menu editors.")
        ("libjpeg" ,libjpeg)
        ("libgsf" ,libgsf)
        ("poppler" ,poppler)
-       ("gstreamer" ,gstreamer)))
+       ;; FIXME Provide gstreamer and gstreamer-tag to get video thumbnails
+       ;; ("gstreamer" ,gstreamer)
+       ))
     (home-page "https://www.xfce.org/")
     (synopsis "D-Bus service for applications to request thumbnails")
     (description
-- 
2.22.0

[bug#37121] [PATCH 14/40] gnu: xfce4-panel: Update to 4.14.0.

[L p R n d n]

* gnu/packages/xfce.scm (xcfe4-panel): Update to 4.14.0
[arguments] Remove #:configure-flags
[native-inputs] Add glib:bin.
[inputs] Add gtk+-2, libwnck and xfconf. Remove libwnck-2.
[propagated-inputs] Add gtk+-3.
---
 gnu/packages/xfce.scm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 1a3f08eb93..56477adc0b 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -300,7 +300,7 @@ management D-Bus specification.")
 (define-public xfce4-panel
   (package
     (name "xfce4-panel")
-    (version "4.12.2")
+    (version "4.14.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -308,20 +308,22 @@ management D-Bus specification.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "1s8cvsrgmkmmm84g6mghpj2k4777gm22g5lrsf8pdy5qh6xql1a2"))
+                "1x3flv86jh9vqah7mr5mmfx2991mc6icsqjygsc3j88lgsyz7y6m"))
               (patches (search-patches "xfce4-panel-plugins.patch"))))
     (build-system gnu-build-system)
-    (arguments
-     '(#:configure-flags '("--enable-gtk3")))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("intltool" ,intltool)))
+       ("intltool" ,intltool)
+       ("glib:bin" ,glib "bin")))
     (propagated-inputs
-     `(("libxfce4util" ,libxfce4util))) ; required by libxfce4panel-1.0.pc
+     `(("gtk+-3" ,gtk+)                 ; required by libxfce4panel-2.0.pc
+       ("libxfce4util" ,libxfce4util))) ; required by libxfce4panel-2.0.pc
     (inputs
      `(("exo" ,exo)
+       ("gtk+-2" ,gtk+-2)
+       ("xfconf" ,xfconf)
        ("garcon" ,garcon)
-       ("libwnck" ,libwnck-2)
+       ("libwnck" ,libwnck)
        ("libxfce4ui" ,libxfce4ui)))
     (native-search-paths
      (list (search-path-specification
-- 
2.22.0

[bug#37121] [PATCH 15/40] gnu: xfce4-panel: Fix tzdata path.

[L p R n d n]

* gnu/packages/xfce.scm (xfce4-panel)[inputs]: Add tzdata.
[arguments] Add Fix-tzdata-path phase.
---
 gnu/packages/xfce.scm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 56477adc0b..24e95fe36e 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -37,6 +37,7 @@
   #:use-module (guix build-system trivial)
   #:use-module (gnu artwork)
   #:use-module (gnu packages)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages calendar)
   #:use-module (gnu packages cdrom)
   #:use-module (gnu packages pkg-config)
@@ -311,6 +312,15 @@ management D-Bus specification.")
                 "1x3flv86jh9vqah7mr5mmfx2991mc6icsqjygsc3j88lgsyz7y6m"))
               (patches (search-patches "xfce4-panel-plugins.patch"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'Fix-tzdata-path
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* (string-append "plugins/clock/clock.c")
+               (("/usr/share/zoneinfo")
+                (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")))
+             #t)))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)
@@ -319,7 +329,8 @@ management D-Bus specification.")
      `(("gtk+-3" ,gtk+)                 ; required by libxfce4panel-2.0.pc
        ("libxfce4util" ,libxfce4util))) ; required by libxfce4panel-2.0.pc
     (inputs
-     `(("exo" ,exo)
+     `(("tzdata" ,tzdata) ;; For Fix-tzdata-path phase only.
+       ("exo" ,exo)
        ("gtk+-2" ,gtk+-2)
        ("xfconf" ,xfconf)
        ("garcon" ,garcon)
-- 
2.22.0

[bug#37121] [PATCH 16/40] gnu: xfce4-appfinder: Update to 4.14.0.

[L p R n d n]

* gnu/packages/xfce.scm (xfce4-appfinder): Update to 4.14.0.
[inputs] Updte gtk+ from gtk+-2 to gtk+.
---
 gnu/packages/xfce.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 24e95fe36e..b8d2999468 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -513,7 +513,7 @@ per window.")
 (define-public xfce4-appfinder
   (package
     (name "xfce4-appfinder")
-    (version "4.12.0")
+    (version "4.14.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://archive.xfce.org/xfce/"
@@ -521,14 +521,14 @@ per window.")
                                   "/src/" name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "0ry5hin8xhgnkmm9vs7jq8blk1cnbyr0s18nm1j6nsm7360abm1a"))))
+                "162dibl6ipp72x0s35yhk7kkzxd4qimagg5zdkkv5kjgjpa7bhby"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)))
     (inputs
      `(("garcon" ,garcon)
-       ("gtk+" ,gtk+-2)
+       ("gtk+" ,gtk+)
        ("libxfce4ui" ,libxfce4ui)))
     (home-page "https://www.xfce.org/")
     (synopsis "Xfce application finder")
-- 
2.22.0

[bug#37121] [PATCH 17/40] gnu: xfce4-session: Update to 4.14.0.

[L p R n d n]

* 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

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")
-- 
2.22.0

[bug#37121] [PATCH 18/40] gnu: xfce4-settings: Update to 4.14.0.

[L p R n d n]

* gnu/packages/xfce.scm (xfce4-settings): Update to 4.14.0.
[arguments] Add #:configure flags.
---
 gnu/packages/xfce.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 6ab299e919..a7a6524c0a 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -55,6 +55,7 @@
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages polkit)
   #:use-module (gnu packages gstreamer)
+  #:use-module (gnu packages libcanberra)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages photo)
   #:use-module (gnu packages pcre)
@@ -585,7 +586,7 @@ allows you to shutdown the computer from Xfce.")
 (define-public xfce4-settings
   (package
     (name "xfce4-settings")
-    (version "4.12.4")
+    (version "4.14.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://archive.xfce.org/src/xfce/"
@@ -593,9 +594,13 @@ allows you to shutdown the computer from Xfce.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "16vgidhhc19dz0p0i6fp5iiwxd53ky143j6h14a9b7mz92nlr872"))
+                "0g0ipkg2fyg8r1z95ynx0xjr78bp49c2dwh4mli05nmb4gb40c70"))
               (patches (search-patches "xfce4-settings-defaults.patch"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags '("--enable-pluggable-dialogs"
+                           "--enable-sound-settings"
+                           "--enable-xrandr")))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)))
-- 
2.22.0

[bug#37121] [PATCH 19/40] gnu: Thunar: Update to 1.8.9.

[L p R n d n]

* gnu/packages/xfce.scm (thunar): Update to 1.8.9.
[propagated-inputs] Add gtk+.
---
 gnu/packages/xfce.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index a7a6524c0a..84cbb1784f 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -625,7 +625,7 @@ like appearance, display, keyboard and mouse settings.")
 (define-public thunar
   (package
     (name "thunar")
-    (version "1.8.7")
+    (version "1.8.9")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://archive.xfce.org/src/xfce/"
@@ -633,11 +633,14 @@ like appearance, display, keyboard and mouse settings.")
                                   "Thunar-" version ".tar.bz2"))
               (sha256
                (base32
-                "0afkp528mwwa2m18m39mvw53qgaijyynrw9wwwiyxgjiczq3l0ry"))))
+                "1fah2d7v3a7fp28xa5wv896rap1iad9q9y04qchca09mq1x8wxbs"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)))
+    (propagated-inputs
+     ;; Required by thunarx-3.pc
+     `(("gtk+" ,gtk+)))
     (inputs
      `(("exo" ,exo)
        ("libexif" ,libexif)
-- 
2.22.0

[bug#37121] [PATCH 20/40] gnu: Thunar: Add gobject-introspection support.

[L p R n d n]

* gnu/packages/xfce.scm (thunar)[native-inputs]: Add gobject-introspection.
---
 gnu/packages/xfce.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 84cbb1784f..6323bfa90c 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -637,6 +637,7 @@ like appearance, display, keyboard and mouse settings.")
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
+       ("gobject-introspection" ,gobject-introspection)
        ("intltool" ,intltool)))
     (propagated-inputs
      ;; Required by thunarx-3.pc
-- 
2.22.0

[bug#37121] [PATCH 21/40] gnu: thunar-volman: Update to 0.9.5.

[L p R n d n]

* gnu/packages/xfce.scm (thunar-volman): Update to 0.9.5.
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 6323bfa90c..7622c24fa0 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -661,7 +661,7 @@ fast.")
 (define-public thunar-volman
   (package
     (name "thunar-volman")
-    (version "0.9.3")
+    (version "0.9.5")
     (source
      (origin
        (method url-fetch)
@@ -669,7 +669,7 @@ fast.")
                            (version-major+minor version) "/"
                            "thunar-volman-" version ".tar.bz2"))
        (sha256
-        (base32 "1sfmz40164rg77hclrkrgnbk8cb7f325qqi7lz2hh3wbvf8r0c19"))))
+        (base32 "0dqqkbhn43hhmhqyx1fnmawpvysdjzw6ln4ryf629wil6dlwd9vy"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-- 
2.22.0

[bug#37121] [PATCH 22/40] gnu: xfwm4: Update to 4.14.0.

[L p R n d n]

* gnu/packages/xfce.scm (xfwm4): Update to 4.14.0.
[inputs] Add libwnck. Remove libwnck-2.
---
 gnu/packages/xfce.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 7622c24fa0..2ef67e6afe 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -692,7 +692,7 @@ and import the new pictures from your camera.")
 (define-public xfwm4
   (package
     (name "xfwm4")
-    (version "4.12.5")
+    (version "4.14.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -700,14 +700,14 @@ and import the new pictures from your camera.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "1jnav0wcqlswl2v7nh61big9czg5hmnyvrvm6812sv362qic0xbp"))))
+                "05dn4a1i0nm6wm3nyj7qli5bvfalxghcl7x543qr5l33vkw2n65l"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)))
     (inputs
      `(("libdrm" ,libdrm)
-       ("libwnck" ,libwnck-2)
+       ("libwnck" ,libwnck)
        ("libxcomposite" ,libxcomposite)
        ("libxdamage" ,libxdamage)
        ("libxfce4ui" ,libxfce4ui)
-- 
2.22.0

[bug#37121] [PATCH 23/40] gnu: xfdesktop: Update to 4.14.1.

[L p R n d n]

* gnu/packages/xfce.scm (xfdesktop): Update to 4.14.1.
[inputs] Add libwnck. Remove libwnck-2.
---
 gnu/packages/xfce.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 2ef67e6afe..72f01f2117 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -722,7 +722,7 @@ on the screen.")
 (define-public xfdesktop
   (package
     (name "xfdesktop")
-    (version "4.12.4")
+    (version "4.14.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -730,7 +730,7 @@ on the screen.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "1jzi851arljq5lza9inyq4ss513l62lbzbfm64a7x4320m8kb2h9"))
+                "10pqxgpj7b57wpcsh2k98sj4aavcgxbs1lc8qsq4mibf4hba01gp"))
               (modules '((guix build utils)))
               (snippet
                #~(begin
@@ -768,7 +768,7 @@ on the screen.")
      `(("exo" ,exo)
        ("garcon" ,garcon)
        ("libnotify" ,libnotify)
-       ("libwnck" ,libwnck-2)
+       ("libwnck" ,libwnck)
        ("libxfce4ui" ,libxfce4ui)
        ("thunar" ,thunar)))
     (home-page "https://www.xfce.org/")
-- 
2.22.0

[bug#37121] [PATCH 24/40] gnu: xfce4-power-manager: Update to 1.6.5.

[L p R n d n]

* gnu/packages/xfce.scm (xfce4-power-manager): Update to 4.6.5.
[inputs] Add gtk+. Remove gtk+-2.
---
 gnu/packages/xfce.scm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 72f01f2117..530f2cc116 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -864,7 +864,7 @@ system resources, while still being visually appealing and user friendly.")
 (define-public xfce4-power-manager
   (package
     (name "xfce4-power-manager")
-    (version "1.6.1")
+    (version "1.6.5")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -872,16 +872,14 @@ system resources, while still being visually appealing and user friendly.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "0sv5927q8jxvdfx7b06f8s7qyq3qa1nqn0b8c1b9bf234d2jba0y"))))
+                "0x3s2bdwfhp65dz5yn3k43j99ywqlsvrpz3pqmgwm0dik5wbdb8h"))))
     (build-system gnu-build-system)
-    (arguments
-     '(#:configure-flags '("--enable-gtk3")))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)))
     (inputs
-     `(("lbxrandr" ,libxrandr)
-       ("gtk+" ,gtk+-2)
+     `(("libxrandr" ,libxrandr)
+       ("gtk+" ,gtk+)
        ("upower" ,upower)
        ("libnotify" ,libnotify)
        ("libxfce4ui" ,libxfce4ui)))
-- 
2.22.0

[bug#37121] [PATCH 25/40] gnu: Thunar: Add gvfs support.

[L p R n d n]

* gnu/packages/xfce.scm (thunar)[inputs]: Add gvfs.
---
 gnu/packages/xfce.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 530f2cc116..ef99cfd455 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -650,6 +650,7 @@ like appearance, display, keyboard and mouse settings.")
        ("libxfce4ui" ,libxfce4ui)
        ("pcre" ,pcre)
        ("xfce4-panel" ,xfce4-panel)
+       ("gvfs" ,gvfs)
        ("startup-notification" ,startup-notification)))
     (home-page "https://www.xfce.org/")
     (synopsis "Xfce file manager")
-- 
2.22.0

[bug#37121] [PATCH 26/40] gnu: mousepad: Update to 0.4.2.

[L p R n d n]

* gnu/packages/xfce.scm (mousepad): Update to 0.4.2.
[arguments] Remove unnecessary --enable-gtk3 flag from #:configure-flags.
[inputs] Add xfconf.
---
 gnu/packages/xfce.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index ef99cfd455..ce1f1786d7 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1060,7 +1060,7 @@ of data to either CD/DVD/BD.")
 (define-public mousepad
   (package
     (name "mousepad")
-    (version "0.4.1")
+    (version "0.4.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://archive.xfce.org/src/apps/mousepad/"
@@ -1068,11 +1068,10 @@ of data to either CD/DVD/BD.")
                                   version ".tar.bz2"))
               (sha256
                (base32
-                "12si6fvhp68wz4scr339c23jxqq5ywn5nf4w55jld5lxjadkg9rr"))))
+                "1myy7954r1a30dk7inwy7kwki7zvfbnnsc3a8swk72vzrbgjmh44"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:configure-flags '("--enable-gtk3"
-                           ;; Use the GSettings keyfile backend rather than
+     '(#:configure-flags '(;; Use the GSettings keyfile backend rather than
                            ;; DConf.
                            "--enable-keyfile-settings")
        #:phases
@@ -1092,7 +1091,8 @@ of data to either CD/DVD/BD.")
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("gtk+" ,gtk+)
-       ("gtksourceview" ,gtksourceview-3)))
+       ("gtksourceview" ,gtksourceview-3)
+       ("xfconf" ,xfconf)))
     (home-page "https://git.xfce.org/apps/mousepad/")
     (synopsis "Simple text editor for Xfce")
     (description
-- 
2.22.0

[bug#37121] [PATCH 27/40] gnu: ristretto: Update to 0.10.0.

[L p R n d n]

* gnu/packages/xfce.scm (ristretto): Update to 0.10.0.
[inputs] Add gtk+. Remove gtk+-2.
---
 gnu/packages/xfce.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index ce1f1786d7..77f1496cd0 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -899,7 +899,7 @@ inhibit interface which allows applications to prevent automatic sleep.")
 (define-public ristretto
   (package
     (name "ristretto")
-    (version "0.8.4")
+    (version "0.10.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://archive.xfce.org/src/apps/ristretto/"
@@ -907,14 +907,14 @@ inhibit interface which allows applications to prevent automatic sleep.")
                                   "ristretto-" version ".tar.bz2"))
               (sha256
                (base32
-                "18nf01djwnbjc91bdlv3p0h6pwcq1kfnjgp6yaxhxv4kdi9f82rs"))))
+                "0sa75m1w6yvv4xvzrwqiif6vnqgi29hjrixrh87nxss58bbms8hn"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("intltool" ,intltool)
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("desktop-file-utils" ,desktop-file-utils)
-       ("gtk+" ,gtk+-2)
+       ("gtk+" ,gtk+)
        ("libexif" ,libexif)
        ("libxfce4ui" ,libxfce4ui)
        ("librsvg" ,librsvg)
-- 
2.22.0

[bug#37121] [PATCH 28/40] gnu: xfce4-terminal: Update to 0.8.8.

[L p R n d n]

* gnu/packages/xfce.scm (xfce4-terminal): Update to 0.8.8.
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 77f1496cd0..30b3ab4b79 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -783,7 +783,7 @@ devices and folders.")
 (define-public xfce4-terminal
   (package
     (name "xfce4-terminal")
-    (version "0.8.7.4")
+    (version "0.8.8")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/apps/" name "/"
@@ -791,7 +791,7 @@ devices and folders.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "1as2dh5ccmv3hdvsbxm4b0xhmv2ky2q18zxxrzr988x79npri3x8"))))
+                "1zc7hkq77ajia099wxgh4wdvwifcg2zkcz5d2xsf1zm0sdh6mflg"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-- 
2.22.0

[bug#37121] [PATCH 29/40] gnu: xfce4-whiskermenu-plugin: Update to 2.3.3.

[L p R n d n]

* gnu/packages/xfce.scm (xfce4-whiskermenu-plugin): Update to 2.3.3.
[inputs] Add gtk+. Remove gtk+-2.
---
 gnu/packages/xfce.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 30b3ab4b79..6fb25f05dc 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -443,7 +443,7 @@ keys for controlling the audio volume.")
 (define-public xfce4-whiskermenu-plugin
   (package
     (name "xfce4-whiskermenu-plugin")
-    (version "2.3.1")
+    (version "2.3.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
@@ -451,7 +451,7 @@ keys for controlling the audio volume.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "1cnas2x7xi53v6ylq44040narhzd828dc0ysz8yk3qn2mmvp5yr2"))))
+                "0j0qmk372130avq8n07lfqrcm2al7n07l8gc06bbr1g6q57wrip0"))))
     (build-system cmake-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -460,7 +460,8 @@ keys for controlling the audio volume.")
      `(("xfce4-panel" ,xfce4-panel)
        ("garcon" ,garcon)
        ("exo" ,exo)
-       ("gtk+" ,gtk+-2)))
+       ("gtk+" ,gtk+)
+       ("libxfce4ui" ,libxfce4ui)))
     (arguments
       `(#:tests? #f)) ; no tests
     (home-page "https://goodies.xfce.org/projects/panel-plugins/xfce4-whiskermenu-plugin")
-- 
2.22.0

[bug#37121] [PATCH 30/40] gnu: xfce4-battery-plugin: Update tp 1.1.3.

[L p R n d n]

* gnu/packages/xfce.scm (xfce4-battery-plugin): Update to 1.1.3. Switch from gtk+-2 to gtk+-3.
[inputs] Add gtk+. Remove gtk+2.
---
 gnu/packages/xfce.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 6fb25f05dc..6dd69b4d26 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -352,7 +352,7 @@ applications menu, workspace switcher and more.")
 (define-public xfce4-battery-plugin
   (package
     (name "xfce4-battery-plugin")
-    (version "1.1.2")
+    (version "1.1.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
@@ -360,12 +360,12 @@ applications menu, workspace switcher and more.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "1nypi0zazrcrbbm5vb221yw64zxrk56v4fffkblxlyd9m6gk80fn"))))
+                "18s0s004nidii8cc3ldp5n3jajc18vwn9vhkhmhy3lbbs520mghj"))))
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)
                      ("intltool" ,intltool)))
     (inputs `(("glib" ,glib)
-              ("gtk+" ,gtk+-2)
+              ("gtk+" ,gtk+)
               ("libxfce4util" ,libxfce4util)
               ("libxfce4ui" ,libxfce4ui)
               ("xfce4-panel" ,xfce4-panel)))
-- 
2.22.0

[bug#37121] [PATCH 31/40] gnu: xfce4-pulseaudio-plugin: Update to 0.4.2.

[L p R n d n]

* gnu/packages/xfce.scm (xfce4-pulseaudio-plugin): Update to 0.4.2.
[arguments] Add augment-cflags phase.
[native-inputs] Add dbus and dbus-glib.
---
 gnu/packages/xfce.scm | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 6dd69b4d26..74f5e326d4 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -412,7 +412,7 @@ matching them against regular expressions.")
 (define-public xfce4-pulseaudio-plugin
   (package
     (name "xfce4-pulseaudio-plugin")
-    (version "0.4.1")
+    (version "0.4.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
@@ -420,11 +420,26 @@ matching them against regular expressions.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "1w29y0a066y8as12xrkbfqcn7dpdsvx97idzw7028gmcvca87a3c"))))
+                "0851b0vs5xmy3cq899khcghmkqwvh9rnzwavi17msrsq4jyaxs2a"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       ;; For dbus/dbus-glib.h in pulseaudio-config.h
+       (modify-phases %standard-phases
+         (add-after 'set-paths 'augment-cflags
+           (lambda* (#:key inputs #:allow-other-keys)
+             (setenv "C_INCLUDE_PATH"
+                     (string-append (assoc-ref inputs "dbus-glib")
+                                    "/include/dbus-1.0" ":"
+                                    (assoc-ref inputs "dbus")
+                                    "/include/dbus-1.0" ":"
+                                    (getenv "C_INCLUDE_PATH")))
+             #t)))))
     (native-inputs
      `(("intltool" ,intltool)
-       ("pkg-config" ,pkg-config)))
+       ("pkg-config" ,pkg-config)
+       ("dbus-glib" ,dbus-glib)
+       ("dbus" ,dbus)))
     (inputs
      `(("exo" ,exo)
        ("libnotify" ,libnotify)
-- 
2.22.0

[bug#37121] [PATCH 32/40] gnu: libxklavier: Update to 5.4.

[L p R n d n]

* gnu/packages/gnome.scm (libxklavier): Update to 5.4.
[source] Switch to git source.
[arguments] Add no-configure phase. Disable xmodmap in #:configure-flags.
[inputs] Add which, intltool, gtk-doc, which, automake, autoconf and libtool.
---
 gnu/packages/gnome.scm | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d5e46e09c1..8b54abbb91 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2537,24 +2537,40 @@ and objects.")
 (define-public libxklavier
   (package
     (name "libxklavier")
-    (version "5.3")
+    (version "5.4")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  version "/" name "-" version ".tar.xz"))
+              (method git-fetch)
+              (uri
+               (git-reference
+                (url (string-append "https://anongit.freedesktop.org/git/" name))
+                (commit "396955bd2ba2db34a42b3807b03155fcc11dfe50")))
               (sha256
                (base32
-                "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b"))))
+                "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a"))
+              (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (arguments
-     '(#:configure-flags
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'no-configure
+           (lambda* _
+            (setenv "NOCONFIGURE" "1")
+            #t)))
+       #:configure-flags
        (list (string-append "--with-xkb-base="
                             (assoc-ref %build-inputs "xkeyboard-config")
-                            "/share/X11/xkb"))))
+                            "/share/X11/xkb")
+             "--disable-xmodmap-support")))
     (native-inputs
      `(("glib:bin"              ,glib "bin") ; for glib-mkenums, etc.
        ("gobject-introspection" ,gobject-introspection)
-       ("pkg-config"            ,pkg-config)))
+       ("pkg-config"            ,pkg-config)
+       ("gtk-doc" ,gtk-doc)
+       ("intltool" ,intltool)
+       ("which" ,which)
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)))
     (propagated-inputs
      ;; Required by libxklavier.pc.
      `(("glib"    ,glib)
-- 
2.22.0

[bug#37121] [PATCH 32/40] gnu: libxklavier: Update to 5.4.

[Ludovic Courtès]

Hello,

L  p R n  d n <guix@lprndn.info> skribis:

> * gnu/packages/gnome.scm (libxklavier): Update to 5.4.
> [source] Switch to git source.
> [arguments] Add no-configure phase. Disable xmodmap in #:configure-flags.
> [inputs] Add which, intltool, gtk-doc, which, automake, autoconf and libtool.

[...]

> -    (version "5.3")
> +    (version "5.4")
>      (source (origin
> -              (method url-fetch)
> -              (uri (string-append "mirror://gnome/sources/" name "/"
> -                                  version "/" name "-" version ".tar.xz"))
> +              (method git-fetch)
> +              (uri
> +               (git-reference
> +                (url (string-append "https://anongit.freedesktop.org/git/" name))
> +                (commit "396955bd2ba2db34a42b3807b03155fcc11dfe50")))
>                (sha256
>                 (base32
> -                "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b"))))
> +                "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a"))
> +              (file-name (git-file-name name version))))

How does this commit relate to version 5.4?
<https://www.freedesktop.org/wiki/Software/LibXklavier/> says that
release tarballs are available on the GNOME web site, and there’s no 5.4
there.

Was this change necessary for the Xfce upgrade?

Thanks,
Ludo’.

[bug#37121] [PATCH 32/40] gnu: libxklavier: Update to 5.4.

[L p R n d n]

Hello,

Ludovic Courtès <ludo@gnu.org> writes:

> Hello,
>
> L  p R n  d n <guix@lprndn.info> skribis:
>
>> * gnu/packages/gnome.scm (libxklavier): Update to 5.4.
>> [source] Switch to git source.
>> [arguments] Add no-configure phase. Disable xmodmap in #:configure-flags.
>> [inputs] Add which, intltool, gtk-doc, which, automake, autoconf and libtool.
>
> [...]
>
>> -    (version "5.3")
>> +    (version "5.4")
>>      (source (origin
>> -              (method url-fetch)
>> -              (uri (string-append "mirror://gnome/sources/" name "/"
>> -                                  version "/" name "-" version ".tar.xz"))
>> +              (method git-fetch)
>> +              (uri
>> +               (git-reference
>> +                (url (string-append "https://anongit.freedesktop.org/git/" name))
>> +                (commit "396955bd2ba2db34a42b3807b03155fcc11dfe50")))
>>                (sha256
>>                 (base32
>> -                "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b"))))
>> +                "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a"))
>> +              (file-name (git-file-name name version))))
>
> How does this commit relate to version 5.4?
> <https://www.freedesktop.org/wiki/Software/LibXklavier/> says that
> release tarballs are available on the GNOME web site, and there’s no 5.4
> there.

That's true, it's only available  through git. The commit seems to be
6 years old and after some invastigation, 5.4 appears to be used
by other distributions (at least Nixos, Arch and Debian) for several
years. I don't know what are upstream's plans nor why it's not available
on GNOME's website though.

>
> Was this change necessary for the Xfce upgrade?

Yeah, I'm not really confortable with this either but xfce4-xkb-plugin
explicitely ask for at least libxklavier 5.4. On the other hand
xfce4-xbd-plugin is not part of xfce's core so that update is arguable.

> Thanks,
> Ludo’.

Have a nice day,

L  p R n  d n

[bug#37121] [PATCH 32/40] gnu: libxklavier: Update to 5.4.

[Ludovic Courtès]

L  p R n  d n    <guix@lprndn.info> skribis:

> Ludovic Courtès <ludo@gnu.org> writes:
>
>> Hello,
>>
>> L  p R n  d n <guix@lprndn.info> skribis:
>>
>>> * gnu/packages/gnome.scm (libxklavier): Update to 5.4.
>>> [source] Switch to git source.
>>> [arguments] Add no-configure phase. Disable xmodmap in #:configure-flags.
>>> [inputs] Add which, intltool, gtk-doc, which, automake, autoconf and libtool.
>>
>> [...]
>>
>>> -    (version "5.3")
>>> +    (version "5.4")
>>>      (source (origin
>>> -              (method url-fetch)
>>> -              (uri (string-append "mirror://gnome/sources/" name "/"
>>> -                                  version "/" name "-" version ".tar.xz"))
>>> +              (method git-fetch)
>>> +              (uri
>>> +               (git-reference
>>> +                (url (string-append "https://anongit.freedesktop.org/git/" name))
>>> +                (commit "396955bd2ba2db34a42b3807b03155fcc11dfe50")))
>>>                (sha256
>>>                 (base32
>>> -                "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b"))))
>>> +                "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a"))
>>> +              (file-name (git-file-name name version))))
>>
>> How does this commit relate to version 5.4?
>> <https://www.freedesktop.org/wiki/Software/LibXklavier/> says that
>> release tarballs are available on the GNOME web site, and there’s no 5.4
>> there.
>
> That's true, it's only available  through git. The commit seems to be
> 6 years old and after some invastigation, 5.4 appears to be used
> by other distributions (at least Nixos, Arch and Debian) for several
> years. I don't know what are upstream's plans nor why it's not available
> on GNOME's website though.

OK.  I see there’s a ‘libxklavier-5.4’ tag in the Git repo above.  Could
you explicitly use this tag in the source rather than a commit ID, for
clarity?  Like so:

  (git-reference
    (url …)
    (commit (string-append "libxklavier-" version)))

>> Was this change necessary for the Xfce upgrade?
>
> Yeah, I'm not really confortable with this either but xfce4-xkb-plugin
> explicitely ask for at least libxklavier 5.4. On the other hand
> xfce4-xbd-plugin is not part of xfce's core so that update is arguable.

OK.  Then we’ll make sure to apply the libxklavier upgrade before the
Xfce upgrade.

Thanks!

Ludo’.

[bug#37121] [PATCH 33/40] gnu: xfce4-xkb-plugin: Update to 0.8.1.

[L p R n d n]

* gnu/packages/xfce.scm (xfce4-xkb-plugin): Update to 0.8.1.
[inputs] Add libwnck. Remove libwnck-2.
---
 gnu/packages/xfce.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 74f5e326d4..498e032597 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -492,7 +492,7 @@ applications, and includes a search bar to search for applications.")
 (define-public xfce4-xkb-plugin
   (package
     (name "xfce4-xkb-plugin")
-    (version "0.7.1")
+    (version "0.8.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
@@ -500,7 +500,7 @@ applications, and includes a search bar to search for applications.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "10g65j5ia389ahhn3b9hr52ghpp0817fk0m60rfrv4wrzqrjxzk1"))))
+                "18b7cnaf3zxm598p2i47vim3kbbi8w923ia1hwabdph1c89cz7n1"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("intltool" ,intltool)
@@ -508,7 +508,7 @@ applications, and includes a search bar to search for applications.")
     (inputs
      `(("garcon" ,garcon)
        ("librsvg" ,librsvg)
-       ("libwnck" ,libwnck-2)
+       ("libwnck" ,libwnck)
        ("libx11" ,libx11)
        ("libxfce4ui" ,libxfce4ui)
        ("libxklavier" ,libxklavier)
-- 
2.22.0

[bug#37121] [PATCH 34/40] gnu: xfce4-taskmanager: Switch from libwnck-2 to libwnck.

[L p R n d n]

* gnu/packages/xfce.scm (xfce4-taskmanager)[inputs]: Switch from libwnck-2 to libwnck.
---
 gnu/packages/xfce.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 498e032597..04555a3765 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -961,7 +961,7 @@ the desktop wallpaper.")
      `(("intltool" ,intltool)
        ("pkg-config" ,pkg-config)))
     (inputs
-     `(("libwnck" ,libwnck-2)
+     `(("libwnck" ,libwnck)
        ("libxmu" ,libxmu)
        ("gtk+" ,gtk+)
        ;; FIXME: Remove libxext and libxt when libxmu propagates them.
-- 
2.22.0

[bug#37121] [PATCH 35/40] gnu: orage: Fix build.

[L p R n d n]

* gnu/packages/xfce.scm (orage)[source]: Add orage-fix-for-libical3.patch.

* gnu/packages/orage-fix-for-libical3.patch: New file.
---
 .../patches/orage-fix-for-libical3.patch      | 59 +++++++++++++++++++
 gnu/packages/xfce.scm                         |  3 +-
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/orage-fix-for-libical3.patch

diff --git a/gnu/packages/patches/orage-fix-for-libical3.patch b/gnu/packages/patches/orage-fix-for-libical3.patch
new file mode 100644
index 0000000000..af962b3675
--- /dev/null
+++ b/gnu/packages/patches/orage-fix-for-libical3.patch
@@ -0,0 +1,59 @@
+diff -up orage-4.12.1/src/ical-code.c.libical-3.0 orage-4.12.1/src/ical-code.c
+--- orage-4.12.1/src/ical-code.c.libical-3.0	2017-11-14 08:41:30.917375493 +0100
++++ orage-4.12.1/src/ical-code.c	2017-11-14 08:41:56.823375135 +0100
+@@ -129,7 +129,6 @@ static struct icaltimetype ical_get_curr
+         &&   (strcmp(g_par.local_timezone, "floating") != 0))
+         ctime = icaltime_current_time_with_zone(local_icaltimezone);
+     else { / * use floating time * /
+-        ctime.is_utc      = 0;
+         ctime.is_date     = 0;
+         ctime.is_daylight = 0;
+         ctime.zone        = NULL;
+@@ -2579,7 +2578,6 @@ static struct icaltimetype count_first_a
+  * when counting alarm time. */
+         if (rel == ICAL_RELATED_START) {
+             per.stime.is_date       = 0;
+-            per.stime.is_utc        = 1;
+             per.stime.is_daylight   = 0;
+             per.stime.zone          = utc_icaltimezone;
+             per.stime.hour          = 0;
+@@ -2588,7 +2586,6 @@ static struct icaltimetype count_first_a
+         }
+         else {
+             per.etime.is_date       = 0;
+-            per.etime.is_utc        = 1;
+             per.etime.is_daylight   = 0;
+             per.etime.zone          = utc_icaltimezone;
+             per.etime.hour          = 0;
+@@ -2613,7 +2610,6 @@ static struct icaltimetype count_next_al
+ /* HACK: convert to UTC time so that we can use time arithmetic
+  * when counting alarm time. */
+         start_time.is_date       = 0;
+-        start_time.is_utc        = 1;
+         start_time.is_daylight   = 0;
+         start_time.zone          = utc_icaltimezone;
+         start_time.hour          = 0;
+@@ -2768,7 +2764,6 @@ static alarm_struct *process_alarm_trigg
+      */
+     if (icaltime_is_date(per.stime)) {
+         if (local_icaltimezone != utc_icaltimezone) {
+-            next_alarm_time.is_utc        = 0;
+             next_alarm_time.is_daylight   = 0;
+             next_alarm_time.zone          = local_icaltimezone;
+         }
+@@ -2850,7 +2845,6 @@ orage_message(120, P_N "Alarm rec loop n
+          */
+         if (icaltime_is_date(per.stime)) {
+             if (local_icaltimezone != utc_icaltimezone) {
+-                next_alarm_time.is_utc        = 0;
+                 next_alarm_time.is_daylight   = 0;
+                 next_alarm_time.zone          = local_icaltimezone;
+             }
+@@ -2944,7 +2938,6 @@ orage_message(120, P_N "*****After loop
+          */
+         if (icaltime_is_date(per.stime)) {
+             if (local_icaltimezone != utc_icaltimezone) {
+-                next_alarm_time.is_utc        = 0;
+                 next_alarm_time.is_daylight   = 0;
+                 next_alarm_time.zone          = local_icaltimezone;
+             }
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 04555a3765..e6272632a9 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -985,7 +985,8 @@ memory usage graphically, and it can display processes as a tree.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w"))))
+                "0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w"))
+              (patches (search-patches "orage-fix-for-libical3.patch"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("intltool" ,intltool)
-- 
2.22.0

[bug#37121] [PATCH 36/40] gnu: xfce4-notifyd: Update to 0.4.4.

[L p R n d n]

* gnu/packages/xfce.scm (xfce4-notifyd): Update to 0.4.4.
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index e6272632a9..d3c28e4bea 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1010,7 +1010,7 @@ several different time zones.")
 (define-public xfce4-notifyd
   (package
     (name "xfce4-notifyd")
-    (version "0.4.3")
+    (version "0.4.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/apps/"
@@ -1018,7 +1018,7 @@ several different time zones.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "1h7avj149cafj9dabiza22y14i66vxgp5qj0wxx8i97w9h4dlg99"))))
+                "0m8vlbwdxiw9nmimaj5np9l5qm784gxpkdvc881k0hjcz6n72189"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      `(("intltool" ,intltool)
-- 
2.22.0

[bug#37121] [PATCH 37/40] gnu: libxfce4util: Build Vala bindings.

[L p R n d n]

* gnu/packages/xfce.scm (libxfce4util)[native-inputs]: Add vala.
---
 gnu/packages/xfce.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index d3c28e4bea..78c3fb58f9 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -101,7 +101,8 @@
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("gobject-introspection" ,gobject-introspection)
-       ("intltool" ,intltool)))
+       ("intltool" ,intltool)
+       ("vala" ,vala)))
     (propagated-inputs `(("glib" ,glib))) ; required by libxfce4util-1.0.pc
     (home-page "https://www.xfce.org/")
     (synopsis "Basic utility library for Xfce")
-- 
2.22.0

[bug#37121] [PATCH 38/40] gnu: xfconf: Remove unnecessary propagated-inputs.

[L p R n d n]

* gnu/packages/xfconf.scm (xfconf)[propagated-inputs]: Remove dbus and dbus-glib.
---
 gnu/packages/xfce.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 78c3fb58f9..dd62db1449 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -146,9 +146,7 @@ Xfce Desktop Environment.")
        ("vala" ,vala)))
     (propagated-inputs
      ;; libxfconf-0.pc refers to all these.
-     `(("glib" ,glib)
-       ("dbus" ,dbus)
-       ("dbus-glib" ,dbus-glib)))
+     `(("glib" ,glib)))
     (inputs
      `(("libxfce4util" ,libxfce4util)))
     (home-page "https://www.xfce.org/")
-- 
2.22.0

[bug#37121] [PATCH 39/40] gnu: xfconf: Fix tests.

[L p R n d n]

* gnu/packages/xfce.scm (xfconf)[arguments]: Rename check phase to
  custom-check.
  [native-inputs]: Add dbus.
---
 gnu/packages/xfce.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index dd62db1449..5352ed23c6 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -128,7 +128,7 @@ Xfce Desktop Environment.")
      '(#:phases
        ;; Run check after install phase to test dbus activation.
        (modify-phases %standard-phases
-         (add-after 'install 'check
+         (add-after 'install 'custom-check
            (lambda _
              (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME
              ;; Run test-suite under a dbus session.
@@ -143,7 +143,8 @@ Xfce Desktop Environment.")
        ("intltool" ,intltool)
        ("glib:bin" ,glib "bin") ;; for gdbus-codegen
        ("gobject-introspection" ,gobject-introspection)
-       ("vala" ,vala)))
+       ("vala" ,vala)
+       ("dbus" ,dbus)))
     (propagated-inputs
      ;; libxfconf-0.pc refers to all these.
      `(("glib" ,glib)))
-- 
2.22.0

[bug#37121] [PATCH 40/40] gnu: Add copyright header.

[L p R n d n]

* gnu/packages/xfce.scm: Add copyright header.
---
 gnu/packages/xfce.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 5352ed23c6..e26fd9950b 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2017 ng0 <ng0@n0.is>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
+;;; Copyright © 2019 L  p R n  d n <guix@lprndn.info>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
-- 
2.22.0

[bug#37121] [PATCH 00/40] Update Xfce to 4.14

[Ludovic Courtès]

Hello,

L  p R n  d n    <guix@lprndn.info> skribis:

> Here is my take on updating xfce to 4.14.

Woow, thanks for all the work!

> The update switches Xfce to gtk-3 but gtk-2 compatibility is kept.
> Also there a few changes to add or clarify some features like vala API
> or gobject introspection.
> Testing is welcome.

So, I hope you won’t hate me for asking, but… can we separate the bits
that are really part of the Xfce upgrade or required by the upgrade,
from those that are not directly related?  The libxklavier, mousepad,
and “fix tests” changes come to mind.  That would make the review work
less intimidating.  :-)

Also, I suspect all the xfce* and libxf* packages need to be upgraded in
lockstep; that is, they all need to be either 4.14 or 4.12, but not a
mixture thereof.  Thus, I’d actually prefer a single commit upgrading
all of these.  WDYT?

There are probably exceptions such as Thunar that do not strictly need
to be upgraded at the same time; these can remain in a separate commit.

Thanks,
Ludo’.

[bug#37121] [PATCH 00/40] Update Xfce to 4.14

[L p R n d n]

Hello,

Ludovic Courtès <ludo@gnu.org> writes:

> Hello,
>
> L  p R n  d n    <guix@lprndn.info> skribis:
>
>> Here is my take on updating xfce to 4.14.
>
> Woow, thanks for all the work!
>
>> The update switches Xfce to gtk-3 but gtk-2 compatibility is kept.
>> Also there a few changes to add or clarify some features like vala API
>> or gobject introspection.
>> Testing is welcome.
>
> So, I hope you won’t hate me for asking, but… can we separate the bits
> that are really part of the Xfce upgrade or required by the upgrade,
> from those that are not directly related?  The libxklavier, mousepad,
> and “fix tests” changes come to mind.  That would make the review work
> less intimidating.  :-)
>
> Also, I suspect all the xfce* and libxf* packages need to be upgraded in
> lockstep; that is, they all need to be either 4.14 or 4.12, but not a
> mixture thereof.  Thus, I’d actually prefer a single commit upgrading
> all of these.  WDYT?
>
> There are probably exceptions such as Thunar that do not strictly need
> to be upgraded at the same time; these can remain in a separate commit.

No problem. It's more git training!
I'll make a single commit for all xfce4-core packages and leave the rest
sepearate. Is it ok?
Also, do you need me to send them at this bug report or a new one?
(sorry, the previous patches seem to be scrambled, I don't know why... :/)

> Thanks,
> Ludo’.

Have a nice day,

L  p R n  d n

[bug#37121] [PATCH 00/40] Update Xfce to 4.14

[Ludovic Courtès]

Hello,

L  p R n  d n    <guix@lprndn.info> skribis:

> Ludovic Courtès <ludo@gnu.org> writes:
>
>> Hello,
>>
>> L  p R n  d n    <guix@lprndn.info> skribis:
>>
>>> Here is my take on updating xfce to 4.14.
>>
>> Woow, thanks for all the work!
>>
>>> The update switches Xfce to gtk-3 but gtk-2 compatibility is kept.
>>> Also there a few changes to add or clarify some features like vala API
>>> or gobject introspection.
>>> Testing is welcome.
>>
>> So, I hope you won’t hate me for asking, but… can we separate the bits
>> that are really part of the Xfce upgrade or required by the upgrade,
>> from those that are not directly related?  The libxklavier, mousepad,
>> and “fix tests” changes come to mind.  That would make the review work
>> less intimidating.  :-)
>>
>> Also, I suspect all the xfce* and libxf* packages need to be upgraded in
>> lockstep; that is, they all need to be either 4.14 or 4.12, but not a
>> mixture thereof.  Thus, I’d actually prefer a single commit upgrading
>> all of these.  WDYT?
>>
>> There are probably exceptions such as Thunar that do not strictly need
>> to be upgraded at the same time; these can remain in a separate commit.
>
> No problem. It's more git training!

:-)

> I'll make a single commit for all xfce4-core packages and leave the rest
> sepearate. Is it ok?

Yes, all those that need to be updated together (which I think are the
libxf* and xfce* packages, but again I’m no Xfce expert) should go in
one patch.

> Also, do you need me to send them at this bug report or a new one?

Please send the Xfce upgrade here, and the patches that are not
Xfce-specific elsewhere.

Thank you!

Ludo’.

[bug#37121] [PATCH 00/40] Update Xfce to 4.14

[L p R n d n]

[-- Attachment #1: Type: text/plain, Size: 2317 bytes --]

Hello,

Ludovic Courtès <ludo@gnu.org> writes:

> Hello,
>
> L  p R n  d n    <guix@lprndn.info> skribis:
>
>> Ludovic Courtès <ludo@gnu.org> writes:
>>
>>> Hello,
>>>
>>> L  p R n  d n    <guix@lprndn.info> skribis:
>>>
>>>> Here is my take on updating xfce to 4.14.
>>>
>>> Woow, thanks for all the work!
>>>
>>>> The update switches Xfce to gtk-3 but gtk-2 compatibility is kept.
>>>> Also there a few changes to add or clarify some features like vala API
>>>> or gobject introspection.
>>>> Testing is welcome.
>>>
>>> So, I hope you won’t hate me for asking, but… can we separate the bits
>>> that are really part of the Xfce upgrade or required by the upgrade,
>>> from those that are not directly related?  The libxklavier, mousepad,
>>> and “fix tests” changes come to mind.  That would make the review work
>>> less intimidating.  :-)
>>>
>>> Also, I suspect all the xfce* and libxf* packages need to be upgraded in
>>> lockstep; that is, they all need to be either 4.14 or 4.12, but not a
>>> mixture thereof.  Thus, I’d actually prefer a single commit upgrading
>>> all of these.  WDYT?
>>>
>>> There are probably exceptions such as Thunar that do not strictly need
>>> to be upgraded at the same time; these can remain in a separate commit.
>>
>> No problem. It's more git training!
>
> :-)
>
>> I'll make a single commit for all xfce4-core packages and leave the rest
>> sepearate. Is it ok?
>
> Yes, all those that need to be updated together (which I think are the
> libxf* and xfce* packages, but again I’m no Xfce expert) should go in
> one patch.
>
>> Also, do you need me to send them at this bug report or a new one?
>
> Please send the Xfce upgrade here, and the patches that are not
> Xfce-specific elsewhere.
>

Here are the new patches. Hope everything it's ok.
I took the liberty to send the as attachment to avoid scambling them.
There is one main patch for base xfce components' update + patches for
other packages part of xfce. I also added two new components of xfce.
I'll send the rest in their own bug report.

Reminder, those patches should not be merged before patch #37253:
https://debbugs.gnu.org/cgi/bugreport.cgi?bug=37253

Thanks,

> Thank you!
>
> Ludo’.

Have a nice day,

L  p R n  d n


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Update-Xfce-base-to-4.14.0.patch --]
[-- Type: text/x-patch, Size: 17122 bytes --]

From 7acadd245c92f2b5e701b59ad3e54865fad968a4 Mon Sep 17 00:00:00 2001
From: L  p R n  d n <guix@lprndn.info>
Date: Sun, 18 Aug 2019 21:24:37 +0200
Subject: [PATCH 01/11] gnu: Update Xfce base to 4.14.0.

* gnu/packages/xfce.scm (libxfce4util): Update to 4.14.0.

* gnu/packages/xfce.scm (xfconf): Update to 4.14.1.
[native-inputs] Add glib:bin.
[propagated-inputs] Remove dbus and dbus-glib.

* gnu/packages/xfce.scm (libxfce4ui): Update to 4.14.1.

* gnu/packages/xfce.scm (exo): Update to 0.12.8.
[propagated-inputs] Add gtk+-3. Remove gtk+-2.
[inputs] Add gtk+-2.

* gnu/packages/xfce.scm (garcon): Update to 0.6.4.
[inputs] Rename gtk+ to gtk+-2.
[propagated-inputs] Add gtk+-3.

* gnu/packages/xfce.scm (tumbler): Update to 0.2.7.

* gnu/packages/xfce.scm (xfce4-appfinder): Update to 4.14.0.
[inputs] Updte gtk+ from gtk+-2 to gtk+.

* gnu/packages/xfce.scm (xcfe4-panel): Update to 4.14.0
[arguments] Remove #:configure-flags
[native-inputs] Add glib:bin.
[inputs] Add gtk+-2, libwnck and xfconf. Remove libwnck-2.
[propagated-inputs] Add gtk+-3.

* 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.

* gnu/packages/xfce.scm (xfce4-settings): Update to 4.14.0.
[arguments] Add #:configure flags.

* gnu/packages/xfce.scm (xfwm4): Update to 4.14.0.
[inputs] Add libwnck. Remove libwnck-2.

* gnu/packages/xfce.scm (xfdesktop): Update to 4.14.1.
[inputs] Add libwnck. Remove libwnck-2.

* gnu/packages/xfce.scm (xfce4-power-manager): Update to 4.6.5.
[inputs] Add gtk+. Remove gtk+-2.
---
 .../patches/xfce4-session-fix-xflock4.patch   |  31 -----
 gnu/packages/xfce.scm                         | 107 +++++++++---------
 2 files changed, 56 insertions(+), 82 deletions(-)
 delete mode 100644 gnu/packages/patches/xfce4-session-fix-xflock4.patch

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 93c36dac1e..60f1586f06 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -54,6 +54,7 @@
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages polkit)
   #:use-module (gnu packages gstreamer)
+  #:use-module (gnu packages libcanberra)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages photo)
   #:use-module (gnu packages pcre)
@@ -86,7 +87,7 @@
 (define-public libxfce4util
   (package
     (name "libxfce4util")
-    (version "4.12.1")
+    (version "4.14.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://archive.xfce.org/xfce/"
@@ -94,7 +95,7 @@
                                   "/src/" name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "07c8r3xwx5is298zk77m3r784gmr5y4mh8bbca5zdjqk5vxdwsw7"))))
+                "093338faqqsrlc8dkmzr7qv411ysxczg1wlg7s3gvhrfk6vpkb9j"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -110,7 +111,7 @@ Xfce Desktop Environment.")
 (define-public xfconf
   (package
     (name "xfconf")
-    (version "4.12.1")
+    (version "4.14.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -118,7 +119,7 @@ Xfce Desktop Environment.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "0dns190bwb615wy9ma2654sw4vz1d0rcv061zmaalkv9wmj8bx1m"))))
+                "0n8d55c98ff7wgwv3qa4g369sv4iasgm1w62zq10kq5f56iy14xq"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases
@@ -136,12 +137,12 @@ Xfce Desktop Environment.")
          (delete 'check))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("intltool" ,intltool)))
+       ("intltool" ,intltool)
+       ("glib:bin" ,glib "bin")         ;; for gdbus-codegen
+       ))
     (propagated-inputs
      ;; libxfconf-0.pc refers to all these.
-     `(("glib" ,glib)
-       ("dbus" ,dbus)
-       ("dbus-glib" ,dbus-glib)))
+     `(("glib" ,glib)))
     (inputs
      `(("libxfce4util" ,libxfce4util)))
     (home-page "https://www.xfce.org/")
@@ -154,7 +155,7 @@ storage system.")
 (define-public libxfce4ui
   (package
     (name "libxfce4ui")
-    (version "4.12.1")
+    (version "4.14.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -162,7 +163,7 @@ storage system.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "0hzzhiiwmqsrbv17nninhs2x1b8ck0ym85jck2xphx5ypw8rhq9x"))))
+                "1npjhznmnckhnylsv3l7p1zvhckhmp9d7vifs8w12kdfmrg0fjf4"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -188,7 +189,7 @@ to share commonly used Xfce widgets among the Xfce applications.")
 (define-public exo
   (package
     (name "exo")
-    (version "0.12.6")
+    (version "0.12.8")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -196,17 +197,19 @@ to share commonly used Xfce widgets among the Xfce applications.")
                                   "exo-" version ".tar.bz2"))
               (sha256
                (base32
-                "00qh8ihrf09jvd26kilybihkgvv6rvi0l1bvlldxc99jb7ygy5ql"))))
+                "1ppwi6n40aphh0dqsnfrk234zsp7pl4lkjnspqjxw7m49bka401l"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)))
     (propagated-inputs
-     ;; exo-1.pc refers to all these.
-     `(("gtk+" ,gtk+-2)
+     ;; exo-2.pc refers to all these.
+     `(("gtk+-3" ,gtk+)
        ("libxfce4util" ,libxfce4util)))
     (inputs
-     `(("libxfce4ui" ,libxfce4ui)
+     `(;; FIXME Refered to in exo-1.pc but conflict with gtk+-3
+       ("gtk+-2" ,gtk+-2)
+       ("libxfce4ui" ,libxfce4ui)
        ("perl-uri" ,perl-uri)))
     (home-page "https://www.xfce.org/")
     (synopsis "Extension library for Xfce")
@@ -220,7 +223,7 @@ development.")
 (define-public garcon
   (package
     (name "garcon")
-    (version "0.6.3")
+    (version "0.6.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -228,16 +231,17 @@ development.")
                                   "garcon-" version ".tar.bz2"))
               (sha256
                (base32
-                "00c4g4gmbr8710k0yv1zybnm9s2gkc1rj63zfrg9qgin66jzxcbn"))))
+                "0bbngb4bn1m325j7y40gky36kn2nlsvqs6xp0wy76x3s0d9lfpnp"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)
        ("glib:bin" ,glib "bin")))
     (inputs
-     `(("gtk+" ,gtk+-2)))
+     `(("gtk+-2" ,gtk+-2))); required by garcon-gtk2-1.pc
     (propagated-inputs
-     `(("libxfce4ui" ,libxfce4ui))) ; required by garcon-gtk2-1.pc
+     `(("gtk+-3" ,gtk+)                 ; required by garcon-gtk3-1.pc
+       ("libxfce4ui" ,libxfce4ui))) ; required by garcon-gtk3-1.pc
     (home-page "https://www.xfce.org/")
     (synopsis "Implementation of the freedesktop.org menu specification")
     (description
@@ -250,7 +254,7 @@ merging features essential for loading menus modified with menu editors.")
 (define-public tumbler
   (package
     (name "tumbler")
-    (version "0.2.5")
+    (version "0.2.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -258,7 +262,7 @@ merging features essential for loading menus modified with menu editors.")
                                   "tumbler-" version ".tar.bz2"))
               (sha256
                (base32
-                "0nfld1lvrdpsjfvm08y5487km45pm1mdr928hgqm8j0shrx6jiv4"))))
+                "1r0l0ghcrj71ax7yil1m4p7yjrfqm3icx0s8r7ivwv3i2rgw617p"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -286,7 +290,7 @@ management D-Bus specification.")
 (define-public xfce4-panel
   (package
     (name "xfce4-panel")
-    (version "4.12.2")
+    (version "4.14.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -294,20 +298,22 @@ management D-Bus specification.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "1s8cvsrgmkmmm84g6mghpj2k4777gm22g5lrsf8pdy5qh6xql1a2"))
+                "1x3flv86jh9vqah7mr5mmfx2991mc6icsqjygsc3j88lgsyz7y6m"))
               (patches (search-patches "xfce4-panel-plugins.patch"))))
     (build-system gnu-build-system)
-    (arguments
-     '(#:configure-flags '("--enable-gtk3")))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("intltool" ,intltool)))
+       ("intltool" ,intltool)
+       ("glib:bin" ,glib "bin")))
     (propagated-inputs
-     `(("libxfce4util" ,libxfce4util))) ; required by libxfce4panel-1.0.pc
+     `(("gtk+-3" ,gtk+)                 ; required by libxfce4panel-2.0.pc
+       ("libxfce4util" ,libxfce4util))) ; required by libxfce4panel-2.0.pc
     (inputs
      `(("exo" ,exo)
+       ("gtk+-2" ,gtk+-2)
+       ("xfconf" ,xfconf)
        ("garcon" ,garcon)
-       ("libwnck" ,libwnck-2)
+       ("libwnck" ,libwnck)
        ("libxfce4ui" ,libxfce4ui)))
     (native-search-paths
      (list (search-path-specification
@@ -486,7 +492,7 @@ per window.")
 (define-public xfce4-appfinder
   (package
     (name "xfce4-appfinder")
-    (version "4.12.0")
+    (version "4.14.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://archive.xfce.org/xfce/"
@@ -494,14 +500,14 @@ per window.")
                                   "/src/" name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "0ry5hin8xhgnkmm9vs7jq8blk1cnbyr0s18nm1j6nsm7360abm1a"))))
+                "162dibl6ipp72x0s35yhk7kkzxd4qimagg5zdkkv5kjgjpa7bhby"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)))
     (inputs
      `(("garcon" ,garcon)
-       ("gtk+" ,gtk+-2)
+       ("gtk+" ,gtk+)
        ("libxfce4ui" ,libxfce4ui)))
     (home-page "https://www.xfce.org/")
     (synopsis "Xfce application finder")
@@ -513,7 +519,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/"
@@ -521,10 +527,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
@@ -549,7 +552,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")
@@ -561,7 +564,7 @@ allows you to shutdown the computer from Xfce.")
 (define-public xfce4-settings
   (package
     (name "xfce4-settings")
-    (version "4.12.4")
+    (version "4.14.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://archive.xfce.org/src/xfce/"
@@ -569,9 +572,13 @@ allows you to shutdown the computer from Xfce.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "16vgidhhc19dz0p0i6fp5iiwxd53ky143j6h14a9b7mz92nlr872"))
+                "0g0ipkg2fyg8r1z95ynx0xjr78bp49c2dwh4mli05nmb4gb40c70"))
               (patches (search-patches "xfce4-settings-defaults.patch"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags '("--enable-pluggable-dialogs"
+                           "--enable-sound-settings"
+                           "--enable-xrandr")))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)))
@@ -659,7 +666,7 @@ and import the new pictures from your camera.")
 (define-public xfwm4
   (package
     (name "xfwm4")
-    (version "4.12.5")
+    (version "4.14.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -667,14 +674,14 @@ and import the new pictures from your camera.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "1jnav0wcqlswl2v7nh61big9czg5hmnyvrvm6812sv362qic0xbp"))))
+                "05dn4a1i0nm6wm3nyj7qli5bvfalxghcl7x543qr5l33vkw2n65l"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)))
     (inputs
      `(("libdrm" ,libdrm)
-       ("libwnck" ,libwnck-2)
+       ("libwnck" ,libwnck)
        ("libxcomposite" ,libxcomposite)
        ("libxdamage" ,libxdamage)
        ("libxfce4ui" ,libxfce4ui)
@@ -689,7 +696,7 @@ on the screen.")
 (define-public xfdesktop
   (package
     (name "xfdesktop")
-    (version "4.12.4")
+    (version "4.14.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -697,7 +704,7 @@ on the screen.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "1jzi851arljq5lza9inyq4ss513l62lbzbfm64a7x4320m8kb2h9"))
+                "10pqxgpj7b57wpcsh2k98sj4aavcgxbs1lc8qsq4mibf4hba01gp"))
               (modules '((guix build utils)))
               (snippet
                #~(begin
@@ -735,7 +742,7 @@ on the screen.")
      `(("exo" ,exo)
        ("garcon" ,garcon)
        ("libnotify" ,libnotify)
-       ("libwnck" ,libwnck-2)
+       ("libwnck" ,libwnck)
        ("libxfce4ui" ,libxfce4ui)
        ("thunar" ,thunar)))
     (home-page "https://www.xfce.org/")
@@ -831,7 +838,7 @@ system resources, while still being visually appealing and user friendly.")
 (define-public xfce4-power-manager
   (package
     (name "xfce4-power-manager")
-    (version "1.6.1")
+    (version "1.6.5")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -839,16 +846,14 @@ system resources, while still being visually appealing and user friendly.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "0sv5927q8jxvdfx7b06f8s7qyq3qa1nqn0b8c1b9bf234d2jba0y"))))
+                "0x3s2bdwfhp65dz5yn3k43j99ywqlsvrpz3pqmgwm0dik5wbdb8h"))))
     (build-system gnu-build-system)
-    (arguments
-     '(#:configure-flags '("--enable-gtk3")))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)))
     (inputs
-     `(("lbxrandr" ,libxrandr)
-       ("gtk+" ,gtk+-2)
+     `(("libxrandr" ,libxrandr)
+       ("gtk+" ,gtk+)
        ("upower" ,upower)
        ("libnotify" ,libnotify)
        ("libxfce4ui" ,libxfce4ui)))
-- 
2.22.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-xfce4-terminal-Update-to-0.8.8.patch --]
[-- Type: text/x-patch, Size: 1216 bytes --]

From 37398ebc1a979c2e956d172111a6327c6f49b7dc Mon Sep 17 00:00:00 2001
From: L  p R n  d n <guix@lprndn.info>
Date: Mon, 19 Aug 2019 14:41:22 +0200
Subject: [PATCH 02/11] gnu: xfce4-terminal: Update to 0.8.8.

* gnu/packages/xfce.scm (xfce4-terminal): Update to 0.8.8.
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 60f1586f06..fcbdbe26c9 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -756,7 +756,7 @@ devices and folders.")
 (define-public xfce4-terminal
   (package
     (name "xfce4-terminal")
-    (version "0.8.7.4")
+    (version "0.8.8")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/apps/" name "/"
@@ -764,7 +764,7 @@ devices and folders.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "1as2dh5ccmv3hdvsbxm4b0xhmv2ky2q18zxxrzr988x79npri3x8"))))
+                "1zc7hkq77ajia099wxgh4wdvwifcg2zkcz5d2xsf1zm0sdh6mflg"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-- 
2.22.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0003-gnu-xfce4-whiskermenu-plugin-Update-to-2.3.3.patch --]
[-- Type: text/x-patch, Size: 1703 bytes --]

From a0856837d2317bb4ecf006298fc0e38d4f2f1915 Mon Sep 17 00:00:00 2001
From: L  p R n  d n <guix@lprndn.info>
Date: Mon, 19 Aug 2019 14:45:47 +0200
Subject: [PATCH 03/11] gnu: xfce4-whiskermenu-plugin: Update to 2.3.3.

* gnu/packages/xfce.scm (xfce4-whiskermenu-plugin): Update to 2.3.3.
[inputs] Add gtk+. Remove gtk+-2.
---
 gnu/packages/xfce.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index fcbdbe26c9..91fec5f2f1 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -421,7 +421,7 @@ keys for controlling the audio volume.")
 (define-public xfce4-whiskermenu-plugin
   (package
     (name "xfce4-whiskermenu-plugin")
-    (version "2.3.1")
+    (version "2.3.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
@@ -429,7 +429,7 @@ keys for controlling the audio volume.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "1cnas2x7xi53v6ylq44040narhzd828dc0ysz8yk3qn2mmvp5yr2"))))
+                "0j0qmk372130avq8n07lfqrcm2al7n07l8gc06bbr1g6q57wrip0"))))
     (build-system cmake-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -438,7 +438,8 @@ keys for controlling the audio volume.")
      `(("xfce4-panel" ,xfce4-panel)
        ("garcon" ,garcon)
        ("exo" ,exo)
-       ("gtk+" ,gtk+-2)))
+       ("gtk+" ,gtk+)
+       ("libxfce4ui" ,libxfce4ui)))
     (arguments
       `(#:tests? #f)) ; no tests
     (home-page "https://goodies.xfce.org/projects/panel-plugins/xfce4-whiskermenu-plugin")
-- 
2.22.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #5: 0004-gnu-xfce4-battery-plugin-Update-tp-1.1.3.patch --]
[-- Type: text/x-patch, Size: 1626 bytes --]

From 06c92906d32d52123f14ceb0a2667b9756668d38 Mon Sep 17 00:00:00 2001
From: L  p R n  d n <guix@lprndn.info>
Date: Mon, 19 Aug 2019 14:50:46 +0200
Subject: [PATCH 04/11] gnu: xfce4-battery-plugin: Update tp 1.1.3.

* gnu/packages/xfce.scm (xfce4-battery-plugin): Update to 1.1.3. Switch from gtk+-2 to gtk+-3.
[inputs] Add gtk+. Remove gtk+2.
---
 gnu/packages/xfce.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 91fec5f2f1..cad3f7583b 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -330,7 +330,7 @@ applications menu, workspace switcher and more.")
 (define-public xfce4-battery-plugin
   (package
     (name "xfce4-battery-plugin")
-    (version "1.1.2")
+    (version "1.1.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
@@ -338,12 +338,12 @@ applications menu, workspace switcher and more.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "1nypi0zazrcrbbm5vb221yw64zxrk56v4fffkblxlyd9m6gk80fn"))))
+                "18s0s004nidii8cc3ldp5n3jajc18vwn9vhkhmhy3lbbs520mghj"))))
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)
                      ("intltool" ,intltool)))
     (inputs `(("glib" ,glib)
-              ("gtk+" ,gtk+-2)
+              ("gtk+" ,gtk+)
               ("libxfce4util" ,libxfce4util)
               ("libxfce4ui" ,libxfce4ui)
               ("xfce4-panel" ,xfce4-panel)))
-- 
2.22.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #6: 0005-gnu-xfce4-pulseaudio-plugin-Update-to-0.4.2.patch --]
[-- Type: text/x-patch, Size: 2196 bytes --]

From f4eae7fa6d92f4898cacfb25843a2b2c00e0bee5 Mon Sep 17 00:00:00 2001
From: L  p R n  d n <guix@lprndn.info>
Date: Mon, 19 Aug 2019 15:51:42 +0200
Subject: [PATCH 05/11] gnu: xfce4-pulseaudio-plugin: Update to 0.4.2.

* gnu/packages/xfce.scm (xfce4-pulseaudio-plugin): Update to 0.4.2.
[arguments] Add augment-cflags phase.
[native-inputs] Add dbus and dbus-glib.
---
 gnu/packages/xfce.scm | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index cad3f7583b..1256578b1b 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -390,7 +390,7 @@ matching them against regular expressions.")
 (define-public xfce4-pulseaudio-plugin
   (package
     (name "xfce4-pulseaudio-plugin")
-    (version "0.4.1")
+    (version "0.4.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
@@ -398,11 +398,26 @@ matching them against regular expressions.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "1w29y0a066y8as12xrkbfqcn7dpdsvx97idzw7028gmcvca87a3c"))))
+                "0851b0vs5xmy3cq899khcghmkqwvh9rnzwavi17msrsq4jyaxs2a"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       ;; For dbus/dbus-glib.h in pulseaudio-config.h
+       (modify-phases %standard-phases
+         (add-after 'set-paths 'augment-cflags
+           (lambda* (#:key inputs #:allow-other-keys)
+             (setenv "C_INCLUDE_PATH"
+                     (string-append (assoc-ref inputs "dbus-glib")
+                                    "/include/dbus-1.0" ":"
+                                    (assoc-ref inputs "dbus")
+                                    "/include/dbus-1.0" ":"
+                                    (getenv "C_INCLUDE_PATH")))
+             #t)))))
     (native-inputs
      `(("intltool" ,intltool)
-       ("pkg-config" ,pkg-config)))
+       ("pkg-config" ,pkg-config)
+       ("dbus-glib" ,dbus-glib)
+       ("dbus" ,dbus)))
     (inputs
      `(("exo" ,exo)
        ("libnotify" ,libnotify)
-- 
2.22.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #7: 0006-gnu-xfce4-xkb-plugin-Update-to-0.8.1.patch --]
[-- Type: text/x-patch, Size: 1671 bytes --]

From 1a1d1e09552c9791d7fa7b9243be208cdd513401 Mon Sep 17 00:00:00 2001
From: L  p R n  d n <guix@lprndn.info>
Date: Mon, 19 Aug 2019 16:37:58 +0200
Subject: [PATCH 06/11] gnu: xfce4-xkb-plugin: Update to 0.8.1.

* gnu/packages/xfce.scm (xfce4-xkb-plugin): Update to 0.8.1.
[inputs] Add libwnck. Remove libwnck-2.
---
 gnu/packages/xfce.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 1256578b1b..dcdcc3089f 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -470,7 +470,7 @@ applications, and includes a search bar to search for applications.")
 (define-public xfce4-xkb-plugin
   (package
     (name "xfce4-xkb-plugin")
-    (version "0.7.1")
+    (version "0.8.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
@@ -478,7 +478,7 @@ applications, and includes a search bar to search for applications.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "10g65j5ia389ahhn3b9hr52ghpp0817fk0m60rfrv4wrzqrjxzk1"))))
+                "18b7cnaf3zxm598p2i47vim3kbbi8w923ia1hwabdph1c89cz7n1"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("intltool" ,intltool)
@@ -486,7 +486,7 @@ applications, and includes a search bar to search for applications.")
     (inputs
      `(("garcon" ,garcon)
        ("librsvg" ,librsvg)
-       ("libwnck" ,libwnck-2)
+       ("libwnck" ,libwnck)
        ("libx11" ,libx11)
        ("libxfce4ui" ,libxfce4ui)
        ("libxklavier" ,libxklavier)
-- 
2.22.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #8: 0007-gnu-xfce4-notifyd-Update-to-0.4.4.patch --]
[-- Type: text/x-patch, Size: 1223 bytes --]

From 0b570d20ed5eab70f8b3eaf916971d993b6557f5 Mon Sep 17 00:00:00 2001
From: L  p R n  d n <guix@lprndn.info>
Date: Mon, 19 Aug 2019 16:59:57 +0200
Subject: [PATCH 07/11] gnu: xfce4-notifyd: Update to 0.4.4.

* gnu/packages/xfce.scm (xfce4-notifyd): Update to 0.4.4.
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index dcdcc3089f..3243ef2377 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -982,7 +982,7 @@ several different time zones.")
 (define-public xfce4-notifyd
   (package
     (name "xfce4-notifyd")
-    (version "0.4.3")
+    (version "0.4.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/apps/"
@@ -990,7 +990,7 @@ several different time zones.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "1h7avj149cafj9dabiza22y14i66vxgp5qj0wxx8i97w9h4dlg99"))))
+                "0m8vlbwdxiw9nmimaj5np9l5qm784gxpkdvc881k0hjcz6n72189"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      `(("intltool" ,intltool)
-- 
2.22.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #9: 0008-gnu-xfce4-taskmanager-Switch-from-libwnck-2-to-libwn.patch --]
[-- Type: text/x-patch, Size: 871 bytes --]

From 0727d602798606b44eb337dee9e9921a9d730c21 Mon Sep 17 00:00:00 2001
From: L  p R n  d n <guix@lprndn.info>
Date: Mon, 19 Aug 2019 16:42:12 +0200
Subject: [PATCH 08/11] gnu: xfce4-taskmanager: Switch from libwnck-2 to
 libwnck.

* gnu/packages/xfce.scm (xfce4-taskmanager)[inputs]: Switch from libwnck-2 to libwnck.
---
 gnu/packages/xfce.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 3243ef2377..6d2155fc53 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -934,7 +934,7 @@ the desktop wallpaper.")
      `(("intltool" ,intltool)
        ("pkg-config" ,pkg-config)))
     (inputs
-     `(("libwnck" ,libwnck-2)
+     `(("libwnck" ,libwnck)
        ("libxmu" ,libxmu)
        ("gtk+" ,gtk+)
        ;; FIXME: Remove libxext and libxt when libxmu propagates them.
-- 
2.22.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #10: 0009-gnu-Add-xfce4-screenshooter.patch --]
[-- Type: text/x-patch, Size: 1827 bytes --]

From 0f3a487b35539f58e5b61252c2a73fc3ba13f40b Mon Sep 17 00:00:00 2001
From: L  p R n  d n <guix@lprndn.info>
Date: Fri, 23 Aug 2019 18:34:53 +0200
Subject: [PATCH 09/11] gnu: Add xfce4-screenshooter.

* gnu/packages/xfce.scm (xfce4-screenshooter): New variable.
---
 gnu/packages/xfce.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 6d2155fc53..e41e5caf10 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1087,3 +1087,34 @@ of data to either CD/DVD/BD.")
     (description
      "Mousepad is a graphical text editor for Xfce based on Leafpad.")
     (license gpl2+)))
+
+(define-public xfce4-screenshooter
+  (package
+   (name "xfce4-screenshooter")
+   (version "1.9.5")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "http://archive.xfce.org/src/apps/"
+                                "xfce4-screenshooter/"
+                                (version-major+minor version)
+                                "/xfce4-screenshooter-"
+                                version ".tar.bz2"))
+            (sha256
+             (base32
+              "135kad07922jxjs05amn48sdgm2x1rh97wbzdmy9h85r5i1vaddz"))))
+   (build-system gnu-build-system)
+   (native-inputs
+    `(("pkg-config" ,pkg-config)
+      ("intltool" ,intltool)
+      ("glib:bin" ,glib "bin")))        ; glib-genmarshal
+   (inputs
+    `(("exo" ,exo)
+      ("libsoup" ,libsoup)
+      ("libxfce4ui" ,libxfce4ui)
+      ("xfce4-panel" ,xfce4-panel)))
+   (home-page "https://goodies.xfce.org/projects/applications/xfce4-screenshooter")
+   ;; TODO
+   (synopsis "Simple text editor for Xfce")
+   (description
+    "Mousepad is a graphical text editor for Xfce based on Leafpad.")
+   (license gpl2+)))
-- 
2.22.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #11: 0010-gnu-Add-xfce4-screensaver.patch --]
[-- Type: text/x-patch, Size: 2408 bytes --]

From 67e3ea90c5196125f35e285690f28355d41181af Mon Sep 17 00:00:00 2001
From: L  p R n  d n <guix@lprndn.info>
Date: Fri, 23 Aug 2019 19:36:01 +0200
Subject: [PATCH 10/11] gnu: Add xfce4-screensaver.

---
 gnu/packages/xfce.scm | 46 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index e41e5caf10..98918883ce 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1118,3 +1118,49 @@ of data to either CD/DVD/BD.")
    (description
     "Mousepad is a graphical text editor for Xfce based on Leafpad.")
    (license gpl2+)))
+
+(define-public xfce4-screensaver
+  (package
+   (name "xfce4-screensaver")
+   (version "0.1.8")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "http://archive.xfce.org/src/apps/"
+                                "xfce4-screensaver/"
+                                (version-major+minor version)
+                                "/xfce4-screensaver-"
+                                version ".tar.bz2"))
+            (sha256
+             (base32
+              "1mv0r150yb29kji2rr2462g9p574bqjax1lb6bzcqgpxlmg08mj0"))))
+   (build-system gnu-build-system)
+   (arguments
+    `(#:phases
+      (modify-phases %standard-phases
+         (add-after 'unpack 'fix-dbus-1-path
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (dbus-dir (string-append out "/share/dbus-1/services")))
+             (substitute* "configure"
+               (("dbus-1") ""))))))))
+   (native-inputs
+    `(("pkg-config" ,pkg-config)
+      ("intltool" ,intltool)
+      ("glib" ,glib)                    ; glib-compile-schemas
+      ("glib:bin" ,glib "bin")))        ; glib-compile-schemas
+   (inputs
+    `(("dbus-glib" ,dbus-glib)
+      ("libux-pam" ,linux-pam)
+      ("elogind" ,elogind)
+      ("garcon" ,garcon)
+      ("libxklavier" ,libxklavier)
+      ("libwnxk" ,libwnck)
+      ("libxscrnsaver" ,libxscrnsaver)
+      ("xfconf" ,xfconf)))
+   (home-page "https://docs.xfce.org/apps/screensaver/start")
+   ;; TODO
+   (synopsis "Screensaver for the Xfce desktop")
+   (description
+    "Xfce Screensaver is a screen saver and locker that aims to have simple,
+ sane, secure defaults and be well integrated with the Xfce desktop. ")
+   (license gpl2+)))
-- 
2.22.0


[-- Attachment #12: 0011-gnu-Add-copyright-header.patch --]
[-- Type: text/x-patch, Size: 775 bytes --]

From 3ae5ddbc88527419e3f64e42aad5e7aa351fdb24 Mon Sep 17 00:00:00 2001
From: L  p R n  d n <guix@lprndn.info>
Date: Tue, 20 Aug 2019 22:39:34 +0200
Subject: [PATCH 11/11] gnu: Add copyright header.

* gnu/packages/xfce.scm: Add copyright header.
---
 gnu/packages/xfce.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 98918883ce..752513db89 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2017 ng0 <ng0@n0.is>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
+;;; Copyright © 2019 L  p R n  d n <guix@lprndn.info>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
-- 
2.22.0

bug#37121: [PATCH 00/40] Update Xfce to 4.14

[Ludovic Courtès]

Hello,

L  p R n  d n    <guix@lprndn.info> skribis:

> Here are the new patches. Hope everything it's ok.
> I took the liberty to send the as attachment to avoid scambling them.
> There is one main patch for base xfce components' update + patches for
> other packages part of xfce. I also added two new components of xfce.
> I'll send the rest in their own bug report.

I applied all these except that last 3 patches, which you can send in a
separate issue when you’re ready.

Thanks!

Ludo’.

[bug#37121] [PATCH 00/40] Update Xfce to 4.14

[L p R n d n]

Re-hello,


Please forget the last two patches adding xfce4-screensaver and
xfce4-screenshooter as the TODO comments should have clearly given me a
hint on their state..

Have a nice day,

L  p R n  d n