Subject: Re: [bug#28116] mate partial review

From: Efraim Flashner <[email-masked]>
Date: Sun, 3 Sep 2017 18:09:18 +0300

On Thu, Aug 31, 2017 at 01:21:09PM +0000, ng0 wrote:
> ng0 transcribed 47K bytes:
> > I did the best I could guess with this updated patch series.
> > If I missed something you addressed already, please point it
> > out in a format which is more friendly to read than a mono-patch.
> > 
> > If this series is alright I want to sort the inputs of the
> > longest packages with the version which is then good to go.
> > 
> > Thanks for taking the time to review!
> 
> You could also read through them here:
> https://gitweb.krosos.org/ng0_guix/guix/log/?h=system/mate
> http://gitweb.xpcbqhqx6ynktue7.onion/ng0_guix/guix/log/?h=system/mate
> -- 

That worked out well. I think we're about there, I just want you to
check that it works well when used as a DE.

-- 
Efraim Flashner   <[email-masked]>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
From 689e10dfafb000de3e8e1fe8498af2f4b059d9df Mon Sep 17 00:00:00 2001
From: Efraim Flashner <[email-masked]>
Date: Sun, 3 Sep 2017 15:12:32 +0300
Subject: [PATCH 01/14] mate-themes

---
 gnu/packages/mate.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index d1be999c7a..3c912fa811 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -88,11 +88,9 @@
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("intltool" ,intltool)))
-    (inputs
-     `(("gdk-pixbuf" ,gdk-pixbuf)
-       ("gtk-engines" ,gtk-engines)
-       ("murrine" ,murrine)))
+       ("intltool" ,intltool)
+       ("gdk-pixbuf" ,gdk-pixbuf) ; gdk-pixbuf+svg isn't needed
+       ("gtk" ,gtk+-2)))
     (home-page "https://mate-desktop.org/")
     (synopsis
      "Official themes for the MATE desktop")
-- 
2.14.1

From 902308e57a8714da1b22034b393ea46e43aa6895 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <[email-masked]>
Date: Sun, 3 Sep 2017 15:27:04 +0300
Subject: [PATCH 02/14] libmateweather

---
 gnu/packages/mate.scm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 3c912fa811..8719035b85 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -148,14 +148,13 @@ desktop and the mate-about program.")
                 "0z6vfh42fv9rqjrraqfpf6h9nd9h662bxy3l3r48j19xvxrwmx3a"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags
+     '(#:configure-flags
        (list (string-append "--with-zoneinfo-dir="
                             (assoc-ref %build-inputs "tzdata")
                             "/share/zoneinfo"))
        #:phases
        (modify-phases %standard-phases
-         (add-before
-          'check 'pre-check
+         (add-before 'check 'fix-tzdata-location
           (lambda* (#:key inputs #:allow-other-keys)
             (substitute* "data/check-timezones.sh"
               (("/usr/share/zoneinfo/zone.tab")
@@ -165,11 +164,10 @@ desktop and the mate-about program.")
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)
+       ("dconf" ,dconf)
        ("glib:bin" ,glib "bin")))
     (inputs
-     `(("dconf" ,dconf)
-       ("gdk-pixbuf" ,gdk-pixbuf)
-       ("gtk+" ,gtk+)
+     `(("gtk+" ,gtk+)
        ("tzdata" ,tzdata)))
     (propagated-inputs
       ;; both of these are requires.private in mateweather.pc
-- 
2.14.1

From 034e0dc0e21de0b0e0aa77c924f5c4e50801b66a Mon Sep 17 00:00:00 2001
From: Efraim Flashner <[email-masked]>
Date: Sun, 3 Sep 2017 15:27:50 +0300
Subject: [PATCH 03/14] mate-terminal

---
 gnu/packages/mate.scm | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 8719035b85..25ba4b92ac 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -197,24 +197,20 @@ the MATE desktop environment.")
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)
-       ("libsm" ,libsm)))
-    (inputs
-     `(("gtk+" ,gtk+)
-       ("gdk-pixbuf" ,gdk-pixbuf)
-       ("exempi" ,exempi)
-       ("libnotify" ,libnotify)
+       ("itstool" ,itstool)
+       ("gobject-introspection" ,gobject-introspection)
        ("libxml2" ,libxml2)
+       ("yelp-tools" ,yelp-tools)))
+    (inputs
+     `(("dconf" ,dconf)
+       ("gtk+" ,gtk+)
        ("libice" ,libice)
+       ("libsm" ,libsm)
        ("libx11" ,libx11)
+       ("mate-desktop" ,mate-desktop)
        ("pango" ,pango)
-       ("itstool" ,itstool)
-       ("vte" ,vte)
-       ("yelp-tools" ,yelp-tools)
-       ("gobject-introspection" ,gobject-introspection)
-       ("mate-desktop" ,mate-desktop)))
-    (propagated-inputs
-     `(("dconf" ,dconf)))
-    (home-page "http://mate-desktop.org/")
+       ("vte" ,vte)))
+    (home-page "https://mate-desktop.org/")
     (synopsis "MATE Terminal Emulator")
     (description
      "MATE Terminal is a terminal emulation application that you can
-- 
2.14.1

From de0756fe7ca641170768a1f463dff516f0abeac6 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <[email-masked]>
Date: Sun, 3 Sep 2017 15:29:00 +0300
Subject: [PATCH 04/14] mate-session-manager

---
 gnu/packages/mate.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 25ba4b92ac..4054510a41 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -245,7 +245,7 @@ configurations (profiles).  MATE Terminal is a fork of GNOME Terminal.")
        ("dbus-glib" ,dbus-glib)
        ("libsm" ,libsm)
        ("mate-desktop" ,mate-desktop)))
-    (home-page "http://mate-desktop.org/")
+    (home-page "https://mate-desktop.org/")
     (synopsis "Session manager for MATE")
     (description
      "Mate-session contains the MATE session manager, as well as a
-- 
2.14.1

From 7e9e8d09e1ff0b706400e8d454834839bbfdef43 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <[email-masked]>
Date: Sun, 3 Sep 2017 15:29:45 +0300
Subject: [PATCH 05/14] mate-settings-daemon

---
 gnu/packages/mate.scm | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 4054510a41..9969a93dfa 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -271,29 +271,25 @@ configuration program to choose applications starting on login.")
        ("intltool" ,intltool)
        ("gobject-introspection" ,gobject-introspection)))
     (inputs
-     `(("gtk+" ,gtk+)
+     `(("cairo" ,cairo)
+       ("dbus" ,dbus)
        ("dbus-glib" ,dbus-glib)
-       ("mate-desktop" ,mate-desktop)
+       ("dconf" ,dconf)
+       ("fontconfig" ,fontconfig)
+       ("gtk+" ,gtk+)
+       ("libcanberra" ,libcanberra)
        ("libmatekbd" ,libmatekbd)
        ("libmatemixer" ,libmatemixer)
-       ("libxklavier" ,libxklavier)
+       ("libnotify" ,libnotify)
        ("libx11" ,libx11)
-       ("cairo" ,cairo)
-       ("gdk-pixbuf" ,gdk-pixbuf)
-       ("libxi" ,libxi)
        ("libxext" ,libxext)
-       ("inputproto" ,inputproto)
-       ("xproto" ,xproto)
-       ("startup-notification" ,startup-notification)
-       ("libnotify" ,libnotify)
-       ("dbus" ,dbus)
-       ("polkit" ,polkit)
-       ("pulseaudio" ,pulseaudio)
+       ("libxi" ,libxi)
+       ("libxklavier" ,libxklavier)
+       ("mate-desktop" ,mate-desktop)
        ("nss" ,nss)
-       ("libcanberra" ,libcanberra)
-       ("fontconfig" ,fontconfig)
-       ("dconf" ,dconf)))
-    (home-page "http://mate-desktop.org/")
+       ("polkit" ,polkit)
+       ("startup-notification" ,startup-notification)))
+    (home-page "https://mate-desktop.org/")
     (synopsis "Settings Daemon for MATE")
     (description
      "Mate-settings-daemon is a fork of gnome-settings-daemon.")
-- 
2.14.1

From 3475e859ba070aee282a6566ef76ddcd02814908 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <[email-masked]>
Date: Sun, 3 Sep 2017 15:30:28 +0300
Subject: [PATCH 06/14] libmatemixer

---
 gnu/packages/mate.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 9969a93dfa..868c1c1efa 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -317,7 +317,7 @@ configuration program to choose applications starting on login.")
      `(("glib" ,glib)
        ("pulseaudio" ,pulseaudio)
        ("alsa-lib" ,alsa-lib)))
-    (home-page "http://mate-desktop.org/")
+    (home-page "https://mate-desktop.org/")
     (synopsis "Mixer library for the MATE desktop")
     (description
      "Libmatemixer is a mixer library for MATE desktop.  It provides an abstract
-- 
2.14.1

From 55a90bc02fda5525843de94c0afbfa91ae1c4301 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <[email-masked]>
Date: Sun, 3 Sep 2017 15:30:56 +0300
Subject: [PATCH 07/14] libmakekbd

---
 gnu/packages/mate.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 868c1c1efa..820d69272e 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -344,13 +344,13 @@ sound systems.")
        ("intltool" ,intltool)
        ("gobject-introspection" ,gobject-introspection)))
     (inputs
-     `(("glib" ,glib)
-       ("gdk-pixbuf" ,gdk-pixbuf)
+     `(("cairo" ,cairo)
+       ("gdk-pixbuf" ,gdk-pixbuf+svg)
+       ("glib" ,glib)
        ("gtk+" ,gtk+)
-       ("cairo" ,cairo)
        ("libx11" ,libx11)
        ("libxklavier" ,libxklavier)))
-    (home-page "http://mate-desktop.org/")
+    (home-page "https://mate-desktop.org/")
     (synopsis "MATE keyboard configuration library")
     (description
      "Libmatekbd is a keyboard configuration library for the
-- 
2.14.1

From 34d15eaf9d31541e49b5d944604e13c00239e107 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <[email-masked]>
Date: Sun, 3 Sep 2017 15:31:37 +0300
Subject: [PATCH 08/14] mate-menus

---
 gnu/packages/mate.scm | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 820d69272e..d754cd0130 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -371,18 +371,17 @@ MATE desktop environment.")
                 "05kyr37xqv6hm1rlvnqd5ng0x1n883brqynkirkk5drl56axnz7h"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases
+     '(#:phases
        (modify-phases %standard-phases
-         (add-after
-          'unpack 'fix-introspection-install-dir
-          (lambda* (#:key outputs #:allow-other-keys)
-            (let ((out (assoc-ref outputs "out")))
-              (substitute* '("configure")
-                (("`\\$PKG_CONFIG --variable=girdir gobject-introspection-1.0`")
-                 (string-append "\"" out "/share/gir-1.0/\""))
-                (("\\$\\(\\$PKG_CONFIG --variable=typelibdir gobject-introspection-1.0\\)")
-                 (string-append out "/lib/girepository-1.0/")))
-              #t))))))
+         (add-after 'unpack 'fix-introspection-install-dir
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (substitute* '("configure")
+                 (("`\\$PKG_CONFIG --variable=girdir gobject-introspection-1.0`")
+                  (string-append "\"" out "/share/gir-1.0/\""))
+                 (("\\$\\(\\$PKG_CONFIG --variable=typelibdir gobject-introspection-1.0\\)")
+                  (string-append out "/lib/girepository-1.0/")))
+               #t))))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)
-- 
2.14.1

From 1141e89292c927b411e2e48156c93146add9c6a2 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <[email-masked]>
Date: Sun, 3 Sep 2017 15:32:17 +0300
Subject: [PATCH 09/14] mate-applets

---
 gnu/packages/mate.scm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index d754cd0130..e1ca628c27 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -424,23 +424,25 @@ assorted menu related utility programs.")
      `(("atk" ,atk)
        ("dbus" ,dbus)
        ("dbus-glib" ,dbus-glib)
-       ("gdk-pixbuf" ,gdk-pixbuf)
        ("glib" ,glib)
        ("gucharmap" ,gucharmap)
        ("gtk+" ,gtk+)
        ("gtksourceview" ,gtksourceview)
+       ("libgtop" ,libgtop)
        ("libmateweather" ,libmateweather)
-       ("libwnck" ,libwnck)
        ("libnotify" ,libnotify)
        ("libx11" ,libx11)
-       ("libgtop" ,libgtop)
        ("libxml2" ,libxml2)
+       ("libwnck" ,libwnck)
        ("mate-panel" ,mate-panel)
-       ("wireless-tools" ,wireless-tools)
        ("pango" ,pango)
+       ("polkit" ,polkit) ; either polkit or setuid
        ("python" ,python-2)
-       ("python-pygobject" ,python-pygobject)))
-    (home-page "http://mate-desktop.org/")
+       ("upower" ,upower)
+       ("wireless-tools" ,wireless-tools)))
+    (propagated-inputs
+     `(("python-pygobject" ,python-pygobject)))
+    (home-page "https://mate-desktop.org/")
     (synopsis "Various applets for the MATE Panel")
     (description
      "Mate-applets includes various small applications for Mate-panel:
-- 
2.14.1

From 61951c595e850bd8fcb621988901c8baeb5e8a93 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <[email-masked]>
Date: Sun, 3 Sep 2017 15:33:06 +0300
Subject: [PATCH 10/14] mate-media

---
 gnu/packages/mate.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index e1ca628c27..14fa34ee17 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -491,17 +491,17 @@ Interactive Weather Information Network (IWIN).
        ("gettext" ,gettext-minimal)
        ("gobject-introspection" ,gobject-introspection)))
     (inputs
-     `(("gtk+" ,gtk+)
-       ("pango" ,pango)
+     `(("cairo" ,cairo)
+       ("gtk+" ,gtk+)
+       ("libcanberra" ,libcanberra)
        ("libmatemixer" ,libmatemixer)
        ("libxml2" ,libxml2)
        ("mate-applets" ,mate-applets)
-       ("mate-panel" ,mate-panel)
        ("mate-desktop" ,mate-desktop)
-       ("libcanberra" ,libcanberra)
-       ("startup-notification" ,startup-notification)
-       ("cairo" ,cairo)))
-    (home-page "http://mate-desktop.org/")
+       ("mate-panel" ,mate-panel)
+       ("pango" ,pango)
+       ("startup-notification" ,startup-notification)))
+    (home-page "https://mate-desktop.org/")
     (synopsis "Multimedia related programs for the MATE desktop")
     (description
      "Mate-media includes the MATE media tools for MATE, including
-- 
2.14.1

From 3f71b119dfefe06357808a34e44fde6ebb7f0f31 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <[email-masked]>
Date: Sun, 3 Sep 2017 15:34:26 +0300
Subject: [PATCH 11/14] mate-panel

---
 gnu/packages/mate.scm | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 14fa34ee17..1083d998e0 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -524,10 +524,11 @@ MATE-Media is a fork of GNOME-Media.")
          "1n565ff1n7jrfx223i3cl3m69wjda506nvbn8gra7m1jwdfzpbw1"))))
     (build-system glib-or-gtk-build-system)
     (arguments
-     `(#:configure-flags
+     '(#:configure-flags
        (list (string-append "--with-zoneinfo-dir="
                             (assoc-ref %build-inputs "tzdata")
-                            "/share/zoneinfo"))
+                            "/share/zoneinfo")
+             "--with-in-process-applets=all")
        #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'fix-timezone-path
@@ -553,28 +554,27 @@ MATE-Media is a fork of GNOME-Media.")
        ("intltool" ,intltool)
        ("itstool" ,itstool)
        ("xtrans" ,xtrans)
-       ("tzdata" ,tzdata)
        ("gobject-introspection" ,gobject-introspection)))
     (inputs
-     `(("gtk+" ,gtk+)
+     `(("dconf" ,dconf)
+       ("cairo" ,cairo)
        ("dbus-glib" ,dbus-glib)
-       ("libwnck" ,libwnck)
-       ("pango" ,pango)
-       ("librsvg" ,librsvg)
+       ("gtk+" ,gtk+)
        ("libcanberra" ,libcanberra)
-       ("libmateweather" ,libmateweather)
-       ("libxrandr" ,libxrandr)
-       ("libxml2" ,libxml2)
-       ("dconf" ,dconf)
-       ("cairo" ,cairo)
-       ("gdk-pixbuf" ,gdk-pixbuf)
        ("libice" ,libice)
+       ("libmateweather" ,libmateweather)
+       ("librsvg" ,librsvg)
+       ("libsm" ,libsm)
        ("libx11" ,libx11)
        ("libxau" ,libxau)
+       ("libxml2" ,libxml2)
+       ("libxrandr" ,libxrandr)
+       ("libwnck" ,libwnck)
+       ("mate-desktop" ,mate-desktop)
        ("mate-menus" ,mate-menus)
-       ("libsm" ,libsm)
-       ("mate-desktop" ,mate-desktop)))
-    (home-page "http://mate-desktop.org/")
+       ("pango" ,pango)
+       ("tzdata" ,tzdata)))
+    (home-page "https://mate-desktop.org/")
     (synopsis "Panel for MATE")
     (description
      "Mate-panel contains the MATE panel, the libmate-panel-applet library and
-- 
2.14.1

From 3af260a250a2d4e475d75f9a4845517ec1519c6c Mon Sep 17 00:00:00 2001
From: Efraim Flashner <[email-masked]>
Date: Sun, 3 Sep 2017 15:35:03 +0300
Subject: [PATCH 12/14] caja

---
 gnu/packages/mate.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 1083d998e0..9a941e3240 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -598,12 +598,12 @@ infamous 'Wanda the Fish'.")
          "0mljqcx7k8p27854zm7qzzn8ca6hs7hva9p43hp4p507z52caqmm"))))
     (build-system glib-or-gtk-build-system)
     (arguments
-     `(#:configure-flags '("--disable-update-mimedb")
-       #:tests? #f ; tests fail even with display set
+     '(#:configure-flags '("--disable-update-mimedb")
+       #:tests? #f ; _XSERVTransmkdir: ERROR: euid != 0,directory /tmp/.X11-unix will not be created.
        #:phases
        (modify-phases %standard-phases
          (add-before 'check 'pre-check
-           (lambda* (#:key inputs #:allow-other-keys)
+           (lambda _
              ;; Tests require a running X server.
              (system "Xvfb :1 &")
              (setenv "DISPLAY" ":1")
@@ -617,16 +617,16 @@ infamous 'Wanda the Fish'.")
        ("xorg-server" ,xorg-server)
        ("gobject-introspection" ,gobject-introspection)))
     (inputs
-     `(("gtk+" ,gtk+)
-       ("exempi" ,exempi)
+     `(("exempi" ,exempi)
+       ("gtk+" ,gtk+)
        ("gvfs" ,gvfs)
        ("libexif" ,libexif)
-       ("libsm" ,libsm)
        ("libnotify" ,libnotify)
+       ("libsm" ,libsm)
        ("libxml2" ,libxml2)
        ("mate-desktop" ,mate-desktop)
        ("startup-notification" ,startup-notification)))
-    (home-page "http://mate-desktop.org/")
+    (home-page "https://mate-desktop.org/")
     (synopsis "File manager for the MATE desktop")
     (description
      "Caja is the official file manager for the MATE desktop.
-- 
2.14.1

From 0881a22187ebd5e8bcea6e9dc4c219cf6a332c9b Mon Sep 17 00:00:00 2001
From: Efraim Flashner <[email-masked]>
Date: Sun, 3 Sep 2017 15:35:45 +0300
Subject: [PATCH 13/14] mate-control-center

---
 gnu/packages/mate.scm | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 9a941e3240..d023a3c17a 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -656,7 +656,6 @@ Caja is a fork of Nautilus.")
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)
-       ("glib" ,glib)
        ("yelp-tools" ,yelp-tools)
        ("desktop-file-utils" ,desktop-file-utils)
        ("kbproto" ,kbproto)
@@ -665,42 +664,40 @@ Caja is a fork of Nautilus.")
        ("scrnsaverproto" ,scrnsaverproto)
        ("xextpro" ,xextproto)
        ("xproto" ,xproto)
+       ("xmodmap" ,xmodmap)
        ("gobject-introspection" ,gobject-introspection)))
     (inputs
      `(("atk" ,atk)
-       ("startup-notification" ,startup-notification)
-       ("dbus-glib" ,dbus-glib)
-       ("libxml2" ,libxml2)
-       ("dconf" ,dconf)
-       ("librsvg" ,librsvg)
-       ("libmatekbd" ,libmatekbd)
-       ("mate-desktop" ,mate-desktop)
+       ("cairo" ,cairo)
        ("caja" ,caja)
-       ("mate-menus" ,mate-menus)
-       ("mate-settings-daemon" ,mate-settings-daemon)
+       ("dconf" ,dconf)
+       ("dbus" ,dbus)
+       ("dbus-glib" ,dbus-glib)
        ("fontconfig" ,fontconfig)
        ("freetype" ,freetype)
-       ("libcanberra" ,libcanberra)
-       ("dbus" ,dbus)
-       ("xmodmap" ,xmodmap)
-       ("cairo" ,cairo)
-       ("gdk-pixbuf" ,gdk-pixbuf)
+       ("glib" ,glib)
        ("gtk+" ,gtk+)
-       ("libxcursor" ,libxcursor)
+       ("libcanberra" ,libcanberra)
+       ("libmatekbd" ,libmatekbd)
        ("libx11" ,libx11)
-       ("libxscrnsaver" ,libxscrnsaver)
        ("libxcursor" ,libxcursor)
        ("libxext" ,libxext)
        ("libxi" ,libxi)
+       ("libxklavier" ,libxklavier)
+       ("libxml2" ,libxml2)
        ("libxrandr" ,libxrandr)
        ("libxrender" ,libxrender)
-       ("libxklavier" ,libxklavier)
+       ("libxscrnsaver" ,libxscrnsaver)
        ("marco" ,marco)
-       ("pango" ,pango)))
+       ("mate-desktop" ,mate-desktop)
+       ("mate-menus" ,mate-menus)
+       ("mate-settings-daemon" ,mate-settings-daemon)
+       ("pango" ,pango)
+       ("startup-notification" ,startup-notification)))
     (propagated-inputs
-     `(("gdk-pixbuf" ,gdk-pixbuf) ; mate-slab.pc
-       ("librsvg" ,librsvg))) ; mate-slab.pc  
-    (home-page "http://mate-desktop.org/")
+     `(("gdk-pixbuf" ,gdk-pixbuf+svg) ; mate-slab.pc
+       ("librsvg" ,librsvg))) ; mate-slab.pc
+    (home-page "https://mate-desktop.org/")
     (synopsis "MATE Desktop configuration tool")
     (description
      "MATE control center is MATE's main interface for configuration
-- 
2.14.1

From dda8c61c39ec9b0ee21ed80b0412742f69eaea8e Mon Sep 17 00:00:00 2001
From: Efraim Flashner <[email-masked]>
Date: Sun, 3 Sep 2017 15:36:29 +0300
Subject: [PATCH 14/14] marco

---
 gnu/packages/mate.scm | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index d023a3c17a..4d9daf2681 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -723,33 +723,29 @@ of various aspects of your desktop.")
        ("intltool" ,intltool)
        ("itstool" ,itstool)
        ("glib" ,glib)
-       ("gobject-introspection" ,gobject-introspection)))
+       ("gobject-introspection" ,gobject-introspection)
+       ("libxft" ,libxft)
+       ("libxml2" ,libxml2)
+       ("zenity" ,zenity)))
     (inputs
      `(("gtk+" ,gtk+)
+       ("libcanberra" ,libcanberra)
        ("libgtop" ,libgtop)
-       ("zenity" ,zenity)
-       ("libxcursor" ,libxcursor)
+       ("libice" ,libice)
        ("libsm" ,libsm)
-       ("libxml2" ,libxml2)
-       ("libgtop" ,libgtop)
-       ("gdk-pixbuf" ,gdk-pixbuf)
        ("libx11" ,libx11)
-       ("libice" ,libice)
        ("libxcomposite" ,libxcomposite)
+       ("libxcursor" ,libxcursor)
        ("libxdamage" ,libxdamage)
        ("libxext" ,libxext)
        ("libxfixes" ,libxfixes)
+       ("libxinerama" ,libxinerama)
        ("libxrandr" ,libxrandr)
        ("libxrender" ,libxrender)
-       ("libxft" ,libxft)
+       ("mate-desktop" ,mate-desktop)
        ("pango" ,pango)
-       ("startup-notification" ,startup-notification)
-       ("libxinerama" ,libxinerama)
-       ("xextproto" ,xextproto)
-       ("xproto" ,xproto)
-       ("libcanberra" ,libcanberra)
-       ("mate-desktop" ,mate-desktop)))
-    (home-page "http://mate-desktop.org/")
+       ("startup-notification" ,startup-notification)))
+    (home-page "https://mate-desktop.org/")
     (synopsis "Window manager for the MATE desktop")
     (description
      "Marco is a minimal X window manager that uses GTK+ for drawing
-- 
2.14.1