* [bug#28116] MATE (and mate-terminal + caja) @ 2017-08-16 20:56 ng0 2017-08-23 21:04 ` ng0 2017-08-24 20:42 ` [bug#28116] mate partial review Efraim Flashner 0 siblings, 2 replies; 10+ messages in thread From: ng0 @ 2017-08-16 20:56 UTC (permalink / raw) To: 28116 [-- Attachment #1.1: Type: text/plain, Size: 685 bytes --] Hi, appended are the patches to add the minimal base of the MATE Desktop Environment which is required to log into it use it with the panel. I have tested the package "mate" successfully on x86_64 in a VM. mate-terminal and caja work outside of the environment, and can be tested with any desktop environment/manager. There are some descriptions which can be improved because the upstream description was super short. Some last input checks must be done aswell, I'll send this as version 1 of the patch series now. -- ng0 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://n0is.noblogs.org/my-keys https://www.infotropique.org https://krosos.org [-- Attachment #1.2: 0001-gnu-mate-Fetch-sources-via-https.patch --] [-- Type: text/plain, Size: 3163 bytes --] From 360704323783b52a5a89ee6462df50e0a08f6dd2 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Wed, 16 Aug 2017 10:27:04 +0000 Subject: [PATCH 01/10] gnu: mate: Fetch sources via https. * gnu/packages/mate.scm (mate-icon-theme)[source]: Use https. (mate-themes)[source]: Likewise. (mate-desktop)[source]: Likewise. (libmateweather)[source]: Likewise. (mate-menus)[source]: Likewise. --- gnu/packages/mate.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 316385a6f..ff920c543 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2017 ng0 <ng0@infotropique.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,7 +41,7 @@ (version "1.18.2") (source (origin (method url-fetch) - (uri (string-append "http://pub.mate-desktop.org/releases/" + (uri (string-append "https://pub.mate-desktop.org/releases/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 @@ -64,7 +65,7 @@ (version "3.22.11") (source (origin (method url-fetch) - (uri (string-append "http://pub.mate-desktop.org/releases/themes/" + (uri (string-append "https://pub.mate-desktop.org/releases/themes/" (version-major+minor version) "/mate-themes-" version ".tar.xz")) (sha256 @@ -95,7 +96,7 @@ themes for both gtk+-2 and gtk+-3.") (version "1.18.0") (source (origin (method url-fetch) - (uri (string-append "http://pub.mate-desktop.org/releases/" + (uri (string-append "https://pub.mate-desktop.org/releases/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 @@ -128,7 +129,7 @@ desktop and the mate-about program.") (version "1.18.1") (source (origin (method url-fetch) - (uri (string-append "http://pub.mate-desktop.org/releases/" + (uri (string-append "https://pub.mate-desktop.org/releases/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 @@ -176,7 +177,7 @@ the MATE desktop environment.") (version "1.18.0") (source (origin (method url-fetch) - (uri (string-append "http://pub.mate-desktop.org/releases/" + (uri (string-append "https://pub.mate-desktop.org/releases/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 -- 2.14.1 [-- Attachment #1.3: 0002-gnu-Add-caja.patch --] [-- Type: text/plain, Size: 3055 bytes --] From edd13bcb146c4aa78d5d9a757cd24bae600bde2c Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Sun, 6 Aug 2017 17:22:41 +0000 Subject: [PATCH 02/10] gnu: Add caja. * gnu/packages/mate.scm (caja): New variable. --- gnu/packages/mate.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index ff920c543..6f34ecaa4 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -24,8 +24,10 @@ #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system glib-or-gtk) #:use-module (gnu packages) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) @@ -33,6 +35,7 @@ #:use-module (gnu packages xdisorg) #:use-module (gnu packages base) #:use-module (gnu packages xml) + #:use-module (gnu packages photo) #:use-module (gnu packages python)) (define-public mate-icon-theme @@ -211,3 +214,47 @@ the MATE desktop environment.") specification, the MATE menu layout configuration files, .directory files and assorted menu related utility programs.") (license (list license:gpl2+ license:lgpl2.0+)))) + +(define-public caja + (package + (name "caja") + (version "1.18.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0mljqcx7k8p27854zm7qzzn8ca6hs7hva9p43hp4p507z52caqmm")))) + (build-system glib-or-gtk-build-system) + (arguments + `(#:tests? #f)) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("gtk+" ,gtk+) + ("exempi" ,exempi) + ("gvfs" ,gvfs) + ("libexif" ,libexif) + ("libsm" ,libsm) + ("libnotify" ,libnotify) + ("libxml2" ,libxml2) + ("mate-desktop" ,mate-desktop) + ("startup-notification" ,startup-notification))) + (home-page "http://mate-desktop.org/") + (synopsis "File manager for the MATE desktop") + (description + "Caja is the official file manager for the MATE desktop. +It allows for browsing directories, as well as previewing files and launching +applications associated with them. Caja is also responsible for handling the +icons on the MATE desktop. It works on local and remote filesystems. +Caja is a fork of Nautilus.") + ;; There is a note about a TRADEMARKS_NOTICE file in COPYING which + ;; does not exist. It is safe to assume that this is of no concern + ;; for us. + (license license:gpl2+))) -- 2.14.1 [-- Attachment #1.4: 0003-gnu-Add-mate-terminal.patch --] [-- Type: text/plain, Size: 2443 bytes --] From 0bf9795704b447bf652dedf628e156caded5c51d Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Sun, 6 Aug 2017 18:29:40 +0000 Subject: [PATCH 03/10] gnu: Add mate-terminal. * gnu/packages/mate.scm (mate-terminal): New variable. --- gnu/packages/mate.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 6f34ecaa4..66ef9aaff 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -174,6 +174,52 @@ desktop and the mate-about program.") the MATE desktop environment.") (license license:lgpl2.1+))) +(define-public mate-terminal + (package + (name "mate-terminal") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1zihm609d2d9cw53ry385whshjl1dnkifpk41g1ddm9f58hv4da1")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("libsm" ,libsm))) + (inputs + `(("gtk+" ,gtk+) + ("gdk-pixbuf" ,gdk-pixbuf) + ("exempi" ,exempi) + ("libnotify" ,libnotify) + ("libxml2" ,libxml2) + ("libice" ,libice) + ("libx11" ,libx11) + ("pango" ,pango) + ("itstool" ,itstool) + ("vte" ,vte) + ("glib:bin" ,glib "bin") + ("yelp-tools" ,yelp-tools) + ("gobject-introspection" ,gobject-introspection) + ("mate-desktop" ,mate-desktop))) + (propagated-inputs + `(("dconf" ,dconf))) + (home-page "http://mate-desktop.org/") + (synopsis "MATE Terminal Emulator") + (description + "MATE Terminal is a terminal emulation application that you can +use to access a UNIX shell in the MATE environment. With it, you can +run any application that is designed to run on VT102, VT220, and xterm +terminals. MATE Terminal also has the ability to use multiple terminals +in a single window (tabs) and supports management of different +configurations (profiles). MATE Terminal is a fork of GNOME Terminal.") + (license license:gpl3))) + (define-public mate-menus (package (name "mate-menus") -- 2.14.1 [-- Attachment #1.5: 0004-gnu-Add-marco.patch --] [-- Type: text/plain, Size: 3079 bytes --] From 135e6c0da64c80ab76228b387255fa74d7275b32 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Sun, 6 Aug 2017 18:03:17 +0000 Subject: [PATCH 04/10] gnu: Add marco. * gnu/packages/mate.scm (marco): New variable. --- gnu/packages/mate.scm | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 66ef9aaff..b210c4fe5 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -28,6 +28,7 @@ #:use-module (gnu packages) #:use-module (gnu packages pkg-config) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages libcanberra) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) @@ -304,3 +305,60 @@ Caja is a fork of Nautilus.") ;; does not exist. It is safe to assume that this is of no concern ;; for us. (license license:gpl2+))) + +(define-public marco + (package + (name "marco") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0lwbp9wyd66hl5d7g272l8g3k1pb9s4s2p9fb04750a58w87d8k5")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("itstool" ,itstool) + ("glib:bin" ,glib "bin") + ("glib" ,glib) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("gtk+" ,gtk+) + ("libgtop" ,libgtop) + ("zenity" ,zenity) + ("libxcursor" ,libxcursor) + ("libsm" ,libsm) + ("libxml2" ,libxml2) + ("libgtop" ,libgtop) + ("gdk-pixbuf" ,gdk-pixbuf) + ("libx11" ,libx11) + ("libice" ,libice) + ("libxcomposite" ,libxcomposite) + ("libxdamage" ,libxdamage) + ("libxext" ,libxext) + ("libxfixes" ,libxfixes) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("libxft" ,libxft) + ("pango" ,pango) + ("startup-notification" ,startup-notification) + ("libxinerama" ,libxinerama) + ("xextproto" ,xextproto) + ("xproto" ,xproto) + ("libcanberra" ,libcanberra) + ("mate-desktop" ,mate-desktop))) + (home-page "http://mate-desktop.org/") + (synopsis "Window manager for the MATE desktop") + (description + "Marco is a minimal X window manager that uses GTK+ for drawing +window frames. It is aimed at non-technical users and is designed to integrate +well with the MATE desktop. It lacks some features that may be expected by +traditional UNIX or other technical users; these users may want to investigate +other available window managers for use with MATE or as a standalone window +manager.") + (license license:gpl2+))) -- 2.14.1 [-- Attachment #1.6: 0005-gnu-Add-mate-session-manager.patch --] [-- Type: text/plain, Size: 1939 bytes --] From 5667228426b45f8f90df58eee9baae4f961954c0 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Mon, 14 Aug 2017 17:18:06 +0000 Subject: [PATCH 05/10] gnu: Add mate-session-manager. * gnu/packages/mate.scm (mate-session-manager): New variable. --- gnu/packages/mate.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index b210c4fe5..73f14e00d 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -221,6 +221,38 @@ in a single window (tabs) and supports management of different configurations (profiles). MATE Terminal is a fork of GNOME Terminal.") (license license:gpl3))) +(define-public mate-session-manager + (package + (name "mate-session-manager") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0i0xq6041x2qmb26x9bawx0qpfkgjn6x9w3phnm9s7rc4s0z20ll")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("glib:bin" ,glib "bin") + ("xtrans" ,xtrans) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("gtk+" ,gtk+) + ("dbus-glib" ,dbus-glib) + ("libsm" ,libsm) + ("mate-desktop" ,mate-desktop))) + (home-page "http://mate-desktop.org/") + (synopsis "Session manager for MATE") + (description + "Mate-session contains the MATE session manager, as well as a +configuration program to choose applications starting on login.") + (license license:gpl2))) + (define-public mate-menus (package (name "mate-menus") -- 2.14.1 [-- Attachment #1.7: 0006-gnu-Add-mate-panel.patch --] [-- Type: text/plain, Size: 3872 bytes --] From 66cfb926384cae4bd04d5282f6b10e997a62a369 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Mon, 14 Aug 2017 18:58:34 +0000 Subject: [PATCH 06/10] gnu: Add mate-panel. * gnu/packages/mate.scm (mate-panel): New variable. --- gnu/packages/mate.scm | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 73f14e00d..de10e749a 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -294,6 +294,81 @@ specification, the MATE menu layout configuration files, .directory files and assorted menu related utility programs.") (license (list license:gpl2+ license:lgpl2.0+)))) +(define-public mate-panel + (package + (name "mate-panel") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0fa1m4gh009kzkci7szshd4vfaizdgn6m73xd684f87qmpfcm0j7")))) + (build-system glib-or-gtk-build-system) + (arguments + `(#:configure-flags + (list (string-append "--with-zoneinfo-dir=" + (assoc-ref %build-inputs "tzdata") + "/share/zoneinfo")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-timezone-path + (lambda* (#:key inputs #:allow-other-keys) + (let* ((tzdata (assoc-ref inputs "tzdata"))) + (substitute* "applets/clock/system-timezone.h" + (("/usr/share/lib/zoneinfo/tab") + (string-append tzdata "/share/zoneinfo/zone.tab")) + (("/usr/share/zoneinfo") + (string-append tzdata "/share/zoneinfo")))) + #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) + ("itstool" ,itstool) + ("glib:bin" ,glib "bin") + ("xtrans" ,xtrans) + ("tzdata" ,tzdata) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("gtk+" ,gtk+) + ("dbus-glib" ,dbus-glib) + ("libwnck" ,libwnck) + ("pango" ,pango) + ("librsvg" ,librsvg) + ("libcanberra" ,libcanberra) + ("libmateweather" ,libmateweather) + ("libxrandr" ,libxrandr) + ("libxml2" ,libxml2) + ("dconf" ,dconf) + ("cairo" ,cairo) + ("gdk-pixbuf" ,gdk-pixbuf) + ("libice" ,libice) + ("libx11" ,libx11) + ("libxau" ,libxau) + ("mate-menus" ,mate-menus) + ("libsm" ,libsm) + ("mate-desktop" ,mate-desktop))) + (home-page "http://mate-desktop.org/") + (synopsis "Panel for MATE") + (description + "Mate-panel contains the MATE panel, the libmate-panel-applet library and +several applets. The applets supplied here include the Workspace Switcher, +the Window List, the Window Selector, the Notification Area, the Clock and the +infamous 'Wanda the Fish'.") + (license (list license:gpl2+ license:lgpl2.0+)))) + (define-public caja (package (name "caja") -- 2.14.1 [-- Attachment #1.8: 0007-gnu-Add-libmatemixer.patch --] [-- Type: text/plain, Size: 2424 bytes --] From 21d5bb36f0543574a9bbefbbd1a23604671245e6 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Tue, 15 Aug 2017 20:23:59 +0000 Subject: [PATCH 07/10] gnu: Add libmatemixer. * gnu/packages/mate.scm (libmatemixer): New variable. --- gnu/packages/mate.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index de10e749a..4d01d19d4 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -29,6 +29,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages freedesktop) #:use-module (gnu packages libcanberra) + #:use-module (gnu packages linux) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) @@ -37,6 +38,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages xml) #:use-module (gnu packages photo) + #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python)) (define-public mate-icon-theme @@ -253,6 +255,36 @@ configurations (profiles). MATE Terminal is a fork of GNOME Terminal.") configuration program to choose applications starting on login.") (license license:gpl2))) +(define-public libmatemixer + (package + (name "libmatemixer") + (version "1.18.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "09vyxnlnalws318gsafdfi5c6jwpp92pbafn1ddlqqds23ihk4mr")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("glib" ,glib) + ("pulseaudio" ,pulseaudio) + ("alsa-lib" ,alsa-lib))) + (home-page "http://mate-desktop.org/") + (synopsis "Mixer library for the MATE desktop") + (description + "Libmatemixer is a mixer library for MATE desktop. It provides an abstract +API allowing access to mixer functionality available in the PulseAudio and ALSA +sound systems.") + (license license:lgpl2.1))) + (define-public mate-menus (package (name "mate-menus") -- 2.14.1 [-- Attachment #1.9: 0008-gnu-Add-libmatekbd.patch --] [-- Type: text/plain, Size: 1858 bytes --] From 1f1842e5cf1ed32a6f24a3bbbaf8e320c4248b44 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Tue, 15 Aug 2017 20:53:08 +0000 Subject: [PATCH 08/10] gnu: Add libmatekbd. * gnu/packages/mate.scm (libmatekbd): New variable. --- gnu/packages/mate.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 4d01d19d4..ffb00d66d 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -285,6 +285,39 @@ API allowing access to mixer functionality available in the PulseAudio and ALSA sound systems.") (license license:lgpl2.1))) +(define-public libmatekbd + (package + (name "libmatekbd") + (version "1.18.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "030bl18qbjm7l92bp1bhs7v82bp8j3mv7c1j1a4gd89iz4611pq3")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("glib" ,glib) + ("gdk-pixbuf" ,gdk-pixbuf) + ("gtk+" ,gtk+) + ("cairo" ,cairo) + ("libx11" ,libx11) + ("libxklavier" ,libxklavier))) + (home-page "http://mate-desktop.org/") + (synopsis "MATE keyboard configuration library") + (description + "Libmatekbd is a keyboard configuration library for the +MATE desktop environment.") + (license license:lgpl2.1))) + (define-public mate-menus (package (name "mate-menus") -- 2.14.1 [-- Attachment #1.10: 0009-gnu-Add-mate-settings-daemon.patch --] [-- Type: text/plain, Size: 3217 bytes --] From b6edab4b8d0eda9cc2041e594910a6901cced1a9 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Tue, 15 Aug 2017 21:23:23 +0000 Subject: [PATCH 09/10] gnu: Add mate-settings-daemon. * gnu/packages/mate.scm (mate-settings-daemon): New variable. --- gnu/packages/mate.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index ffb00d66d..f848e2e2e 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -28,16 +28,19 @@ #:use-module (gnu packages) #:use-module (gnu packages pkg-config) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages fontutils) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) + #:use-module (gnu packages gnuzilla) #:use-module (gnu packages xorg) #:use-module (gnu packages xdisorg) #:use-module (gnu packages base) #:use-module (gnu packages xml) #:use-module (gnu packages photo) + #:use-module (gnu packages polkit) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python)) @@ -255,6 +258,54 @@ configurations (profiles). MATE Terminal is a fork of GNOME Terminal.") configuration program to choose applications starting on login.") (license license:gpl2))) +(define-public mate-settings-daemon + (package + (name "mate-settings-daemon") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "07b2jkxqv07njdrgkdck93d872p6lch1lrvi7ydnpicspg3rfid6")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("gtk+" ,gtk+) + ("dbus-glib" ,dbus-glib) + ("mate-desktop" ,mate-desktop) + ("libmatekbd" ,libmatekbd) + ("libmatemixer" ,libmatemixer) + ("libxklavier" ,libxklavier) + ("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) + ("nss" ,nss) + ("libcanberra" ,libcanberra) + ("fontconfig" ,fontconfig) + ("dconf" ,dconf))) + (home-page "http://mate-desktop.org/") + (synopsis "Settings Daemon for MATE") + (description + "Mate-settings-daemon is a fork of gnome-settings-daemon.") + (license (list license:lgpl2.1 license:gpl2)))) + (define-public libmatemixer (package (name "libmatemixer") -- 2.14.1 [-- Attachment #1.11: 0010-gnu-Add-mate.patch --] [-- Type: text/plain, Size: 3557 bytes --] From 00c6ac2a65494c57a4f53b8b8f9b76d0fd4974ae Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Wed, 16 Aug 2017 11:38:35 +0000 Subject: [PATCH 10/10] gnu: Add mate. * gnu/packages/mate.scm (mate): New variable. --- gnu/packages/mate.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index f848e2e2e..6a7b86bbf 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -25,15 +25,18 @@ #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages pkg-config) #:use-module (gnu packages freedesktop) #:use-module (gnu packages fontutils) + #:use-module (gnu packages fonts) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) + #:use-module (gnu packages gnupg) #:use-module (gnu packages gnuzilla) #:use-module (gnu packages xorg) #:use-module (gnu packages xdisorg) @@ -585,3 +588,47 @@ traditional UNIX or other technical users; these users may want to investigate other available window managers for use with MATE or as a standalone window manager.") (license license:gpl2+))) + +(define-public mate + (package + (name "mate") + (version (package-version marco)) + (source #f) + (build-system trivial-build-system) + (arguments '(#:builder (mkdir %output))) + (propagated-inputs + ;; TODO: Add more packages + `(("mate-icon-theme" ,mate-icon-theme) + ("font-cantarell" ,font-cantarell) + ("at-spi2-core" ,at-spi2-core) + ("dbus" ,dbus) + ("dconf" ,dconf) + ("desktop-file-utils" ,desktop-file-utils) + ("glib-networking" ,glib-networking) + ("gnome-keyring" ,gnome-keyring) + ("mate-session-manager" ,mate-session-manager) + ("mate-settings-daemon" ,mate-settings-daemon) + ("mate-desktop" ,mate-desktop) + ("mate-terminal" ,mate-terminal) + ("mate-themes" ,mate-themes) + ("libmatekbd" ,libmatekbd) + ("mate-menu" ,mate-menus) + ("libmateweather" ,libmateweather) + ("libmatemixer" ,libmatemixer) + ("mate-panel" ,mate-panel) + ("gvfs" ,gvfs) + ("caja" ,caja) + ("marco" ,marco) + ("pinentry-gnome3" ,pinentry-gnome3) + ("pulseaudio" ,pulseaudio) + ("shared-mime-info" ,shared-mime-info) + ("yelp" ,yelp) + ("zenity" ,zenity))) + (synopsis "The MATE desktop environment") + (home-page "https://mate-desktop.org/") + (description + "The MATE Desktop Environment is the continuation of GNOME 2. It provides +an intuitive and attractive desktop environment using traditional metaphors for +GNU/Linux systems. MATE is under active development to add support for new +technologies while preserving a traditional desktop experience.") + (license license:gpl2+))) -- 2.14.1 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [bug#28116] MATE (and mate-terminal + caja) 2017-08-16 20:56 [bug#28116] MATE (and mate-terminal + caja) ng0 @ 2017-08-23 21:04 ` ng0 2017-08-24 20:42 ` [bug#28116] mate partial review Efraim Flashner 1 sibling, 0 replies; 10+ messages in thread From: ng0 @ 2017-08-23 21:04 UTC (permalink / raw) To: 28116 [-- Attachment #1.1: Type: text/plain, Size: 1129 bytes --] Version 2 appended: [abyayala] 9:00pm guix > ls *.patch 4.0K 0001-gnu-mate-Fetch-sources-via-https.patch 4.0K 0005-gnu-Add-mate-terminal.patch 4.0K 0009-gnu-Add-libmatemixer.patch 4.0K 0013-gnu-Add-mate-media.patch 4.0K 0002-gnu-Add-caja.patch 4.0K 0006-gnu-Add-marco.patch 4.0K 0010-gnu-Add-libmatekbd.patch 4.0K 0014-gnu-Add-mate-control-center.patch 4.0K 0003-gnu-mate-themes-Update-to-3.22.13.patch 4.0K 0007-gnu-Add-mate-session-manager.patch 4.0K 0011-gnu-Add-mate-settings-daemon.patch 4.0K 0015-gnu-Add-mate.patch 4.0K 0004-gnu-mate-desktop-Add-gtk-doc-back-to-native-inputs.patch 4.0K 0008-gnu-Add-mate-panel.patch 8.0K 0012-gnu-Add-mate-applets.patch This adds an almost complete MATE desktop, 6 upstream applications are still missing but the MATE experience is there. Missing are power-manager and screensavers for example. -- ng0 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://n0is.noblogs.org/my-keys https://www.infotropique.org https://krosos.org [-- Attachment #1.2: 0001-gnu-mate-Fetch-sources-via-https.patch --] [-- Type: text/plain, Size: 3163 bytes --] From 7cec7254ddc09698c4c5d44ae1b543c7ff8c3f2b Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Wed, 16 Aug 2017 10:27:04 +0000 Subject: [PATCH 01/15] gnu: mate: Fetch sources via https. * gnu/packages/mate.scm (mate-icon-theme)[source]: Use https. (mate-themes)[source]: Likewise. (mate-desktop)[source]: Likewise. (libmateweather)[source]: Likewise. (mate-menus)[source]: Likewise. --- gnu/packages/mate.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 316385a6f..ff920c543 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2017 ng0 <ng0@infotropique.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,7 +41,7 @@ (version "1.18.2") (source (origin (method url-fetch) - (uri (string-append "http://pub.mate-desktop.org/releases/" + (uri (string-append "https://pub.mate-desktop.org/releases/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 @@ -64,7 +65,7 @@ (version "3.22.11") (source (origin (method url-fetch) - (uri (string-append "http://pub.mate-desktop.org/releases/themes/" + (uri (string-append "https://pub.mate-desktop.org/releases/themes/" (version-major+minor version) "/mate-themes-" version ".tar.xz")) (sha256 @@ -95,7 +96,7 @@ themes for both gtk+-2 and gtk+-3.") (version "1.18.0") (source (origin (method url-fetch) - (uri (string-append "http://pub.mate-desktop.org/releases/" + (uri (string-append "https://pub.mate-desktop.org/releases/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 @@ -128,7 +129,7 @@ desktop and the mate-about program.") (version "1.18.1") (source (origin (method url-fetch) - (uri (string-append "http://pub.mate-desktop.org/releases/" + (uri (string-append "https://pub.mate-desktop.org/releases/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 @@ -176,7 +177,7 @@ the MATE desktop environment.") (version "1.18.0") (source (origin (method url-fetch) - (uri (string-append "http://pub.mate-desktop.org/releases/" + (uri (string-append "https://pub.mate-desktop.org/releases/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 -- 2.14.1 [-- Attachment #1.3: 0002-gnu-Add-caja.patch --] [-- Type: text/plain, Size: 3055 bytes --] From b595c685f688eebd6daec7fa5cc7d3c3f7c7e0d5 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Sun, 6 Aug 2017 17:22:41 +0000 Subject: [PATCH 02/15] gnu: Add caja. * gnu/packages/mate.scm (caja): New variable. --- gnu/packages/mate.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index ff920c543..6f34ecaa4 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -24,8 +24,10 @@ #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system glib-or-gtk) #:use-module (gnu packages) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) @@ -33,6 +35,7 @@ #:use-module (gnu packages xdisorg) #:use-module (gnu packages base) #:use-module (gnu packages xml) + #:use-module (gnu packages photo) #:use-module (gnu packages python)) (define-public mate-icon-theme @@ -211,3 +214,47 @@ the MATE desktop environment.") specification, the MATE menu layout configuration files, .directory files and assorted menu related utility programs.") (license (list license:gpl2+ license:lgpl2.0+)))) + +(define-public caja + (package + (name "caja") + (version "1.18.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0mljqcx7k8p27854zm7qzzn8ca6hs7hva9p43hp4p507z52caqmm")))) + (build-system glib-or-gtk-build-system) + (arguments + `(#:tests? #f)) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("gtk+" ,gtk+) + ("exempi" ,exempi) + ("gvfs" ,gvfs) + ("libexif" ,libexif) + ("libsm" ,libsm) + ("libnotify" ,libnotify) + ("libxml2" ,libxml2) + ("mate-desktop" ,mate-desktop) + ("startup-notification" ,startup-notification))) + (home-page "http://mate-desktop.org/") + (synopsis "File manager for the MATE desktop") + (description + "Caja is the official file manager for the MATE desktop. +It allows for browsing directories, as well as previewing files and launching +applications associated with them. Caja is also responsible for handling the +icons on the MATE desktop. It works on local and remote filesystems. +Caja is a fork of Nautilus.") + ;; There is a note about a TRADEMARKS_NOTICE file in COPYING which + ;; does not exist. It is safe to assume that this is of no concern + ;; for us. + (license license:gpl2+))) -- 2.14.1 [-- Attachment #1.4: 0003-gnu-mate-themes-Update-to-3.22.13.patch --] [-- Type: text/plain, Size: 1179 bytes --] From 81f09c9e84b180dfc7c96cfc8934135022d961fc Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Wed, 23 Aug 2017 13:53:30 +0000 Subject: [PATCH 03/15] gnu: mate-themes: Update to 3.22.13. * gnu/packages/mate.scm (mate-themes): Update to 3.22.13. --- gnu/packages/mate.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 6f34ecaa4..c8d94d566 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -65,7 +65,7 @@ (define-public mate-themes (package (name "mate-themes") - (version "3.22.11") + (version "3.22.13") (source (origin (method url-fetch) (uri (string-append "https://pub.mate-desktop.org/releases/themes/" @@ -73,7 +73,7 @@ version ".tar.xz")) (sha256 (base32 - "1gfa1cny3q68y139m96iz8haiik6ygad5613gx0m4wd9hi5scafm")))) + "1p7w63an8qs15hkj79nppy7471glv0rm1b0himn3c4w69q8qdc9i")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- 2.14.1 [-- Attachment #1.5: 0004-gnu-mate-desktop-Add-gtk-doc-back-to-native-inputs.patch --] [-- Type: text/plain, Size: 999 bytes --] From 5c663e4ea2f406de714af2505ca556397c138b1c Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Wed, 23 Aug 2017 13:59:30 +0000 Subject: [PATCH 04/15] gnu: mate-desktop: Add 'gtk-doc' back to native-inputs. * gnu/packages/mate.scm (mate-desktop)[native-inputs]: Uncomment 'gtk-doc' as input. --- gnu/packages/mate.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index c8d94d566..572fdc878 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -111,8 +111,8 @@ themes for both gtk+-2 and gtk+-3.") ("intltool" ,intltool) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("yelp-tools" ,yelp-tools))) - ;;("gtk-doc" ,gtk-doc))) ; add back in when gtk-doc builds + ("yelp-tools" ,yelp-tools) + ("gtk-doc" ,gtk-doc))) (inputs `(("gtk+" ,gtk+) ("libxrandr" ,libxrandr) -- 2.14.1 [-- Attachment #1.6: 0005-gnu-Add-mate-terminal.patch --] [-- Type: text/plain, Size: 2378 bytes --] From 5788f0453937a7500dbde0be9c486ed35ebe9dfe Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Sun, 6 Aug 2017 18:29:40 +0000 Subject: [PATCH 05/15] gnu: Add mate-terminal. * gnu/packages/mate.scm (mate-terminal): New variable. --- gnu/packages/mate.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 572fdc878..f143fc149 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -174,6 +174,51 @@ desktop and the mate-about program.") the MATE desktop environment.") (license license:lgpl2.1+))) +(define-public mate-terminal + (package + (name "mate-terminal") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1zihm609d2d9cw53ry385whshjl1dnkifpk41g1ddm9f58hv4da1")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("libsm" ,libsm))) + (inputs + `(("gtk+" ,gtk+) + ("gdk-pixbuf" ,gdk-pixbuf) + ("exempi" ,exempi) + ("libnotify" ,libnotify) + ("libxml2" ,libxml2) + ("libice" ,libice) + ("libx11" ,libx11) + ("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/") + (synopsis "MATE Terminal Emulator") + (description + "MATE Terminal is a terminal emulation application that you can +use to access a shell. With it, you can run any application that +is designed to run on VT102, VT220, and xterm terminals. +MATE Terminal also has the ability to use multiple terminals +in a single window (tabs) and supports management of different +configurations (profiles). MATE Terminal is a fork of GNOME Terminal.") + (license license:gpl3))) + (define-public mate-menus (package (name "mate-menus") -- 2.14.1 [-- Attachment #1.7: 0006-gnu-Add-marco.patch --] [-- Type: text/plain, Size: 3012 bytes --] From 0fd9bf9f5b3d02d64fdcae8d4fd8c704d6909245 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Sun, 6 Aug 2017 18:03:17 +0000 Subject: [PATCH 06/15] gnu: Add marco. * gnu/packages/mate.scm (marco): New variable. --- gnu/packages/mate.scm | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index f143fc149..0f7068264 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -28,6 +28,7 @@ #:use-module (gnu packages) #:use-module (gnu packages pkg-config) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages libcanberra) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) @@ -303,3 +304,58 @@ Caja is a fork of Nautilus.") ;; does not exist. It is safe to assume that this is of no concern ;; for us. (license license:gpl2+))) + +(define-public marco + (package + (name "marco") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0lwbp9wyd66hl5d7g272l8g3k1pb9s4s2p9fb04750a58w87d8k5")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("itstool" ,itstool) + ("glib" ,glib) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("gtk+" ,gtk+) + ("libgtop" ,libgtop) + ("zenity" ,zenity) + ("libxcursor" ,libxcursor) + ("libsm" ,libsm) + ("libxml2" ,libxml2) + ("libgtop" ,libgtop) + ("gdk-pixbuf" ,gdk-pixbuf) + ("libx11" ,libx11) + ("libice" ,libice) + ("libxcomposite" ,libxcomposite) + ("libxdamage" ,libxdamage) + ("libxext" ,libxext) + ("libxfixes" ,libxfixes) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("libxft" ,libxft) + ("pango" ,pango) + ("startup-notification" ,startup-notification) + ("libxinerama" ,libxinerama) + ("xextproto" ,xextproto) + ("xproto" ,xproto) + ("libcanberra" ,libcanberra) + ("mate-desktop" ,mate-desktop))) + (home-page "http://mate-desktop.org/") + (synopsis "Window manager for the MATE desktop") + (description + "Marco is a minimal X window manager that uses GTK+ for drawing +window frames. It is aimed at non-technical users and is designed to integrate +well with the MATE desktop. It lacks some features that may be expected by +some users; these users may want to investigate other available window managers +for use with MATE or as a standalone window manager.") + (license license:gpl2+))) -- 2.14.1 [-- Attachment #1.8: 0007-gnu-Add-mate-session-manager.patch --] [-- Type: text/plain, Size: 1904 bytes --] From 0dbf6e11d163021dc5d55384bb3a77045a9d393a Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Mon, 14 Aug 2017 17:18:06 +0000 Subject: [PATCH 07/15] gnu: Add mate-session-manager. * gnu/packages/mate.scm (mate-session-manager): New variable. --- gnu/packages/mate.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 0f7068264..78f1d7aec 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -220,6 +220,37 @@ in a single window (tabs) and supports management of different configurations (profiles). MATE Terminal is a fork of GNOME Terminal.") (license license:gpl3))) +(define-public mate-session-manager + (package + (name "mate-session-manager") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0i0xq6041x2qmb26x9bawx0qpfkgjn6x9w3phnm9s7rc4s0z20ll")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("xtrans" ,xtrans) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("gtk+" ,gtk+) + ("dbus-glib" ,dbus-glib) + ("libsm" ,libsm) + ("mate-desktop" ,mate-desktop))) + (home-page "http://mate-desktop.org/") + (synopsis "Session manager for MATE") + (description + "Mate-session contains the MATE session manager, as well as a +configuration program to choose applications starting on login.") + (license license:gpl2))) + (define-public mate-menus (package (name "mate-menus") -- 2.14.1 [-- Attachment #1.9: 0008-gnu-Add-mate-panel.patch --] [-- Type: text/plain, Size: 3838 bytes --] From d5e6d31f98a1d6c3eb2a7ceaa3a7d2525f1904d6 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Mon, 14 Aug 2017 18:58:34 +0000 Subject: [PATCH 08/15] gnu: Add mate-panel. * gnu/packages/mate.scm (mate-panel): New variable. --- gnu/packages/mate.scm | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 78f1d7aec..1ab9032c4 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -292,6 +292,80 @@ specification, the MATE menu layout configuration files, .directory files and assorted menu related utility programs.") (license (list license:gpl2+ license:lgpl2.0+)))) +(define-public mate-panel + (package + (name "mate-panel") + (version "1.18.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1n565ff1n7jrfx223i3cl3m69wjda506nvbn8gra7m1jwdfzpbw1")))) + (build-system glib-or-gtk-build-system) + (arguments + `(#:configure-flags + (list (string-append "--with-zoneinfo-dir=" + (assoc-ref %build-inputs "tzdata") + "/share/zoneinfo")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-timezone-path + (lambda* (#:key inputs #:allow-other-keys) + (let* ((tzdata (assoc-ref inputs "tzdata"))) + (substitute* "applets/clock/system-timezone.h" + (("/usr/share/lib/zoneinfo/tab") + (string-append tzdata "/share/zoneinfo/zone.tab")) + (("/usr/share/zoneinfo") + (string-append tzdata "/share/zoneinfo")))) + #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) + ("itstool" ,itstool) + ("xtrans" ,xtrans) + ("tzdata" ,tzdata) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("gtk+" ,gtk+) + ("dbus-glib" ,dbus-glib) + ("libwnck" ,libwnck) + ("pango" ,pango) + ("librsvg" ,librsvg) + ("libcanberra" ,libcanberra) + ("libmateweather" ,libmateweather) + ("libxrandr" ,libxrandr) + ("libxml2" ,libxml2) + ("dconf" ,dconf) + ("cairo" ,cairo) + ("gdk-pixbuf" ,gdk-pixbuf) + ("libice" ,libice) + ("libx11" ,libx11) + ("libxau" ,libxau) + ("mate-menus" ,mate-menus) + ("libsm" ,libsm) + ("mate-desktop" ,mate-desktop))) + (home-page "http://mate-desktop.org/") + (synopsis "Panel for MATE") + (description + "Mate-panel contains the MATE panel, the libmate-panel-applet library and +several applets. The applets supplied here include the Workspace Switcher, +the Window List, the Window Selector, the Notification Area, the Clock and the +infamous 'Wanda the Fish'.") + (license (list license:gpl2+ license:lgpl2.0+)))) + (define-public caja (package (name "caja") -- 2.14.1 [-- Attachment #1.10: 0009-gnu-Add-libmatemixer.patch --] [-- Type: text/plain, Size: 2424 bytes --] From db0f777cc4b4e7acbf9b25edd511eab4cebd02ab Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Tue, 15 Aug 2017 20:23:59 +0000 Subject: [PATCH 09/15] gnu: Add libmatemixer. * gnu/packages/mate.scm (libmatemixer): New variable. --- gnu/packages/mate.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 1ab9032c4..09ebba447 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -29,6 +29,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages freedesktop) #:use-module (gnu packages libcanberra) + #:use-module (gnu packages linux) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) @@ -37,6 +38,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages xml) #:use-module (gnu packages photo) + #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python)) (define-public mate-icon-theme @@ -251,6 +253,36 @@ configurations (profiles). MATE Terminal is a fork of GNOME Terminal.") configuration program to choose applications starting on login.") (license license:gpl2))) +(define-public libmatemixer + (package + (name "libmatemixer") + (version "1.18.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "09vyxnlnalws318gsafdfi5c6jwpp92pbafn1ddlqqds23ihk4mr")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("glib" ,glib) + ("pulseaudio" ,pulseaudio) + ("alsa-lib" ,alsa-lib))) + (home-page "http://mate-desktop.org/") + (synopsis "Mixer library for the MATE desktop") + (description + "Libmatemixer is a mixer library for MATE desktop. It provides an abstract +API allowing access to mixer functionality available in the PulseAudio and ALSA +sound systems.") + (license license:lgpl2.1))) + (define-public mate-menus (package (name "mate-menus") -- 2.14.1 [-- Attachment #1.11: 0010-gnu-Add-libmatekbd.patch --] [-- Type: text/plain, Size: 1823 bytes --] From 48f375f1af7b88a35f9fca6304d78c2bf981da61 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Tue, 15 Aug 2017 20:53:08 +0000 Subject: [PATCH 10/15] gnu: Add libmatekbd. * gnu/packages/mate.scm (libmatekbd): New variable. --- gnu/packages/mate.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 09ebba447..793f6bba0 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -283,6 +283,38 @@ API allowing access to mixer functionality available in the PulseAudio and ALSA sound systems.") (license license:lgpl2.1))) +(define-public libmatekbd + (package + (name "libmatekbd") + (version "1.18.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "030bl18qbjm7l92bp1bhs7v82bp8j3mv7c1j1a4gd89iz4611pq3")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("glib" ,glib) + ("gdk-pixbuf" ,gdk-pixbuf) + ("gtk+" ,gtk+) + ("cairo" ,cairo) + ("libx11" ,libx11) + ("libxklavier" ,libxklavier))) + (home-page "http://mate-desktop.org/") + (synopsis "MATE keyboard configuration library") + (description + "Libmatekbd is a keyboard configuration library for the +MATE desktop environment.") + (license license:lgpl2.1))) + (define-public mate-menus (package (name "mate-menus") -- 2.14.1 [-- Attachment #1.12: 0011-gnu-Add-mate-settings-daemon.patch --] [-- Type: text/plain, Size: 3182 bytes --] From 8cfee4f7b8442f988e146458cacd2343263ef300 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Tue, 15 Aug 2017 21:23:23 +0000 Subject: [PATCH 11/15] gnu: Add mate-settings-daemon. * gnu/packages/mate.scm (mate-settings-daemon): New variable. --- gnu/packages/mate.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 793f6bba0..9537fb168 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -28,16 +28,19 @@ #:use-module (gnu packages) #:use-module (gnu packages pkg-config) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages fontutils) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) + #:use-module (gnu packages gnuzilla) #:use-module (gnu packages xorg) #:use-module (gnu packages xdisorg) #:use-module (gnu packages base) #:use-module (gnu packages xml) #:use-module (gnu packages photo) + #:use-module (gnu packages polkit) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python)) @@ -253,6 +256,53 @@ configurations (profiles). MATE Terminal is a fork of GNOME Terminal.") configuration program to choose applications starting on login.") (license license:gpl2))) +(define-public mate-settings-daemon + (package + (name "mate-settings-daemon") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "07b2jkxqv07njdrgkdck93d872p6lch1lrvi7ydnpicspg3rfid6")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("gtk+" ,gtk+) + ("dbus-glib" ,dbus-glib) + ("mate-desktop" ,mate-desktop) + ("libmatekbd" ,libmatekbd) + ("libmatemixer" ,libmatemixer) + ("libxklavier" ,libxklavier) + ("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) + ("nss" ,nss) + ("libcanberra" ,libcanberra) + ("fontconfig" ,fontconfig) + ("dconf" ,dconf))) + (home-page "http://mate-desktop.org/") + (synopsis "Settings Daemon for MATE") + (description + "Mate-settings-daemon is a fork of gnome-settings-daemon.") + (license (list license:lgpl2.1 license:gpl2)))) + (define-public libmatemixer (package (name "libmatemixer") -- 2.14.1 [-- Attachment #1.13: 0012-gnu-Add-mate-applets.patch --] [-- Type: text/plain, Size: 4446 bytes --] From f8b4a740d668c947192845594d00c2134251ca1d Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Wed, 23 Aug 2017 16:54:21 +0000 Subject: [PATCH 12/15] gnu: Add mate-applets. * gnu/packages/mate.scm (mate-applets): New variable. --- gnu/packages/mate.scm | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 9537fb168..5afd761a4 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -33,9 +33,12 @@ #:use-module (gnu packages linux) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) + #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) + #:use-module (gnu packages docbook) #:use-module (gnu packages gnuzilla) #:use-module (gnu packages xorg) + #:use-module (gnu packages documentation) #:use-module (gnu packages xdisorg) #:use-module (gnu packages base) #:use-module (gnu packages xml) @@ -406,6 +409,81 @@ specification, the MATE menu layout configuration files, .directory files and assorted menu related utility programs.") (license (list license:gpl2+ license:lgpl2.0+)))) +(define-public mate-applets + (package + (name "mate-applets") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1nplr8i1mxbxd7pqhcy8j69v25nsp5dk9fq7ffrmjmp39lrf3fh5")))) + (build-system glib-or-gtk-build-system) + (arguments + ;; FIXME: Build with upower fails. + `(#:configure-flags (list "--without-upower"))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("libxslt" ,libxslt) + ("yelp-tools" ,yelp-tools) + ;;("scrollkeeper" ,scrollkeeper) ;Add back when scrollkeeper builds. + ("gettext" ,gettext-minimal) + ("docbook-xml" ,docbook-xml) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("atk" ,atk) + ("dbus-glib" ,dbus-glib) + ("glib" ,glib) + ("libmateweather" ,libmateweather) + ("libwnck" ,libwnck) + ("pango" ,pango) + ("gtk+" ,gtk+) + ("gtksourceview" ,gtksourceview) + ("libgtop" ,libgtop) + ("libxml2" ,libxml2) + ("python-pygobject" ,python-pygobject) + ("gucharmap" ,gucharmap) + ("mate-panel" ,mate-panel) + ("wireless-tools" ,wireless-tools) + ("dbus" ,dbus) + ("libnotify" ,libnotify) + ("libx11" ,libx11) + ("gdk-pixbuf" ,gdk-pixbuf) + ("python" ,python-2))) + (home-page "http://mate-desktop.org/") + (synopsis "Various applets for the MATE Panel") + (description + "Mate-applets includes various small applications for Mate-panel: + +@enumerate +@item accessx-status: indicates keyboard accessibility settings, +including the current state of the keyboard, if those features are in use. +@item Battstat: monitors the power subsystem on a laptop. +@item Character palette: provides a convenient way to access +non-standard characters, such as accented characters, +mathematical symbols, special symbols, and punctuation marks. +@item MATE CPUFreq Applet: CPU frequency scaling monitor +@item Drivemount: lets you mount and unmount drives and file systems. +@item Geyes: pair of eyes which follow the mouse pointer around the screen. +@item Keyboard layout switcher: lets you assign different keyboard +layouts for different locales. +@item Modem Monitor: monitors the modem. +@item Invest: downloads current stock quotes from the Internet and +displays the quotes in a scrolling display in the applet. The +applet downloads the stock information from Yahoo! Finance. +@item System monitor: CPU, memory, network, swap file and resource. +@item Trash: lets you drag items to the trash folder. +@item Weather report: downloads weather information from the +U.S National Weather Service (NWS) servers, including the +Interactive Weather Information Network (IWIN). +@end enumerate\n") + (license (list license:gpl2+ license:lgpl2.0+ license:gpl3+)))) + (define-public mate-panel (package (name "mate-panel") -- 2.14.1 [-- Attachment #1.14: 0013-gnu-Add-mate-media.patch --] [-- Type: text/plain, Size: 2190 bytes --] From f1fbf91fdaa796d7453ba905466eb4c78af280c9 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Wed, 23 Aug 2017 17:18:02 +0000 Subject: [PATCH 13/15] gnu: Add mate-media. * gnu/packages/mate.scm (mate-media): New variable. --- gnu/packages/mate.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 5afd761a4..73f1b83b2 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -484,6 +484,44 @@ Interactive Weather Information Network (IWIN). @end enumerate\n") (license (list license:gpl2+ license:lgpl2.0+ license:gpl3+)))) +(define-public mate-media + (package + (name "mate-media") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1l0j71d07898wb6ily09sj1xczwrmcw13wyhxwns7sxw592nwi04")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("gtk+" ,gtk+) + ("pango" ,pango) + ("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/") + (synopsis "Multimedia related programs for the MATE desktop") + (description + "Mate-media includes the MATE media tools for MATE, including +mate-volume-control, a MATE volume control application and applet. +MATE-Media is a fork of GNOME-Media.") + (license (list license:gpl2+ license:lgpl2.0+ license:fdl1.1+)))) + (define-public mate-panel (package (name "mate-panel") -- 2.14.1 [-- Attachment #1.15: 0014-gnu-Add-mate-control-center.patch --] [-- Type: text/plain, Size: 2964 bytes --] From 2e23d482fb4f0861ad014aba4b97c7f8fa8f5233 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Wed, 23 Aug 2017 18:36:16 +0000 Subject: [PATCH 14/15] gnu: Add mate-control-center. * gnu/packages/mate.scm (mate-control-center): New variable. --- gnu/packages/mate.scm | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 73f1b83b2..a7534ec15 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -640,6 +640,71 @@ Caja is a fork of Nautilus.") ;; for us. (license license:gpl2+))) +(define-public mate-control-center + (package + (name "mate-control-center") + (version "1.18.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0flnn0h8f5aqyccwrlv7qxchvr3kqmlfdga6wq28d55zkpv5m7dl")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("glib" ,glib) + ("yelp-tools" ,yelp-tools) + ("desktop-file-utils" ,desktop-file-utils) + ("kbproto" ,kbproto) + ("randrproto" ,randrproto) + ("renderproto" ,renderproto) + ("scrnsaverproto" ,scrnsaverproto) + ("xextpro" ,xextproto) + ("xproto" ,xproto) + ("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) + ("caja" ,caja) + ("mate-menus" ,mate-menus) + ("mate-settings-daemon" ,mate-settings-daemon) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("libcanberra" ,libcanberra) + ("dbus" ,dbus) + ("xmodmap" ,xmodmap) + ("cairo" ,cairo) + ("gdk-pixbuf" ,gdk-pixbuf) + ("gtk+" ,gtk+) + ("libxcursor" ,libxcursor) + ("libx11" ,libx11) + ("libxscrnsaver" ,libxscrnsaver) + ("libxcursor" ,libxcursor) + ("libxext" ,libxext) + ("libxi" ,libxi) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("libxklavier" ,libxklavier) + ("marco" ,marco) + ("pango" ,pango))) + (home-page "http://mate-desktop.org/") + (synopsis "MATE Desktop configuration tool") + (description + "MATE control center is MATE's main interface for configuration +of various aspects of your desktop.") + (license license:gpl2+))) + (define-public marco (package (name "marco") -- 2.14.1 [-- Attachment #1.16: 0015-gnu-Add-mate.patch --] [-- Type: text/plain, Size: 3838 bytes --] From db4b2e059002549a5eafcc0692989163efa4cbc9 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Wed, 16 Aug 2017 11:38:35 +0000 Subject: [PATCH 15/15] gnu: Add mate. * gnu/packages/mate.scm (mate): New variable. --- gnu/packages/mate.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index a7534ec15..40359ede2 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -25,10 +25,12 @@ #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages pkg-config) #:use-module (gnu packages freedesktop) #:use-module (gnu packages fontutils) + #:use-module (gnu packages fonts) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) #:use-module (gnu packages glib) @@ -36,6 +38,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) #:use-module (gnu packages docbook) + #:use-module (gnu packages gnupg) #:use-module (gnu packages gnuzilla) #:use-module (gnu packages xorg) #:use-module (gnu packages documentation) @@ -759,3 +762,50 @@ well with the MATE desktop. It lacks some features that may be expected by some users; these users may want to investigate other available window managers for use with MATE or as a standalone window manager.") (license license:gpl2+))) + +(define-public mate + (package + (name "mate") + (version (package-version marco)) + (source #f) + (build-system trivial-build-system) + (arguments '(#:builder (mkdir %output))) + (propagated-inputs + ;; TODO: Add more packages + `(("mate-icon-theme" ,mate-icon-theme) + ("font-cantarell" ,font-cantarell) + ("at-spi2-core" ,at-spi2-core) + ("dbus" ,dbus) + ("dconf" ,dconf) + ("desktop-file-utils" ,desktop-file-utils) + ("glib-networking" ,glib-networking) + ("gnome-keyring" ,gnome-keyring) + ("mate-session-manager" ,mate-session-manager) + ("mate-settings-daemon" ,mate-settings-daemon) + ("mate-desktop" ,mate-desktop) + ("mate-terminal" ,mate-terminal) + ("mate-themes" ,mate-themes) + ("libmatekbd" ,libmatekbd) + ("mate-menu" ,mate-menus) + ("libmateweather" ,libmateweather) + ("libmatemixer" ,libmatemixer) + ("mate-panel" ,mate-panel) + ("mate-control-center" ,mate-control-center) + ("mate-media" ,mate-media) + ("mate-applets" ,mate-applets) + ("gvfs" ,gvfs) + ("caja" ,caja) + ("marco" ,marco) + ("pinentry-gnome3" ,pinentry-gnome3) + ("pulseaudio" ,pulseaudio) + ("shared-mime-info" ,shared-mime-info) + ("yelp" ,yelp) + ("zenity" ,zenity))) + (synopsis "The MATE desktop environment") + (home-page "https://mate-desktop.org/") + (description + "The MATE Desktop Environment is the continuation of GNOME 2. It provides +an intuitive and attractive desktop environment using traditional metaphors for +GNU/Linux systems. MATE is under active development to add support for new +technologies while preserving a traditional desktop experience.") + (license license:gpl2+))) -- 2.14.1 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [bug#28116] mate partial review 2017-08-16 20:56 [bug#28116] MATE (and mate-terminal + caja) ng0 2017-08-23 21:04 ` ng0 @ 2017-08-24 20:42 ` Efraim Flashner 2017-08-25 18:11 ` ng0 1 sibling, 1 reply; 10+ messages in thread From: Efraim Flashner @ 2017-08-24 20:42 UTC (permalink / raw) To: 28116 [-- Attachment #1.1: Type: text/plain, Size: 1056 bytes --] I did all the building on my aarch64 board and didn't test the graphical aspects of running the programs. I also didn't check the synopsis/description, but some of them do look like they need some work. patch 1: it turns out the home pages should also be https. mate-icon-theme and mate-themes don't need gtk in the inputs to build. libmateweather, mate-panel, mate-control-center: needs a configure flag mate-applet: it built fine for me with upower as an input mate-control-center: librsvg and gdk-pixbuf should be propagated caja: I enabled the display server and the tests still failed on me mate-metapackage: I copied the build from xfce, it seemed to build fine for me. I've attached a diff of what I have. I suggest you alphabetize the inputs, it makes checking for duplicate or missing inputs much easier. -- Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted [-- Attachment #1.2: mate.diff --] [-- Type: text/plain, Size: 14492 bytes --] diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 40359ede2a..d33b1445b9 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -66,9 +66,8 @@ (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool) - ("gtk+" ,gtk+) ("icon-naming-utils" ,icon-naming-utils))) - (home-page "http://mate-desktop.org/") + (home-page "https://mate-desktop.org/") (synopsis "The MATE desktop environment icon theme") (description "This package contains the default icon theme used by the MATE desktop.") @@ -91,11 +90,10 @@ `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) (inputs - `(("gtk+" ,gtk+) - ("gdk-pixbuf" ,gdk-pixbuf) + `(("gdk-pixbuf" ,gdk-pixbuf) ("gtk-engines" ,gtk-engines) ("murrine" ,murrine))) - (home-page "http://mate-desktop.org/") + (home-page "https://mate-desktop.org/") (synopsis "Official themes for the MATE desktop") (description @@ -131,7 +129,7 @@ themes for both gtk+-2 and gtk+-3.") ("startup-notification" ,startup-notification))) (propagated-inputs `(("dconf" ,dconf))) ; mate-desktop-2.0.pc - (home-page "http://mate-desktop.org/") + (home-page "https://mate-desktop.org/") (synopsis "Library with common API for various MATE modules") (description "This package contains a public API shared by several applications on the @@ -152,14 +150,14 @@ 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")) + "/share/zoneinfo") + "--disable-icon-update") #:phases (modify-phases %standard-phases - (add-before - 'check 'pre-check + (add-before 'check 'pre-check (lambda* (#:key inputs #:allow-other-keys) (substitute* "data/check-timezones.sh" (("/usr/share/zoneinfo/zone.tab") @@ -179,7 +177,7 @@ desktop and the mate-about program.") ;; both of these are requires.private in mateweather.pc `(("libsoup" ,libsoup) ("libxml2" ,libxml2))) - (home-page "http://mate-desktop.org/") + (home-page "https://mate-desktop.org/") (synopsis "MATE library for weather information from the Internet") (description "This library provides access to weather information from the internet for @@ -220,7 +218,7 @@ the MATE desktop environment.") ("mate-desktop" ,mate-desktop))) (propagated-inputs `(("dconf" ,dconf))) - (home-page "http://mate-desktop.org/") + (home-page "https://mate-desktop.org/") (synopsis "MATE Terminal Emulator") (description "MATE Terminal is a terminal emulation application that you can @@ -255,7 +253,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 @@ -303,7 +301,7 @@ configuration program to choose applications starting on login.") ("libcanberra" ,libcanberra) ("fontconfig" ,fontconfig) ("dconf" ,dconf))) - (home-page "http://mate-desktop.org/") + (home-page "https://mate-desktop.org/") (synopsis "Settings Daemon for MATE") (description "Mate-settings-daemon is a fork of gnome-settings-daemon.") @@ -331,7 +329,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 @@ -364,7 +362,7 @@ sound systems.") ("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 @@ -387,8 +385,7 @@ MATE desktop environment.") (arguments `(#:phases (modify-phases %standard-phases - (add-after - 'unpack 'fix-introspection-install-dir + (add-after 'unpack 'fix-introspection-install-dir (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (substitute* '("configure") @@ -404,7 +401,7 @@ MATE desktop environment.") (inputs `(("glib" ,glib) ("python" ,python-2))) - (home-page "http://mate-desktop.org/") + (home-page "https://mate-desktop.org/") (synopsis "Freedesktop menu specification implementation for MATE") (description "The package contains an implementation of the freedesktop menu @@ -426,9 +423,6 @@ assorted menu related utility programs.") (base32 "1nplr8i1mxbxd7pqhcy8j69v25nsp5dk9fq7ffrmjmp39lrf3fh5")))) (build-system glib-or-gtk-build-system) - (arguments - ;; FIXME: Build with upower fails. - `(#:configure-flags (list "--without-upower"))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool) @@ -440,25 +434,27 @@ assorted menu related utility programs.") ("gobject-introspection" ,gobject-introspection))) (inputs `(("atk" ,atk) + ("dbus" ,dbus) ("dbus-glib" ,dbus-glib) + ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) - ("libmateweather" ,libmateweather) - ("libwnck" ,libwnck) - ("pango" ,pango) + ("gucharmap" ,gucharmap) ("gtk+" ,gtk+) ("gtksourceview" ,gtksourceview) ("libgtop" ,libgtop) - ("libxml2" ,libxml2) - ("python-pygobject" ,python-pygobject) - ("gucharmap" ,gucharmap) - ("mate-panel" ,mate-panel) - ("wireless-tools" ,wireless-tools) - ("dbus" ,dbus) ("libnotify" ,libnotify) + ("libmateweather" ,libmateweather) + ("libwnck" ,libwnck) ("libx11" ,libx11) - ("gdk-pixbuf" ,gdk-pixbuf) - ("python" ,python-2))) - (home-page "http://mate-desktop.org/") + ("libxml2" ,libxml2) + ("mate-panel" ,mate-panel) + ("pango" ,pango) + ("polkit" ,polkit) + ("python" ,python-2) + ("python-pygobject" ,python-pygobject) + ("upower" ,upower) + ("wireless-tools" ,wireless-tools))) + (home-page "https://mate-desktop.org/") (synopsis "Various applets for the MATE Panel") (description "Mate-applets includes various small applications for Mate-panel: @@ -517,7 +513,7 @@ Interactive Weather Information Network (IWIN). ("libcanberra" ,libcanberra) ("startup-notification" ,startup-notification) ("cairo" ,cairo))) - (home-page "http://mate-desktop.org/") + (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 @@ -543,7 +539,8 @@ MATE-Media is a fork of GNOME-Media.") `(#: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 @@ -590,7 +587,7 @@ MATE-Media is a fork of GNOME-Media.") ("mate-menus" ,mate-menus) ("libsm" ,libsm) ("mate-desktop" ,mate-desktop))) - (home-page "http://mate-desktop.org/") + (home-page "https://mate-desktop.org/") (synopsis "Panel for MATE") (description "Mate-panel contains the MATE panel, the libmate-panel-applet library and @@ -614,12 +611,24 @@ infamous 'Wanda the Fish'.") "0mljqcx7k8p27854zm7qzzn8ca6hs7hva9p43hp4p507z52caqmm")))) (build-system glib-or-gtk-build-system) (arguments - `(#:tests? #f)) + '(#:configure-flags '("--disable-update-mimedb") + #:tests? #f ; tests fail even with display set + #:phases + (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda* (#:key inputs #:allow-other-keys) + ;; Tests require a running X server. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + ;; For the missing /etc/machine-id. + (setenv "DBUS_FATAL_WARNINGS" "0") + #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool) ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection))) + ("gobject-introspection" ,gobject-introspection) + ("xorg-server" ,xorg-server))) ; display for the tests (inputs `(("gtk+" ,gtk+) ("exempi" ,exempi) @@ -630,7 +639,7 @@ infamous 'Wanda the Fish'.") ("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. @@ -657,6 +666,8 @@ Caja is a fork of Nautilus.") (base32 "0flnn0h8f5aqyccwrlv7qxchvr3kqmlfdga6wq28d55zkpv5m7dl")))) (build-system glib-or-gtk-build-system) + (arguments + '(#:configure-flags '("--disable-update-mimedb"))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool) @@ -676,7 +687,6 @@ Caja is a fork of Nautilus.") ("dbus-glib" ,dbus-glib) ("libxml2" ,libxml2) ("dconf" ,dconf) - ("librsvg" ,librsvg) ("libmatekbd" ,libmatekbd) ("mate-desktop" ,mate-desktop) ("caja" ,caja) @@ -688,7 +698,6 @@ Caja is a fork of Nautilus.") ("dbus" ,dbus) ("xmodmap" ,xmodmap) ("cairo" ,cairo) - ("gdk-pixbuf" ,gdk-pixbuf) ("gtk+" ,gtk+) ("libxcursor" ,libxcursor) ("libx11" ,libx11) @@ -701,7 +710,10 @@ Caja is a fork of Nautilus.") ("libxklavier" ,libxklavier) ("marco" ,marco) ("pango" ,pango))) - (home-page "http://mate-desktop.org/") + (propagated-inputs + `(("gdk-pixbuf" ,gdk-pixbuf) ; 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 @@ -753,7 +765,7 @@ of various aspects of your desktop.") ("xproto" ,xproto) ("libcanberra" ,libcanberra) ("mate-desktop" ,mate-desktop))) - (home-page "http://mate-desktop.org/") + (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 @@ -769,33 +781,42 @@ for use with MATE or as a standalone window manager.") (version (package-version marco)) (source #f) (build-system trivial-build-system) - (arguments '(#:builder (mkdir %output))) - (propagated-inputs + (arguments + '(#:modules ((guix build union)) + #:builder + (begin + (use-modules (ice-9 match) + (guix build union)) + (match %build-inputs + (((names . directories) ...) + (union-build (assoc-ref %outputs "out") + directories)))))) + (inputs ;; TODO: Add more packages - `(("mate-icon-theme" ,mate-icon-theme) - ("font-cantarell" ,font-cantarell) - ("at-spi2-core" ,at-spi2-core) - ("dbus" ,dbus) + `(("at-spi2-core" ,at-spi2-core) + ("caja" ,caja) ("dconf" ,dconf) + ("dbus" ,dbus) ("desktop-file-utils" ,desktop-file-utils) + ("font-cantarell" ,font-cantarell) ("glib-networking" ,glib-networking) ("gnome-keyring" ,gnome-keyring) - ("mate-session-manager" ,mate-session-manager) - ("mate-settings-daemon" ,mate-settings-daemon) - ("mate-desktop" ,mate-desktop) - ("mate-terminal" ,mate-terminal) - ("mate-themes" ,mate-themes) + ("gvfs" ,gvfs) ("libmatekbd" ,libmatekbd) - ("mate-menu" ,mate-menus) - ("libmateweather" ,libmateweather) ("libmatemixer" ,libmatemixer) - ("mate-panel" ,mate-panel) + ("libmateweather" ,libmateweather) + ("marco" ,marco) + ("mate-applets" ,mate-applets) ("mate-control-center" ,mate-control-center) + ("mate-desktop" ,mate-desktop) + ("mate-icon-theme" ,mate-icon-theme) ("mate-media" ,mate-media) - ("mate-applets" ,mate-applets) - ("gvfs" ,gvfs) - ("caja" ,caja) - ("marco" ,marco) + ("mate-menu" ,mate-menus) + ("mate-panel" ,mate-panel) + ("mate-session-manager" ,mate-session-manager) + ("mate-settings-daemon" ,mate-settings-daemon) + ("mate-terminal" ,mate-terminal) + ("mate-themes" ,mate-themes) ("pinentry-gnome3" ,pinentry-gnome3) ("pulseaudio" ,pulseaudio) ("shared-mime-info" ,shared-mime-info) [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [bug#28116] mate partial review 2017-08-24 20:42 ` [bug#28116] mate partial review Efraim Flashner @ 2017-08-25 18:11 ` ng0 2017-08-28 11:32 ` Efraim Flashner 0 siblings, 1 reply; 10+ messages in thread From: ng0 @ 2017-08-25 18:11 UTC (permalink / raw) To: Efraim Flashner; +Cc: 28116 [-- Attachment #1: Type: text/plain, Size: 17054 bytes --] Efraim Flashner transcribed 16K bytes: > I did all the building on my aarch64 board and didn't test the graphical > aspects of running the programs. I also didn't check the > synopsis/description, but some of them do look like they need some work. Thanks for this first review. I'll apply this as far as I can guess, having it all in one patch makes it hard to read but I'll figure it out. > patch 1: it turns out the home pages should also be https. > > mate-icon-theme and mate-themes don't need gtk in the inputs to build. > > libmateweather, mate-panel, mate-control-center: needs a configure flag > > mate-applet: it built fine for me with upower as an input > > mate-control-center: librsvg and gdk-pixbuf should be propagated > > caja: I enabled the display server and the tests still failed on me > > mate-metapackage: I copied the build from xfce, it seemed to build fine > for me. Why use it like this? I copied my version from "gnome". > I've attached a diff of what I have. I suggest you alphabetize the > inputs, it makes checking for duplicate or missing inputs much easier. > > -- > Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר > GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 > Confidentiality cannot be guaranteed on emails sent or received unencrypted > diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm > index 40359ede2a..d33b1445b9 100644 > --- a/gnu/packages/mate.scm > +++ b/gnu/packages/mate.scm > @@ -66,9 +66,8 @@ > (native-inputs > `(("pkg-config" ,pkg-config) > ("intltool" ,intltool) > - ("gtk+" ,gtk+) > ("icon-naming-utils" ,icon-naming-utils))) > - (home-page "http://mate-desktop.org/") > + (home-page "https://mate-desktop.org/") > (synopsis "The MATE desktop environment icon theme") > (description > "This package contains the default icon theme used by the MATE desktop.") > @@ -91,11 +90,10 @@ > `(("pkg-config" ,pkg-config) > ("intltool" ,intltool))) > (inputs > - `(("gtk+" ,gtk+) > - ("gdk-pixbuf" ,gdk-pixbuf) > + `(("gdk-pixbuf" ,gdk-pixbuf) > ("gtk-engines" ,gtk-engines) > ("murrine" ,murrine))) > - (home-page "http://mate-desktop.org/") > + (home-page "https://mate-desktop.org/") > (synopsis > "Official themes for the MATE desktop") > (description > @@ -131,7 +129,7 @@ themes for both gtk+-2 and gtk+-3.") > ("startup-notification" ,startup-notification))) > (propagated-inputs > `(("dconf" ,dconf))) ; mate-desktop-2.0.pc > - (home-page "http://mate-desktop.org/") > + (home-page "https://mate-desktop.org/") > (synopsis "Library with common API for various MATE modules") > (description > "This package contains a public API shared by several applications on the > @@ -152,14 +150,14 @@ 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")) > + "/share/zoneinfo") > + "--disable-icon-update") > #:phases > (modify-phases %standard-phases > - (add-before > - 'check 'pre-check > + (add-before 'check 'pre-check > (lambda* (#:key inputs #:allow-other-keys) > (substitute* "data/check-timezones.sh" > (("/usr/share/zoneinfo/zone.tab") > @@ -179,7 +177,7 @@ desktop and the mate-about program.") > ;; both of these are requires.private in mateweather.pc > `(("libsoup" ,libsoup) > ("libxml2" ,libxml2))) > - (home-page "http://mate-desktop.org/") > + (home-page "https://mate-desktop.org/") > (synopsis "MATE library for weather information from the Internet") > (description > "This library provides access to weather information from the internet for > @@ -220,7 +218,7 @@ the MATE desktop environment.") > ("mate-desktop" ,mate-desktop))) > (propagated-inputs > `(("dconf" ,dconf))) > - (home-page "http://mate-desktop.org/") > + (home-page "https://mate-desktop.org/") > (synopsis "MATE Terminal Emulator") > (description > "MATE Terminal is a terminal emulation application that you can > @@ -255,7 +253,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 > @@ -303,7 +301,7 @@ configuration program to choose applications starting on login.") > ("libcanberra" ,libcanberra) > ("fontconfig" ,fontconfig) > ("dconf" ,dconf))) > - (home-page "http://mate-desktop.org/") > + (home-page "https://mate-desktop.org/") > (synopsis "Settings Daemon for MATE") > (description > "Mate-settings-daemon is a fork of gnome-settings-daemon.") > @@ -331,7 +329,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 > @@ -364,7 +362,7 @@ sound systems.") > ("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 > @@ -387,8 +385,7 @@ MATE desktop environment.") > (arguments > `(#:phases > (modify-phases %standard-phases > - (add-after > - 'unpack 'fix-introspection-install-dir > + (add-after 'unpack 'fix-introspection-install-dir > (lambda* (#:key outputs #:allow-other-keys) > (let ((out (assoc-ref outputs "out"))) > (substitute* '("configure") > @@ -404,7 +401,7 @@ MATE desktop environment.") > (inputs > `(("glib" ,glib) > ("python" ,python-2))) > - (home-page "http://mate-desktop.org/") > + (home-page "https://mate-desktop.org/") > (synopsis "Freedesktop menu specification implementation for MATE") > (description > "The package contains an implementation of the freedesktop menu > @@ -426,9 +423,6 @@ assorted menu related utility programs.") > (base32 > "1nplr8i1mxbxd7pqhcy8j69v25nsp5dk9fq7ffrmjmp39lrf3fh5")))) > (build-system glib-or-gtk-build-system) > - (arguments > - ;; FIXME: Build with upower fails. > - `(#:configure-flags (list "--without-upower"))) > (native-inputs > `(("pkg-config" ,pkg-config) > ("intltool" ,intltool) > @@ -440,25 +434,27 @@ assorted menu related utility programs.") > ("gobject-introspection" ,gobject-introspection))) > (inputs > `(("atk" ,atk) > + ("dbus" ,dbus) > ("dbus-glib" ,dbus-glib) > + ("gdk-pixbuf" ,gdk-pixbuf) > ("glib" ,glib) > - ("libmateweather" ,libmateweather) > - ("libwnck" ,libwnck) > - ("pango" ,pango) > + ("gucharmap" ,gucharmap) > ("gtk+" ,gtk+) > ("gtksourceview" ,gtksourceview) > ("libgtop" ,libgtop) > - ("libxml2" ,libxml2) > - ("python-pygobject" ,python-pygobject) > - ("gucharmap" ,gucharmap) > - ("mate-panel" ,mate-panel) > - ("wireless-tools" ,wireless-tools) > - ("dbus" ,dbus) > ("libnotify" ,libnotify) > + ("libmateweather" ,libmateweather) > + ("libwnck" ,libwnck) > ("libx11" ,libx11) > - ("gdk-pixbuf" ,gdk-pixbuf) > - ("python" ,python-2))) > - (home-page "http://mate-desktop.org/") > + ("libxml2" ,libxml2) > + ("mate-panel" ,mate-panel) > + ("pango" ,pango) > + ("polkit" ,polkit) > + ("python" ,python-2) > + ("python-pygobject" ,python-pygobject) > + ("upower" ,upower) > + ("wireless-tools" ,wireless-tools))) > + (home-page "https://mate-desktop.org/") > (synopsis "Various applets for the MATE Panel") > (description > "Mate-applets includes various small applications for Mate-panel: > @@ -517,7 +513,7 @@ Interactive Weather Information Network (IWIN). > ("libcanberra" ,libcanberra) > ("startup-notification" ,startup-notification) > ("cairo" ,cairo))) > - (home-page "http://mate-desktop.org/") > + (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 > @@ -543,7 +539,8 @@ MATE-Media is a fork of GNOME-Media.") > `(#: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 > @@ -590,7 +587,7 @@ MATE-Media is a fork of GNOME-Media.") > ("mate-menus" ,mate-menus) > ("libsm" ,libsm) > ("mate-desktop" ,mate-desktop))) > - (home-page "http://mate-desktop.org/") > + (home-page "https://mate-desktop.org/") > (synopsis "Panel for MATE") > (description > "Mate-panel contains the MATE panel, the libmate-panel-applet library and > @@ -614,12 +611,24 @@ infamous 'Wanda the Fish'.") > "0mljqcx7k8p27854zm7qzzn8ca6hs7hva9p43hp4p507z52caqmm")))) > (build-system glib-or-gtk-build-system) > (arguments > - `(#:tests? #f)) > + '(#:configure-flags '("--disable-update-mimedb") > + #:tests? #f ; tests fail even with display set > + #:phases > + (modify-phases %standard-phases > + (add-before 'check 'pre-check > + (lambda* (#:key inputs #:allow-other-keys) > + ;; Tests require a running X server. > + (system "Xvfb :1 &") > + (setenv "DISPLAY" ":1") > + ;; For the missing /etc/machine-id. > + (setenv "DBUS_FATAL_WARNINGS" "0") > + #t))))) > (native-inputs > `(("pkg-config" ,pkg-config) > ("intltool" ,intltool) > ("glib:bin" ,glib "bin") > - ("gobject-introspection" ,gobject-introspection))) > + ("gobject-introspection" ,gobject-introspection) > + ("xorg-server" ,xorg-server))) ; display for the tests > (inputs > `(("gtk+" ,gtk+) > ("exempi" ,exempi) > @@ -630,7 +639,7 @@ infamous 'Wanda the Fish'.") > ("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. > @@ -657,6 +666,8 @@ Caja is a fork of Nautilus.") > (base32 > "0flnn0h8f5aqyccwrlv7qxchvr3kqmlfdga6wq28d55zkpv5m7dl")))) > (build-system glib-or-gtk-build-system) > + (arguments > + '(#:configure-flags '("--disable-update-mimedb"))) > (native-inputs > `(("pkg-config" ,pkg-config) > ("intltool" ,intltool) > @@ -676,7 +687,6 @@ Caja is a fork of Nautilus.") > ("dbus-glib" ,dbus-glib) > ("libxml2" ,libxml2) > ("dconf" ,dconf) > - ("librsvg" ,librsvg) > ("libmatekbd" ,libmatekbd) > ("mate-desktop" ,mate-desktop) > ("caja" ,caja) > @@ -688,7 +698,6 @@ Caja is a fork of Nautilus.") > ("dbus" ,dbus) > ("xmodmap" ,xmodmap) > ("cairo" ,cairo) > - ("gdk-pixbuf" ,gdk-pixbuf) > ("gtk+" ,gtk+) > ("libxcursor" ,libxcursor) > ("libx11" ,libx11) > @@ -701,7 +710,10 @@ Caja is a fork of Nautilus.") > ("libxklavier" ,libxklavier) > ("marco" ,marco) > ("pango" ,pango))) > - (home-page "http://mate-desktop.org/") > + (propagated-inputs > + `(("gdk-pixbuf" ,gdk-pixbuf) ; 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 > @@ -753,7 +765,7 @@ of various aspects of your desktop.") > ("xproto" ,xproto) > ("libcanberra" ,libcanberra) > ("mate-desktop" ,mate-desktop))) > - (home-page "http://mate-desktop.org/") > + (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 > @@ -769,33 +781,42 @@ for use with MATE or as a standalone window manager.") > (version (package-version marco)) > (source #f) > (build-system trivial-build-system) > - (arguments '(#:builder (mkdir %output))) > - (propagated-inputs > + (arguments > + '(#:modules ((guix build union)) > + #:builder > + (begin > + (use-modules (ice-9 match) > + (guix build union)) > + (match %build-inputs > + (((names . directories) ...) > + (union-build (assoc-ref %outputs "out") > + directories)))))) > + (inputs > ;; TODO: Add more packages > - `(("mate-icon-theme" ,mate-icon-theme) > - ("font-cantarell" ,font-cantarell) > - ("at-spi2-core" ,at-spi2-core) > - ("dbus" ,dbus) > + `(("at-spi2-core" ,at-spi2-core) > + ("caja" ,caja) > ("dconf" ,dconf) > + ("dbus" ,dbus) > ("desktop-file-utils" ,desktop-file-utils) > + ("font-cantarell" ,font-cantarell) > ("glib-networking" ,glib-networking) > ("gnome-keyring" ,gnome-keyring) > - ("mate-session-manager" ,mate-session-manager) > - ("mate-settings-daemon" ,mate-settings-daemon) > - ("mate-desktop" ,mate-desktop) > - ("mate-terminal" ,mate-terminal) > - ("mate-themes" ,mate-themes) > + ("gvfs" ,gvfs) > ("libmatekbd" ,libmatekbd) > - ("mate-menu" ,mate-menus) > - ("libmateweather" ,libmateweather) > ("libmatemixer" ,libmatemixer) > - ("mate-panel" ,mate-panel) > + ("libmateweather" ,libmateweather) > + ("marco" ,marco) > + ("mate-applets" ,mate-applets) > ("mate-control-center" ,mate-control-center) > + ("mate-desktop" ,mate-desktop) > + ("mate-icon-theme" ,mate-icon-theme) > ("mate-media" ,mate-media) > - ("mate-applets" ,mate-applets) > - ("gvfs" ,gvfs) > - ("caja" ,caja) > - ("marco" ,marco) > + ("mate-menu" ,mate-menus) > + ("mate-panel" ,mate-panel) > + ("mate-session-manager" ,mate-session-manager) > + ("mate-settings-daemon" ,mate-settings-daemon) > + ("mate-terminal" ,mate-terminal) > + ("mate-themes" ,mate-themes) > ("pinentry-gnome3" ,pinentry-gnome3) > ("pulseaudio" ,pulseaudio) > ("shared-mime-info" ,shared-mime-info) -- ng0 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://n0is.noblogs.org/my-keys https://www.infotropique.org https://krosos.org [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* [bug#28116] mate partial review 2017-08-25 18:11 ` ng0 @ 2017-08-28 11:32 ` Efraim Flashner 2017-08-31 12:54 ` ng0 0 siblings, 1 reply; 10+ messages in thread From: Efraim Flashner @ 2017-08-28 11:32 UTC (permalink / raw) To: 28116 [-- Attachment #1: Type: text/plain, Size: 1692 bytes --] On Fri, Aug 25, 2017 at 06:11:25PM +0000, ng0 wrote: > Efraim Flashner transcribed 16K bytes: > > I did all the building on my aarch64 board and didn't test the graphical > > aspects of running the programs. I also didn't check the > > synopsis/description, but some of them do look like they need some work. > > Thanks for this first review. > I'll apply this as far as I can guess, having it all in one > patch makes it hard to read but I'll figure it out. > sorry about that, I applied all the patches and then just worked on them all in one go. > > patch 1: it turns out the home pages should also be https. > > > > mate-icon-theme and mate-themes don't need gtk in the inputs to build. > > > > libmateweather, mate-panel, mate-control-center: needs a configure flag > > > > mate-applet: it built fine for me with upower as an input > > > > mate-control-center: librsvg and gdk-pixbuf should be propagated > > > > caja: I enabled the display server and the tests still failed on me > > > > mate-metapackage: I copied the build from xfce, it seemed to build fine > > for me. > > Why use it like this? I copied my version from "gnome". > xfce was changed because there were problems with overlapping packages between xfce and gnome in the example os-config.scm > > -- > ng0 > GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 > GnuPG: https://n0is.noblogs.org/my-keys > https://www.infotropique.org https://krosos.org -- Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* [bug#28116] mate partial review 2017-08-28 11:32 ` Efraim Flashner @ 2017-08-31 12:54 ` ng0 2017-08-31 13:21 ` ng0 0 siblings, 1 reply; 10+ messages in thread From: ng0 @ 2017-08-31 12:54 UTC (permalink / raw) To: Efraim Flashner; +Cc: 28116 [-- Attachment #1.1: Type: text/plain, Size: 504 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! -- ng0 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://n0is.noblogs.org/my-keys https://www.infotropique.org https://krosos.org [-- Attachment #1.2: 0001-gnu-mate-Fetch-sources-via-https.patch --] [-- Type: text/plain, Size: 5322 bytes --] From 76f2c0ddca0190cdfe1e5e991020ac58e840b448 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Wed, 16 Aug 2017 10:27:04 +0000 Subject: [PATCH 01/17] gnu: mate: Fetch sources via https. * gnu/packages/mate.scm (mate-icon-theme)[source]: Use https. (mate-themes)[source]: Likewise. (mate-desktop)[source]: Likewise. (libmateweather)[source]: Likewise. (mate-menus)[source]: Likewise. (mate-icon-theme)[home-page]: Use https. (mate-themes)[home-page]: Likewise. (mate-desktop)[home-page]: Likewise. (libmateweather)[home-page]: Likewise. (mate-menus)[home-page]: Likewise. --- gnu/packages/mate.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 316385a6f..66c40c692 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2017 ng0 <ng0@infotropique.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,7 +41,7 @@ (version "1.18.2") (source (origin (method url-fetch) - (uri (string-append "http://pub.mate-desktop.org/releases/" + (uri (string-append "https://pub.mate-desktop.org/releases/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 @@ -52,7 +53,7 @@ ("intltool" ,intltool) ("gtk+" ,gtk+) ("icon-naming-utils" ,icon-naming-utils))) - (home-page "http://mate-desktop.org/") + (home-page "https://mate-desktop.org/") (synopsis "The MATE desktop environment icon theme") (description "This package contains the default icon theme used by the MATE desktop.") @@ -64,7 +65,7 @@ (version "3.22.11") (source (origin (method url-fetch) - (uri (string-append "http://pub.mate-desktop.org/releases/themes/" + (uri (string-append "https://pub.mate-desktop.org/releases/themes/" (version-major+minor version) "/mate-themes-" version ".tar.xz")) (sha256 @@ -79,7 +80,7 @@ ("gdk-pixbuf" ,gdk-pixbuf) ("gtk-engines" ,gtk-engines) ("murrine" ,murrine))) - (home-page "http://mate-desktop.org/") + (home-page "https://mate-desktop.org/") (synopsis "Official themes for the MATE desktop") (description @@ -95,7 +96,7 @@ themes for both gtk+-2 and gtk+-3.") (version "1.18.0") (source (origin (method url-fetch) - (uri (string-append "http://pub.mate-desktop.org/releases/" + (uri (string-append "https://pub.mate-desktop.org/releases/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 @@ -115,7 +116,7 @@ themes for both gtk+-2 and gtk+-3.") ("startup-notification" ,startup-notification))) (propagated-inputs `(("dconf" ,dconf))) ; mate-desktop-2.0.pc - (home-page "http://mate-desktop.org/") + (home-page "https://mate-desktop.org/") (synopsis "Library with common API for various MATE modules") (description "This package contains a public API shared by several applications on the @@ -128,7 +129,7 @@ desktop and the mate-about program.") (version "1.18.1") (source (origin (method url-fetch) - (uri (string-append "http://pub.mate-desktop.org/releases/" + (uri (string-append "https://pub.mate-desktop.org/releases/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 @@ -163,7 +164,7 @@ desktop and the mate-about program.") ;; both of these are requires.private in mateweather.pc `(("libsoup" ,libsoup) ("libxml2" ,libxml2))) - (home-page "http://mate-desktop.org/") + (home-page "https://mate-desktop.org/") (synopsis "MATE library for weather information from the Internet") (description "This library provides access to weather information from the internet for @@ -176,7 +177,7 @@ the MATE desktop environment.") (version "1.18.0") (source (origin (method url-fetch) - (uri (string-append "http://pub.mate-desktop.org/releases/" + (uri (string-append "https://pub.mate-desktop.org/releases/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 @@ -203,7 +204,7 @@ the MATE desktop environment.") (inputs `(("glib" ,glib) ("python" ,python-2))) - (home-page "http://mate-desktop.org/") + (home-page "https://mate-desktop.org/") (synopsis "Freedesktop menu specification implementation for MATE") (description "The package contains an implementation of the freedesktop menu -- 2.14.1 [-- Attachment #1.3: 0002-gnu-mate-icon-theme-Remove-gtk-from-native-inputs.patch --] [-- Type: text/plain, Size: 827 bytes --] From 99462fe81597497bbe8a61704c6c17b36e2de5f9 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Fri, 25 Aug 2017 17:53:03 +0000 Subject: [PATCH 02/17] gnu: mate-icon-theme: Remove 'gtk+' from native-inputs. * gnu/packages/mate.scm (mate-icon-theme)[native-inputs]: Remove 'gtk+'. --- gnu/packages/mate.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 66c40c692..0bbb4044c 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -51,7 +51,6 @@ (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool) - ("gtk+" ,gtk+) ("icon-naming-utils" ,icon-naming-utils))) (home-page "https://mate-desktop.org/") (synopsis "The MATE desktop environment icon theme") -- 2.14.1 [-- Attachment #1.4: 0003-gnu-mate-themes-Remove-gtk-from-native-inputs.patch --] [-- Type: text/plain, Size: 864 bytes --] From c5c6fce3e633a494d59031bca5e8ce2b14e0272b Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Fri, 25 Aug 2017 17:54:47 +0000 Subject: [PATCH 03/17] gnu: mate-themes: Remove 'gtk+' from native-inputs. * gnu/packages/mate.scm (mate-themes)[native-inputs]: Remove 'gtk+'. --- gnu/packages/mate.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 0bbb4044c..47471c3ca 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -75,8 +75,7 @@ `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) (inputs - `(("gtk+" ,gtk+) - ("gdk-pixbuf" ,gdk-pixbuf) + `(("gdk-pixbuf" ,gdk-pixbuf) ("gtk-engines" ,gtk-engines) ("murrine" ,murrine))) (home-page "https://mate-desktop.org/") -- 2.14.1 [-- Attachment #1.5: 0004-gnu-Add-caja.patch --] [-- Type: text/plain, Size: 3593 bytes --] From 48593f9ffc2fa582196cf4be9bfab73fe95336ed Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Sun, 6 Aug 2017 17:22:41 +0000 Subject: [PATCH 04/17] gnu: Add caja. * gnu/packages/mate.scm (caja): New variable. --- gnu/packages/mate.scm | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 47471c3ca..28de4f60a 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -24,8 +24,10 @@ #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system glib-or-gtk) #:use-module (gnu packages) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) @@ -33,6 +35,7 @@ #:use-module (gnu packages xdisorg) #:use-module (gnu packages base) #:use-module (gnu packages xml) + #:use-module (gnu packages photo) #:use-module (gnu packages python)) (define-public mate-icon-theme @@ -209,3 +212,59 @@ the MATE desktop environment.") specification, the MATE menu layout configuration files, .directory files and assorted menu related utility programs.") (license (list license:gpl2+ license:lgpl2.0+)))) + +(define-public caja + (package + (name "caja") + (version "1.18.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0mljqcx7k8p27854zm7qzzn8ca6hs7hva9p43hp4p507z52caqmm")))) + (build-system glib-or-gtk-build-system) + (arguments + `(#:configure-flags '("--disable-update-mimedb") + #:tests? #f ; tests fail even with display set + #:phases + (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda* (#:key inputs #:allow-other-keys) + ;; Tests require a running X server. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + ;; For the missing /etc/machine-id. + (setenv "DBUS_FATAL_WARNINGS" "0") + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("glib:bin" ,glib "bin") + ("xorg-server" ,xorg-server) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("gtk+" ,gtk+) + ("exempi" ,exempi) + ("gvfs" ,gvfs) + ("libexif" ,libexif) + ("libsm" ,libsm) + ("libnotify" ,libnotify) + ("libxml2" ,libxml2) + ("mate-desktop" ,mate-desktop) + ("startup-notification" ,startup-notification))) + (home-page "http://mate-desktop.org/") + (synopsis "File manager for the MATE desktop") + (description + "Caja is the official file manager for the MATE desktop. +It allows for browsing directories, as well as previewing files and launching +applications associated with them. Caja is also responsible for handling the +icons on the MATE desktop. It works on local and remote filesystems. +Caja is a fork of Nautilus.") + ;; There is a note about a TRADEMARKS_NOTICE file in COPYING which + ;; does not exist. It is safe to assume that this is of no concern + ;; for us. + (license license:gpl2+))) -- 2.14.1 [-- Attachment #1.6: 0005-gnu-mate-themes-Update-to-3.22.13.patch --] [-- Type: text/plain, Size: 1179 bytes --] From b2c1337eeb9cde7df467c2a3494365ca5ca4d590 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Wed, 23 Aug 2017 13:53:30 +0000 Subject: [PATCH 05/17] gnu: mate-themes: Update to 3.22.13. * gnu/packages/mate.scm (mate-themes): Update to 3.22.13. --- gnu/packages/mate.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 28de4f60a..a4e14d4f5 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -64,7 +64,7 @@ (define-public mate-themes (package (name "mate-themes") - (version "3.22.11") + (version "3.22.13") (source (origin (method url-fetch) (uri (string-append "https://pub.mate-desktop.org/releases/themes/" @@ -72,7 +72,7 @@ version ".tar.xz")) (sha256 (base32 - "1gfa1cny3q68y139m96iz8haiik6ygad5613gx0m4wd9hi5scafm")))) + "1p7w63an8qs15hkj79nppy7471glv0rm1b0himn3c4w69q8qdc9i")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- 2.14.1 [-- Attachment #1.7: 0006-gnu-mate-desktop-Add-gtk-doc-back-to-native-inputs.patch --] [-- Type: text/plain, Size: 999 bytes --] From 49f717ea7fff8f177c5fc7af00b274cedfa0ea27 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Wed, 23 Aug 2017 13:59:30 +0000 Subject: [PATCH 06/17] gnu: mate-desktop: Add 'gtk-doc' back to native-inputs. * gnu/packages/mate.scm (mate-desktop)[native-inputs]: Uncomment 'gtk-doc' as input. --- gnu/packages/mate.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index a4e14d4f5..17168d4ec 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -109,8 +109,8 @@ themes for both gtk+-2 and gtk+-3.") ("intltool" ,intltool) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("yelp-tools" ,yelp-tools))) - ;;("gtk-doc" ,gtk-doc))) ; add back in when gtk-doc builds + ("yelp-tools" ,yelp-tools) + ("gtk-doc" ,gtk-doc))) (inputs `(("gtk+" ,gtk+) ("libxrandr" ,libxrandr) -- 2.14.1 [-- Attachment #1.8: 0007-gnu-Add-mate-terminal.patch --] [-- Type: text/plain, Size: 2378 bytes --] From c9e4edef729f432c6b7c2ff0d49b8883c3e74d95 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Sun, 6 Aug 2017 18:29:40 +0000 Subject: [PATCH 07/17] gnu: Add mate-terminal. * gnu/packages/mate.scm (mate-terminal): New variable. --- gnu/packages/mate.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 17168d4ec..36033b98c 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -172,6 +172,51 @@ desktop and the mate-about program.") the MATE desktop environment.") (license license:lgpl2.1+))) +(define-public mate-terminal + (package + (name "mate-terminal") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1zihm609d2d9cw53ry385whshjl1dnkifpk41g1ddm9f58hv4da1")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("libsm" ,libsm))) + (inputs + `(("gtk+" ,gtk+) + ("gdk-pixbuf" ,gdk-pixbuf) + ("exempi" ,exempi) + ("libnotify" ,libnotify) + ("libxml2" ,libxml2) + ("libice" ,libice) + ("libx11" ,libx11) + ("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/") + (synopsis "MATE Terminal Emulator") + (description + "MATE Terminal is a terminal emulation application that you can +use to access a shell. With it, you can run any application that +is designed to run on VT102, VT220, and xterm terminals. +MATE Terminal also has the ability to use multiple terminals +in a single window (tabs) and supports management of different +configurations (profiles). MATE Terminal is a fork of GNOME Terminal.") + (license license:gpl3))) + (define-public mate-menus (package (name "mate-menus") -- 2.14.1 [-- Attachment #1.9: 0008-gnu-Add-marco.patch --] [-- Type: text/plain, Size: 3012 bytes --] From ac2f644f6e6d34148940544748bcf9e405927001 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Sun, 6 Aug 2017 18:03:17 +0000 Subject: [PATCH 08/17] gnu: Add marco. * gnu/packages/mate.scm (marco): New variable. --- gnu/packages/mate.scm | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 36033b98c..5854512fc 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -28,6 +28,7 @@ #:use-module (gnu packages) #:use-module (gnu packages pkg-config) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages libcanberra) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) @@ -313,3 +314,58 @@ Caja is a fork of Nautilus.") ;; does not exist. It is safe to assume that this is of no concern ;; for us. (license license:gpl2+))) + +(define-public marco + (package + (name "marco") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0lwbp9wyd66hl5d7g272l8g3k1pb9s4s2p9fb04750a58w87d8k5")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("itstool" ,itstool) + ("glib" ,glib) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("gtk+" ,gtk+) + ("libgtop" ,libgtop) + ("zenity" ,zenity) + ("libxcursor" ,libxcursor) + ("libsm" ,libsm) + ("libxml2" ,libxml2) + ("libgtop" ,libgtop) + ("gdk-pixbuf" ,gdk-pixbuf) + ("libx11" ,libx11) + ("libice" ,libice) + ("libxcomposite" ,libxcomposite) + ("libxdamage" ,libxdamage) + ("libxext" ,libxext) + ("libxfixes" ,libxfixes) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("libxft" ,libxft) + ("pango" ,pango) + ("startup-notification" ,startup-notification) + ("libxinerama" ,libxinerama) + ("xextproto" ,xextproto) + ("xproto" ,xproto) + ("libcanberra" ,libcanberra) + ("mate-desktop" ,mate-desktop))) + (home-page "http://mate-desktop.org/") + (synopsis "Window manager for the MATE desktop") + (description + "Marco is a minimal X window manager that uses GTK+ for drawing +window frames. It is aimed at non-technical users and is designed to integrate +well with the MATE desktop. It lacks some features that may be expected by +some users; these users may want to investigate other available window managers +for use with MATE or as a standalone window manager.") + (license license:gpl2+))) -- 2.14.1 [-- Attachment #1.10: 0009-gnu-Add-mate-session-manager.patch --] [-- Type: text/plain, Size: 1904 bytes --] From d8d4c0e47d7e6b3bf9587bc4f1bcb427cc9d6a07 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Mon, 14 Aug 2017 17:18:06 +0000 Subject: [PATCH 09/17] gnu: Add mate-session-manager. * gnu/packages/mate.scm (mate-session-manager): New variable. --- gnu/packages/mate.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 5854512fc..65ed6e189 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -218,6 +218,37 @@ in a single window (tabs) and supports management of different configurations (profiles). MATE Terminal is a fork of GNOME Terminal.") (license license:gpl3))) +(define-public mate-session-manager + (package + (name "mate-session-manager") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0i0xq6041x2qmb26x9bawx0qpfkgjn6x9w3phnm9s7rc4s0z20ll")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("xtrans" ,xtrans) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("gtk+" ,gtk+) + ("dbus-glib" ,dbus-glib) + ("libsm" ,libsm) + ("mate-desktop" ,mate-desktop))) + (home-page "http://mate-desktop.org/") + (synopsis "Session manager for MATE") + (description + "Mate-session contains the MATE session manager, as well as a +configuration program to choose applications starting on login.") + (license license:gpl2))) + (define-public mate-menus (package (name "mate-menus") -- 2.14.1 [-- Attachment #1.11: 0010-gnu-Add-mate-panel.patch --] [-- Type: text/plain, Size: 3838 bytes --] From c818f63ccdbec04b616a98444c889d53e1e98eba Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Mon, 14 Aug 2017 18:58:34 +0000 Subject: [PATCH 10/17] gnu: Add mate-panel. * gnu/packages/mate.scm (mate-panel): New variable. --- gnu/packages/mate.scm | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 65ed6e189..5132e19bd 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -290,6 +290,80 @@ specification, the MATE menu layout configuration files, .directory files and assorted menu related utility programs.") (license (list license:gpl2+ license:lgpl2.0+)))) +(define-public mate-panel + (package + (name "mate-panel") + (version "1.18.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1n565ff1n7jrfx223i3cl3m69wjda506nvbn8gra7m1jwdfzpbw1")))) + (build-system glib-or-gtk-build-system) + (arguments + `(#:configure-flags + (list (string-append "--with-zoneinfo-dir=" + (assoc-ref %build-inputs "tzdata") + "/share/zoneinfo")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-timezone-path + (lambda* (#:key inputs #:allow-other-keys) + (let* ((tzdata (assoc-ref inputs "tzdata"))) + (substitute* "applets/clock/system-timezone.h" + (("/usr/share/lib/zoneinfo/tab") + (string-append tzdata "/share/zoneinfo/zone.tab")) + (("/usr/share/zoneinfo") + (string-append tzdata "/share/zoneinfo")))) + #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) + ("itstool" ,itstool) + ("xtrans" ,xtrans) + ("tzdata" ,tzdata) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("gtk+" ,gtk+) + ("dbus-glib" ,dbus-glib) + ("libwnck" ,libwnck) + ("pango" ,pango) + ("librsvg" ,librsvg) + ("libcanberra" ,libcanberra) + ("libmateweather" ,libmateweather) + ("libxrandr" ,libxrandr) + ("libxml2" ,libxml2) + ("dconf" ,dconf) + ("cairo" ,cairo) + ("gdk-pixbuf" ,gdk-pixbuf) + ("libice" ,libice) + ("libx11" ,libx11) + ("libxau" ,libxau) + ("mate-menus" ,mate-menus) + ("libsm" ,libsm) + ("mate-desktop" ,mate-desktop))) + (home-page "http://mate-desktop.org/") + (synopsis "Panel for MATE") + (description + "Mate-panel contains the MATE panel, the libmate-panel-applet library and +several applets. The applets supplied here include the Workspace Switcher, +the Window List, the Window Selector, the Notification Area, the Clock and the +infamous 'Wanda the Fish'.") + (license (list license:gpl2+ license:lgpl2.0+)))) + (define-public caja (package (name "caja") -- 2.14.1 [-- Attachment #1.12: 0011-gnu-Add-libmatemixer.patch --] [-- Type: text/plain, Size: 2424 bytes --] From c1048ae5756a5ba0ed1e5ea8d76ad9860006f351 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Tue, 15 Aug 2017 20:23:59 +0000 Subject: [PATCH 11/17] gnu: Add libmatemixer. * gnu/packages/mate.scm (libmatemixer): New variable. --- gnu/packages/mate.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 5132e19bd..5c549e90c 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -29,6 +29,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages freedesktop) #:use-module (gnu packages libcanberra) + #:use-module (gnu packages linux) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) @@ -37,6 +38,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages xml) #:use-module (gnu packages photo) + #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python)) (define-public mate-icon-theme @@ -249,6 +251,36 @@ configurations (profiles). MATE Terminal is a fork of GNOME Terminal.") configuration program to choose applications starting on login.") (license license:gpl2))) +(define-public libmatemixer + (package + (name "libmatemixer") + (version "1.18.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "09vyxnlnalws318gsafdfi5c6jwpp92pbafn1ddlqqds23ihk4mr")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("glib" ,glib) + ("pulseaudio" ,pulseaudio) + ("alsa-lib" ,alsa-lib))) + (home-page "http://mate-desktop.org/") + (synopsis "Mixer library for the MATE desktop") + (description + "Libmatemixer is a mixer library for MATE desktop. It provides an abstract +API allowing access to mixer functionality available in the PulseAudio and ALSA +sound systems.") + (license license:lgpl2.1))) + (define-public mate-menus (package (name "mate-menus") -- 2.14.1 [-- Attachment #1.13: 0012-gnu-Add-libmatekbd.patch --] [-- Type: text/plain, Size: 1823 bytes --] From 82ec7c79d6d3315c7691274ce340597521f4d244 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Tue, 15 Aug 2017 20:53:08 +0000 Subject: [PATCH 12/17] gnu: Add libmatekbd. * gnu/packages/mate.scm (libmatekbd): New variable. --- gnu/packages/mate.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 5c549e90c..3871dc393 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -281,6 +281,38 @@ API allowing access to mixer functionality available in the PulseAudio and ALSA sound systems.") (license license:lgpl2.1))) +(define-public libmatekbd + (package + (name "libmatekbd") + (version "1.18.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "030bl18qbjm7l92bp1bhs7v82bp8j3mv7c1j1a4gd89iz4611pq3")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("glib" ,glib) + ("gdk-pixbuf" ,gdk-pixbuf) + ("gtk+" ,gtk+) + ("cairo" ,cairo) + ("libx11" ,libx11) + ("libxklavier" ,libxklavier))) + (home-page "http://mate-desktop.org/") + (synopsis "MATE keyboard configuration library") + (description + "Libmatekbd is a keyboard configuration library for the +MATE desktop environment.") + (license license:lgpl2.1))) + (define-public mate-menus (package (name "mate-menus") -- 2.14.1 [-- Attachment #1.14: 0013-gnu-Add-mate-settings-daemon.patch --] [-- Type: text/plain, Size: 3182 bytes --] From 32db64496f47dbcac2cb45f9bf40be6e755e5538 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Tue, 15 Aug 2017 21:23:23 +0000 Subject: [PATCH 13/17] gnu: Add mate-settings-daemon. * gnu/packages/mate.scm (mate-settings-daemon): New variable. --- gnu/packages/mate.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 3871dc393..05068639c 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -28,16 +28,19 @@ #:use-module (gnu packages) #:use-module (gnu packages pkg-config) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages fontutils) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) + #:use-module (gnu packages gnuzilla) #:use-module (gnu packages xorg) #:use-module (gnu packages xdisorg) #:use-module (gnu packages base) #:use-module (gnu packages xml) #:use-module (gnu packages photo) + #:use-module (gnu packages polkit) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python)) @@ -251,6 +254,53 @@ configurations (profiles). MATE Terminal is a fork of GNOME Terminal.") configuration program to choose applications starting on login.") (license license:gpl2))) +(define-public mate-settings-daemon + (package + (name "mate-settings-daemon") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "07b2jkxqv07njdrgkdck93d872p6lch1lrvi7ydnpicspg3rfid6")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("gtk+" ,gtk+) + ("dbus-glib" ,dbus-glib) + ("mate-desktop" ,mate-desktop) + ("libmatekbd" ,libmatekbd) + ("libmatemixer" ,libmatemixer) + ("libxklavier" ,libxklavier) + ("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) + ("nss" ,nss) + ("libcanberra" ,libcanberra) + ("fontconfig" ,fontconfig) + ("dconf" ,dconf))) + (home-page "http://mate-desktop.org/") + (synopsis "Settings Daemon for MATE") + (description + "Mate-settings-daemon is a fork of gnome-settings-daemon.") + (license (list license:lgpl2.1 license:gpl2)))) + (define-public libmatemixer (package (name "libmatemixer") -- 2.14.1 [-- Attachment #1.15: 0014-gnu-Add-mate-applets.patch --] [-- Type: text/plain, Size: 4332 bytes --] From af5ea6fa452a703f494fd2dcde68080eefa198e0 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Wed, 23 Aug 2017 16:54:21 +0000 Subject: [PATCH 14/17] gnu: Add mate-applets. * gnu/packages/mate.scm (mate-applets): New variable. --- gnu/packages/mate.scm | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 05068639c..6fb7eeaf5 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -33,9 +33,12 @@ #:use-module (gnu packages linux) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) + #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) + #:use-module (gnu packages docbook) #:use-module (gnu packages gnuzilla) #:use-module (gnu packages xorg) + #:use-module (gnu packages documentation) #:use-module (gnu packages xdisorg) #:use-module (gnu packages base) #:use-module (gnu packages xml) @@ -404,6 +407,78 @@ specification, the MATE menu layout configuration files, .directory files and assorted menu related utility programs.") (license (list license:gpl2+ license:lgpl2.0+)))) +(define-public mate-applets + (package + (name "mate-applets") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1nplr8i1mxbxd7pqhcy8j69v25nsp5dk9fq7ffrmjmp39lrf3fh5")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("libxslt" ,libxslt) + ("yelp-tools" ,yelp-tools) + ;;("scrollkeeper" ,scrollkeeper) ;Add back when scrollkeeper builds. + ("gettext" ,gettext-minimal) + ("docbook-xml" ,docbook-xml) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("atk" ,atk) + ("dbus" ,dbus) + ("dbus-glib" ,dbus-glib) + ("gdk-pixbuf" ,gdk-pixbuf) + ("glib" ,glib) + ("gucharmap" ,gucharmap) + ("gtk+" ,gtk+) + ("gtksourceview" ,gtksourceview) + ("libmateweather" ,libmateweather) + ("libwnck" ,libwnck) + ("libnotify" ,libnotify) + ("libx11" ,libx11) + ("libgtop" ,libgtop) + ("libxml2" ,libxml2) + ("mate-panel" ,mate-panel) + ("wireless-tools" ,wireless-tools) + ("pango" ,pango) + ("python" ,python-2) + ("python-pygobject" ,python-pygobject))) + (home-page "http://mate-desktop.org/") + (synopsis "Various applets for the MATE Panel") + (description + "Mate-applets includes various small applications for Mate-panel: + +@enumerate +@item accessx-status: indicates keyboard accessibility settings, +including the current state of the keyboard, if those features are in use. +@item Battstat: monitors the power subsystem on a laptop. +@item Character palette: provides a convenient way to access +non-standard characters, such as accented characters, +mathematical symbols, special symbols, and punctuation marks. +@item MATE CPUFreq Applet: CPU frequency scaling monitor +@item Drivemount: lets you mount and unmount drives and file systems. +@item Geyes: pair of eyes which follow the mouse pointer around the screen. +@item Keyboard layout switcher: lets you assign different keyboard +layouts for different locales. +@item Modem Monitor: monitors the modem. +@item Invest: downloads current stock quotes from the Internet and +displays the quotes in a scrolling display in the applet. The +applet downloads the stock information from Yahoo! Finance. +@item System monitor: CPU, memory, network, swap file and resource. +@item Trash: lets you drag items to the trash folder. +@item Weather report: downloads weather information from the +U.S National Weather Service (NWS) servers, including the +Interactive Weather Information Network (IWIN). +@end enumerate\n") + (license (list license:gpl2+ license:lgpl2.0+ license:gpl3+)))) + (define-public mate-panel (package (name "mate-panel") -- 2.14.1 [-- Attachment #1.16: 0015-gnu-Add-mate-media.patch --] [-- Type: text/plain, Size: 2190 bytes --] From 1171bb103df40d7afeae3faed58770fdf5f2351f Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Wed, 23 Aug 2017 17:18:02 +0000 Subject: [PATCH 15/17] gnu: Add mate-media. * gnu/packages/mate.scm (mate-media): New variable. --- gnu/packages/mate.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 6fb7eeaf5..fea246e8e 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -479,6 +479,44 @@ Interactive Weather Information Network (IWIN). @end enumerate\n") (license (list license:gpl2+ license:lgpl2.0+ license:gpl3+)))) +(define-public mate-media + (package + (name "mate-media") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1l0j71d07898wb6ily09sj1xczwrmcw13wyhxwns7sxw592nwi04")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("gtk+" ,gtk+) + ("pango" ,pango) + ("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/") + (synopsis "Multimedia related programs for the MATE desktop") + (description + "Mate-media includes the MATE media tools for MATE, including +mate-volume-control, a MATE volume control application and applet. +MATE-Media is a fork of GNOME-Media.") + (license (list license:gpl2+ license:lgpl2.0+ license:fdl1.1+)))) + (define-public mate-panel (package (name "mate-panel") -- 2.14.1 [-- Attachment #1.17: 0016-gnu-Add-mate-control-center.patch --] [-- Type: text/plain, Size: 3089 bytes --] From dc98fb4d98cd352921ff6e00325339842447d24d Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Wed, 23 Aug 2017 18:36:16 +0000 Subject: [PATCH 16/17] gnu: Add mate-control-center. * gnu/packages/mate.scm (mate-control-center): New variable. --- gnu/packages/mate.scm | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index fea246e8e..dcf4cd764 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -647,6 +647,74 @@ Caja is a fork of Nautilus.") ;; for us. (license license:gpl2+))) +(define-public mate-control-center + (package + (name "mate-control-center") + (version "1.18.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0flnn0h8f5aqyccwrlv7qxchvr3kqmlfdga6wq28d55zkpv5m7dl")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("glib" ,glib) + ("yelp-tools" ,yelp-tools) + ("desktop-file-utils" ,desktop-file-utils) + ("kbproto" ,kbproto) + ("randrproto" ,randrproto) + ("renderproto" ,renderproto) + ("scrnsaverproto" ,scrnsaverproto) + ("xextpro" ,xextproto) + ("xproto" ,xproto) + ("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) + ("caja" ,caja) + ("mate-menus" ,mate-menus) + ("mate-settings-daemon" ,mate-settings-daemon) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("libcanberra" ,libcanberra) + ("dbus" ,dbus) + ("xmodmap" ,xmodmap) + ("cairo" ,cairo) + ("gdk-pixbuf" ,gdk-pixbuf) + ("gtk+" ,gtk+) + ("libxcursor" ,libxcursor) + ("libx11" ,libx11) + ("libxscrnsaver" ,libxscrnsaver) + ("libxcursor" ,libxcursor) + ("libxext" ,libxext) + ("libxi" ,libxi) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("libxklavier" ,libxklavier) + ("marco" ,marco) + ("pango" ,pango))) + (propagated-inputs + `(("gdk-pixbuf" ,gdk-pixbuf) ; mate-slab.pc + ("librsvg" ,librsvg))) ; mate-slab.pc + (home-page "http://mate-desktop.org/") + (synopsis "MATE Desktop configuration tool") + (description + "MATE control center is MATE's main interface for configuration +of various aspects of your desktop.") + (license license:gpl2+))) + (define-public marco (package (name "marco") -- 2.14.1 [-- Attachment #1.18: 0017-gnu-Add-mate.patch --] [-- Type: text/plain, Size: 4135 bytes --] From 35f7e7755b143b422e5ae426a874f0ee7eb44911 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Wed, 16 Aug 2017 11:38:35 +0000 Subject: [PATCH 17/17] gnu: Add mate. * gnu/packages/mate.scm (mate): New variable. --- gnu/packages/mate.scm | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index dcf4cd764..d1be999c7 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -25,10 +25,12 @@ #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages pkg-config) #:use-module (gnu packages freedesktop) #:use-module (gnu packages fontutils) + #:use-module (gnu packages fonts) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) #:use-module (gnu packages glib) @@ -36,6 +38,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) #:use-module (gnu packages docbook) + #:use-module (gnu packages gnupg) #:use-module (gnu packages gnuzilla) #:use-module (gnu packages xorg) #:use-module (gnu packages documentation) @@ -769,3 +772,59 @@ well with the MATE desktop. It lacks some features that may be expected by some users; these users may want to investigate other available window managers for use with MATE or as a standalone window manager.") (license license:gpl2+))) + +(define-public mate + (package + (name "mate") + (version (package-version mate-desktop)) + (source #f) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build union)) + #:builder + (begin + (use-modules (ice-9 match) + (guix build union)) + (match %build-inputs + (((names . directories) ...) + (union-build (assoc-ref %outputs "out") + directories)))))) + (inputs + ;; TODO: Add more packages + `(("at-spi2-core" ,at-spi2-core) + ("caja" ,caja) + ("dbus" ,dbus) + ("dconf" ,dconf) + ("desktop-file-utils" ,desktop-file-utils) + ("font-cantarell" ,font-cantarell) + ("glib-networking" ,glib-networking) + ("gnome-keyring" ,gnome-keyring) + ("gvfs" ,gvfs) + ("libmatekbd" ,libmatekbd) + ("libmateweather" ,libmateweather) + ("libmatemixer" ,libmatemixer) + ("marco" ,marco) + ("mate-session-manager" ,mate-session-manager) + ("mate-settings-daemon" ,mate-settings-daemon) + ("mate-desktop" ,mate-desktop) + ("mate-terminal" ,mate-terminal) + ("mate-themes" ,mate-themes) + ("mate-icon-theme" ,mate-icon-theme) + ("mate-menu" ,mate-menus) + ("mate-panel" ,mate-panel) + ("mate-control-center" ,mate-control-center) + ("mate-media" ,mate-media) + ("mate-applets" ,mate-applets) + ("pinentry-gnome3" ,pinentry-gnome3) + ("pulseaudio" ,pulseaudio) + ("shared-mime-info" ,shared-mime-info) + ("yelp" ,yelp) + ("zenity" ,zenity))) + (synopsis "The MATE desktop environment") + (home-page "https://mate-desktop.org/") + (description + "The MATE Desktop Environment is the continuation of GNOME 2. It provides +an intuitive and attractive desktop environment using traditional metaphors for +GNU/Linux systems. MATE is under active development to add support for new +technologies while preserving a traditional desktop experience.") + (license license:gpl2+))) -- 2.14.1 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [bug#28116] mate partial review 2017-08-31 12:54 ` ng0 @ 2017-08-31 13:21 ` ng0 2017-09-03 15:09 ` Efraim Flashner 0 siblings, 1 reply; 10+ messages in thread From: ng0 @ 2017-08-31 13:21 UTC (permalink / raw) To: Efraim Flashner, 28116 [-- Attachment #1: Type: text/plain, Size: 721 bytes --] 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 -- ng0 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://n0is.noblogs.org/my-keys https://www.infotropique.org https://krosos.org [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* [bug#28116] mate partial review 2017-08-31 13:21 ` ng0 @ 2017-09-03 15:09 ` Efraim Flashner 2017-09-03 19:44 ` ng0 0 siblings, 1 reply; 10+ messages in thread From: Efraim Flashner @ 2017-09-03 15:09 UTC (permalink / raw) To: 28116 [-- Attachment #1.1: Type: text/plain, Size: 990 bytes --] 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 <efraim@flashner.co.il> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted [-- Attachment #1.2: 0001-mate-themes.patch --] [-- Type: text/plain, Size: 962 bytes --] From 689e10dfafb000de3e8e1fe8498af2f4b059d9df Mon Sep 17 00:00:00 2001 From: Efraim Flashner <efraim@flashner.co.il> 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 [-- Attachment #1.3: 0002-libmateweather.patch --] [-- Type: text/plain, Size: 1656 bytes --] From 902308e57a8714da1b22034b393ea46e43aa6895 Mon Sep 17 00:00:00 2001 From: Efraim Flashner <efraim@flashner.co.il> 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 [-- Attachment #1.4: 0003-mate-terminal.patch --] [-- Type: text/plain, Size: 1644 bytes --] From 034e0dc0e21de0b0e0aa77c924f5c4e50801b66a Mon Sep 17 00:00:00 2001 From: Efraim Flashner <efraim@flashner.co.il> 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 [-- Attachment #1.5: 0004-mate-session-manager.patch --] [-- Type: text/plain, Size: 879 bytes --] From de0756fe7ca641170768a1f463dff516f0abeac6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner <efraim@flashner.co.il> 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 [-- Attachment #1.6: 0005-mate-settings-daemon.patch --] [-- Type: text/plain, Size: 2031 bytes --] From 7e9e8d09e1ff0b706400e8d454834839bbfdef43 Mon Sep 17 00:00:00 2001 From: Efraim Flashner <efraim@flashner.co.il> 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 [-- Attachment #1.7: 0006-libmatemixer.patch --] [-- Type: text/plain, Size: 880 bytes --] From 3475e859ba070aee282a6566ef76ddcd02814908 Mon Sep 17 00:00:00 2001 From: Efraim Flashner <efraim@flashner.co.il> 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 [-- Attachment #1.8: 0007-libmakekbd.patch --] [-- Type: text/plain, Size: 1100 bytes --] From 55a90bc02fda5525843de94c0afbfa91ae1c4301 Mon Sep 17 00:00:00 2001 From: Efraim Flashner <efraim@flashner.co.il> 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 [-- Attachment #1.9: 0008-mate-menus.patch --] [-- Type: text/plain, Size: 1937 bytes --] From 34d15eaf9d31541e49b5d944604e13c00239e107 Mon Sep 17 00:00:00 2001 From: Efraim Flashner <efraim@flashner.co.il> 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 [-- Attachment #1.10: 0009-mate-applets.patch --] [-- Type: text/plain, Size: 1654 bytes --] From 1141e89292c927b411e2e48156c93146add9c6a2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner <efraim@flashner.co.il> 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 [-- Attachment #1.11: 0010-mate-media.patch --] [-- Type: text/plain, Size: 1461 bytes --] From 61951c595e850bd8fcb621988901c8baeb5e8a93 Mon Sep 17 00:00:00 2001 From: Efraim Flashner <efraim@flashner.co.il> 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 [-- Attachment #1.12: 0011-mate-panel.patch --] [-- Type: text/plain, Size: 2522 bytes --] From 3f71b119dfefe06357808a34e44fde6ebb7f0f31 Mon Sep 17 00:00:00 2001 From: Efraim Flashner <efraim@flashner.co.il> 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 [-- Attachment #1.13: 0012-caja.patch --] [-- Type: text/plain, Size: 1985 bytes --] From 3af260a250a2d4e475d75f9a4845517ec1519c6c Mon Sep 17 00:00:00 2001 From: Efraim Flashner <efraim@flashner.co.il> 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 [-- Attachment #1.14: 0013-mate-control-center.patch --] [-- Type: text/plain, Size: 3035 bytes --] From 0881a22187ebd5e8bcea6e9dc4c219cf6a332c9b Mon Sep 17 00:00:00 2001 From: Efraim Flashner <efraim@flashner.co.il> 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 [-- Attachment #1.15: 0014-marco.patch --] [-- Type: text/plain, Size: 2113 bytes --] From dda8c61c39ec9b0ee21ed80b0412742f69eaea8e Mon Sep 17 00:00:00 2001 From: Efraim Flashner <efraim@flashner.co.il> 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [bug#28116] mate partial review 2017-09-03 15:09 ` Efraim Flashner @ 2017-09-03 19:44 ` ng0 2017-09-03 19:50 ` ng0 0 siblings, 1 reply; 10+ messages in thread From: ng0 @ 2017-09-03 19:44 UTC (permalink / raw) To: Efraim Flashner; +Cc: 28116 [-- Attachment #1.1: Type: text/plain, Size: 1932 bytes --] Efraim Flashner transcribed 27K bytes: > 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. I applied all of your corrections with the exception of: `(#:phases -> '(#:phases I see no point or any reason at all to use this for the package definition it was applied to, used 2 times. The majority of packages uses the first one. Then there was a cosmetical change with something like (add-before 'foo 'bar becoming (add-before 'foo 'bar I haven't applied this because it was outside of the packages I worked on and didn't fit into any logical set of patches I had. This can be commited after this series. Thanks for going through all of this. Now what we achieved with this change is: - mate-panel has actual readable/recognizable symbols instead of the garbage I assumed that was caused by individual applications but turns out it wasn't. - Mate Control Center looks better. - Everything is still working. So, your fixes to my patches LGTM. Rebased and edited series attached. -- ng0 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://n0is.noblogs.org/my-keys https://www.infotropique.org https://krosos.org [-- Attachment #1.2: 0001-gnu-Add-caja.patch --] [-- Type: text/plain, Size: 3531 bytes --] From cd4342dd313ad11db6a55cad20a4541bbbf43142 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Sun, 6 Aug 2017 17:22:41 +0000 Subject: [PATCH 01/12] gnu: Add caja. * gnu/packages/mate.scm (caja): New variable. --- gnu/packages/mate.scm | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index c64e26124..596210865 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -24,8 +24,10 @@ #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system glib-or-gtk) #:use-module (gnu packages) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) @@ -33,6 +35,7 @@ #:use-module (gnu packages xdisorg) #:use-module (gnu packages base) #:use-module (gnu packages xml) + #:use-module (gnu packages photo) #:use-module (gnu packages python)) (define-public mate-icon-theme @@ -205,3 +208,58 @@ the MATE desktop environment.") specification, the MATE menu layout configuration files, .directory files and assorted menu related utility programs.") (license (list license:gpl2+ license:lgpl2.0+)))) + +(define-public caja + (package + (name "caja") + (version "1.18.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0mljqcx7k8p27854zm7qzzn8ca6hs7hva9p43hp4p507z52caqmm")))) + (build-system glib-or-gtk-build-system) + (arguments + `(#:configure-flags '("--disable-update-mimedb") + #:tests? #f ; tests fail even with display set + #:phases + (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a running X server. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + ;; For the missing /etc/machine-id. + (setenv "DBUS_FATAL_WARNINGS" "0") + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("glib:bin" ,glib "bin") + ("xorg-server" ,xorg-server) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("exempi" ,exempi) + ("gtk+" ,gtk+) + ("gvfs" ,gvfs) + ("libexif" ,libexif) + ("libnotify" ,libnotify) + ("libsm" ,libsm) + ("libxml2" ,libxml2) + ("mate-desktop" ,mate-desktop) + ("startup-notification" ,startup-notification))) + (home-page "https://mate-desktop.org/") + (synopsis "File manager for the MATE desktop") + (description + "Caja is the official file manager for the MATE desktop. +It allows for browsing directories, as well as previewing files and launching +applications associated with them. Caja is also responsible for handling the +icons on the MATE desktop. It works on local and remote filesystems.") + ;; There is a note about a TRADEMARKS_NOTICE file in COPYING which + ;; does not exist. It is safe to assume that this is of no concern + ;; for us. + (license license:gpl2+))) -- 2.14.1 [-- Attachment #1.3: 0002-gnu-Add-mate-terminal.patch --] [-- Type: text/plain, Size: 2206 bytes --] From 3d60b0821712c00906e0a4f0856ca2ef8126f744 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Sun, 6 Aug 2017 18:29:40 +0000 Subject: [PATCH 02/12] gnu: Add mate-terminal. * gnu/packages/mate.scm (mate-terminal): New variable. --- gnu/packages/mate.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 596210865..18b7371d3 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -168,6 +168,47 @@ desktop and the mate-about program.") the MATE desktop environment.") (license license:lgpl2.1+))) +(define-public mate-terminal + (package + (name "mate-terminal") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1zihm609d2d9cw53ry385whshjl1dnkifpk41g1ddm9f58hv4da1")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("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) + ("vte" ,vte))) + (home-page "https://mate-desktop.org/") + (synopsis "MATE Terminal Emulator") + (description + "MATE Terminal is a terminal emulation application that you can +use to access a shell. With it, you can run any application that +is designed to run on VT102, VT220, and xterm terminals. +MATE Terminal also has the ability to use multiple terminals +in a single window (tabs) and supports management of different +configurations (profiles).") + (license license:gpl3))) + (define-public mate-menus (package (name "mate-menus") -- 2.14.1 [-- Attachment #1.4: 0003-gnu-Add-marco.patch --] [-- Type: text/plain, Size: 2927 bytes --] From 80ee3722bbdae9d21ba6d10e168fe91b3af8c167 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Sun, 6 Aug 2017 18:03:17 +0000 Subject: [PATCH 03/12] gnu: Add marco. * gnu/packages/mate.scm (marco): New variable. --- gnu/packages/mate.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 18b7371d3..600f977ba 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -28,6 +28,7 @@ #:use-module (gnu packages) #:use-module (gnu packages pkg-config) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages libcanberra) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) @@ -304,3 +305,54 @@ icons on the MATE desktop. It works on local and remote filesystems.") ;; does not exist. It is safe to assume that this is of no concern ;; for us. (license license:gpl2+))) + +(define-public marco + (package + (name "marco") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0lwbp9wyd66hl5d7g272l8g3k1pb9s4s2p9fb04750a58w87d8k5")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("itstool" ,itstool) + ("glib" ,glib) + ("gobject-introspection" ,gobject-introspection) + ("libxft" ,libxft) + ("libxml2" ,libxml2) + ("zenity" ,zenity))) + (inputs + `(("gtk+" ,gtk+) + ("libcanberra" ,libcanberra) + ("libgtop" ,libgtop) + ("libice" ,libice) + ("libsm" ,libsm) + ("libx11" ,libx11) + ("libxcomposite" ,libxcomposite) + ("libxcursor" ,libxcursor) + ("libxdamage" ,libxdamage) + ("libxext" ,libxext) + ("libxfixes" ,libxfixes) + ("libxinerama" ,libxinerama) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("mate-desktop" ,mate-desktop) + ("pango" ,pango) + ("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 +window frames. It is aimed at non-technical users and is designed to integrate +well with the MATE desktop. It lacks some features that may be expected by +some users; these users may want to investigate other available window managers +for use with MATE or as a standalone window manager.") + (license license:gpl2+))) -- 2.14.1 [-- Attachment #1.5: 0004-gnu-Add-mate-session-manager.patch --] [-- Type: text/plain, Size: 1861 bytes --] From 69640f79a28c00d8cf6202ede5022d08f96a1028 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Mon, 14 Aug 2017 17:18:06 +0000 Subject: [PATCH 04/12] gnu: Add mate-session-manager. * gnu/packages/mate.scm (mate-session-manager): New variable. --- gnu/packages/mate.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 600f977ba..94f62801f 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -210,6 +210,37 @@ in a single window (tabs) and supports management of different configurations (profiles).") (license license:gpl3))) +(define-public mate-session-manager + (package + (name "mate-session-manager") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0i0xq6041x2qmb26x9bawx0qpfkgjn6x9w3phnm9s7rc4s0z20ll")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("xtrans" ,xtrans) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("gtk+" ,gtk+) + ("dbus-glib" ,dbus-glib) + ("libsm" ,libsm) + ("mate-desktop" ,mate-desktop))) + (home-page "https://mate-desktop.org/") + (synopsis "Session manager for MATE") + (description + "Mate-session contains the MATE session manager, as well as a +configuration program to choose applications starting on login.") + (license license:gpl2))) + (define-public mate-menus (package (name "mate-menus") -- 2.14.1 [-- Attachment #1.6: 0005-gnu-Add-mate-panel.patch --] [-- Type: text/plain, Size: 3850 bytes --] From a04318eae5fbf37995d3bcb441c448ec75d5e505 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Mon, 14 Aug 2017 18:58:34 +0000 Subject: [PATCH 05/12] gnu: Add mate-panel. * gnu/packages/mate.scm (mate-panel): New variable. --- gnu/packages/mate.scm | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 94f62801f..17e6c0c02 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -282,6 +282,80 @@ specification, the MATE menu layout configuration files, .directory files and assorted menu related utility programs.") (license (list license:gpl2+ license:lgpl2.0+)))) +(define-public mate-panel + (package + (name "mate-panel") + (version "1.18.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1n565ff1n7jrfx223i3cl3m69wjda506nvbn8gra7m1jwdfzpbw1")))) + (build-system glib-or-gtk-build-system) + (arguments + `(#:configure-flags + (list (string-append "--with-zoneinfo-dir=" + (assoc-ref %build-inputs "tzdata") + "/share/zoneinfo") + "--with-in-process-applets=all") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-timezone-path + (lambda* (#:key inputs #:allow-other-keys) + (let* ((tzdata (assoc-ref inputs "tzdata"))) + (substitute* "applets/clock/system-timezone.h" + (("/usr/share/lib/zoneinfo/tab") + (string-append tzdata "/share/zoneinfo/zone.tab")) + (("/usr/share/zoneinfo") + (string-append tzdata "/share/zoneinfo")))) + #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) + ("itstool" ,itstool) + ("xtrans" ,xtrans) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("dconf" ,dconf) + ("cairo" ,cairo) + ("dbus-glib" ,dbus-glib) + ("gtk+" ,gtk+) + ("libcanberra" ,libcanberra) + ("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) + ("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 +several applets. The applets supplied here include the Workspace Switcher, +the Window List, the Window Selector, the Notification Area, the Clock and the +infamous 'Wanda the Fish'.") + (license (list license:gpl2+ license:lgpl2.0+)))) + (define-public caja (package (name "caja") -- 2.14.1 [-- Attachment #1.7: 0006-gnu-Add-libmatemixer.patch --] [-- Type: text/plain, Size: 2381 bytes --] From 328355ffacffec6d6919ad9df08ba4ee7101b87a Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Tue, 15 Aug 2017 20:23:59 +0000 Subject: [PATCH 06/12] gnu: Add libmatemixer. * gnu/packages/mate.scm (libmatemixer): New variable. --- gnu/packages/mate.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 17e6c0c02..00d371bed 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -29,6 +29,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages freedesktop) #:use-module (gnu packages libcanberra) + #:use-module (gnu packages linux) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) @@ -37,6 +38,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages xml) #:use-module (gnu packages photo) + #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python)) (define-public mate-icon-theme @@ -241,6 +243,36 @@ configurations (profiles).") configuration program to choose applications starting on login.") (license license:gpl2))) +(define-public libmatemixer + (package + (name "libmatemixer") + (version "1.18.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "09vyxnlnalws318gsafdfi5c6jwpp92pbafn1ddlqqds23ihk4mr")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("glib" ,glib) + ("pulseaudio" ,pulseaudio) + ("alsa-lib" ,alsa-lib))) + (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 +API allowing access to mixer functionality available in the PulseAudio and ALSA +sound systems.") + (license license:lgpl2.1))) + (define-public mate-menus (package (name "mate-menus") -- 2.14.1 [-- Attachment #1.8: 0007-gnu-Add-libmatekbd.patch --] [-- Type: text/plain, Size: 1828 bytes --] From cb1a5efdf0b8c3e29ea580e38a7c47fcc53778d8 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Tue, 15 Aug 2017 20:53:08 +0000 Subject: [PATCH 07/12] gnu: Add libmatekbd. * gnu/packages/mate.scm (libmatekbd): New variable. --- gnu/packages/mate.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 00d371bed..070731bc5 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -273,6 +273,38 @@ API allowing access to mixer functionality available in the PulseAudio and ALSA sound systems.") (license license:lgpl2.1))) +(define-public libmatekbd + (package + (name "libmatekbd") + (version "1.18.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "030bl18qbjm7l92bp1bhs7v82bp8j3mv7c1j1a4gd89iz4611pq3")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("cairo" ,cairo) + ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("glib" ,glib) + ("gtk+" ,gtk+) + ("libx11" ,libx11) + ("libxklavier" ,libxklavier))) + (home-page "https://mate-desktop.org/") + (synopsis "MATE keyboard configuration library") + (description + "Libmatekbd is a keyboard configuration library for the +MATE desktop environment.") + (license license:lgpl2.1))) + (define-public mate-menus (package (name "mate-menus") -- 2.14.1 [-- Attachment #1.9: 0008-gnu-Add-mate-settings-daemon.patch --] [-- Type: text/plain, Size: 2999 bytes --] From f7ef55aae104503e202ed8c8208922997a112180 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Tue, 15 Aug 2017 21:23:23 +0000 Subject: [PATCH 08/12] gnu: Add mate-settings-daemon. * gnu/packages/mate.scm (mate-settings-daemon): New variable. --- gnu/packages/mate.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 070731bc5..bc745393c 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -28,16 +28,19 @@ #:use-module (gnu packages) #:use-module (gnu packages pkg-config) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages fontutils) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) + #:use-module (gnu packages gnuzilla) #:use-module (gnu packages xorg) #:use-module (gnu packages xdisorg) #:use-module (gnu packages base) #:use-module (gnu packages xml) #:use-module (gnu packages photo) + #:use-module (gnu packages polkit) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python)) @@ -243,6 +246,49 @@ configurations (profiles).") configuration program to choose applications starting on login.") (license license:gpl2))) +(define-public mate-settings-daemon + (package + (name "mate-settings-daemon") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "07b2jkxqv07njdrgkdck93d872p6lch1lrvi7ydnpicspg3rfid6")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("cairo" ,cairo) + ("dbus" ,dbus) + ("dbus-glib" ,dbus-glib) + ("dconf" ,dconf) + ("fontconfig" ,fontconfig) + ("gtk+" ,gtk+) + ("libcanberra" ,libcanberra) + ("libmatekbd" ,libmatekbd) + ("libmatemixer" ,libmatemixer) + ("libnotify" ,libnotify) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxi" ,libxi) + ("libxklavier" ,libxklavier) + ("mate-desktop" ,mate-desktop) + ("nss" ,nss) + ("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.") + (license (list license:lgpl2.1 license:gpl2)))) + (define-public libmatemixer (package (name "libmatemixer") -- 2.14.1 [-- Attachment #1.10: 0009-gnu-Add-mate-applets.patch --] [-- Type: text/plain, Size: 4368 bytes --] From d3b82919351d4dc15abbad08dd7c7ebaecb2ae26 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Wed, 23 Aug 2017 16:54:21 +0000 Subject: [PATCH 09/12] gnu: Add mate-applets. * gnu/packages/mate.scm (mate-applets): New variable. --- gnu/packages/mate.scm | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index bc745393c..1af6b50e9 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -33,9 +33,12 @@ #:use-module (gnu packages linux) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) + #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) + #:use-module (gnu packages docbook) #:use-module (gnu packages gnuzilla) #:use-module (gnu packages xorg) + #:use-module (gnu packages documentation) #:use-module (gnu packages xdisorg) #:use-module (gnu packages base) #:use-module (gnu packages xml) @@ -392,6 +395,80 @@ specification, the MATE menu layout configuration files, .directory files and assorted menu related utility programs.") (license (list license:gpl2+ license:lgpl2.0+)))) +(define-public mate-applets + (package + (name "mate-applets") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1nplr8i1mxbxd7pqhcy8j69v25nsp5dk9fq7ffrmjmp39lrf3fh5")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("libxslt" ,libxslt) + ("yelp-tools" ,yelp-tools) + ("scrollkeeper" ,scrollkeeper) + ("gettext" ,gettext-minimal) + ("docbook-xml" ,docbook-xml) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("atk" ,atk) + ("dbus" ,dbus) + ("dbus-glib" ,dbus-glib) + ("glib" ,glib) + ("gucharmap" ,gucharmap) + ("gtk+" ,gtk+) + ("gtksourceview" ,gtksourceview) + ("libgtop" ,libgtop) + ("libmateweather" ,libmateweather) + ("libnotify" ,libnotify) + ("libx11" ,libx11) + ("libxml2" ,libxml2) + ("libwnck" ,libwnck) + ("mate-panel" ,mate-panel) + ("pango" ,pango) + ("polkit" ,polkit) ; either polkit or setuid + ("python" ,python-2) + ("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: + +@enumerate +@item accessx-status: indicates keyboard accessibility settings, +including the current state of the keyboard, if those features are in use. +@item Battstat: monitors the power subsystem on a laptop. +@item Character palette: provides a convenient way to access +non-standard characters, such as accented characters, +mathematical symbols, special symbols, and punctuation marks. +@item MATE CPUFreq Applet: CPU frequency scaling monitor +@item Drivemount: lets you mount and unmount drives and file systems. +@item Geyes: pair of eyes which follow the mouse pointer around the screen. +@item Keyboard layout switcher: lets you assign different keyboard +layouts for different locales. +@item Modem Monitor: monitors the modem. +@item Invest: downloads current stock quotes from the Internet and +displays the quotes in a scrolling display in the applet. The +applet downloads the stock information from Yahoo! Finance. +@item System monitor: CPU, memory, network, swap file and resource. +@item Trash: lets you drag items to the trash folder. +@item Weather report: downloads weather information from the +U.S National Weather Service (NWS) servers, including the +Interactive Weather Information Network (IWIN). +@end enumerate\n") + (license (list license:gpl2+ license:lgpl2.0+ license:gpl3+)))) + (define-public mate-panel (package (name "mate-panel") -- 2.14.1 [-- Attachment #1.11: 0010-gnu-Add-mate-media.patch --] [-- Type: text/plain, Size: 2151 bytes --] From b5c5432bac3691e7c913191755c2fefddaa5bee4 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Wed, 23 Aug 2017 17:18:02 +0000 Subject: [PATCH 10/12] gnu: Add mate-media. * gnu/packages/mate.scm (mate-media): New variable. --- gnu/packages/mate.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 1af6b50e9..b8b40569b 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -469,6 +469,43 @@ Interactive Weather Information Network (IWIN). @end enumerate\n") (license (list license:gpl2+ license:lgpl2.0+ license:gpl3+)))) +(define-public mate-media + (package + (name "mate-media") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1l0j71d07898wb6ily09sj1xczwrmcw13wyhxwns7sxw592nwi04")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("cairo" ,cairo) + ("gtk+" ,gtk+) + ("libcanberra" ,libcanberra) + ("libmatemixer" ,libmatemixer) + ("libxml2" ,libxml2) + ("mate-applets" ,mate-applets) + ("mate-desktop" ,mate-desktop) + ("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 +mate-volume-control, a MATE volume control application and applet.") + (license (list license:gpl2+ license:lgpl2.0+ license:fdl1.1+)))) + (define-public mate-panel (package (name "mate-panel") -- 2.14.1 [-- Attachment #1.12: 0011-gnu-Add-mate-control-center.patch --] [-- Type: text/plain, Size: 3032 bytes --] From 5520866644545ac3f129f7dc8ad4dcdef805d69e Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Wed, 23 Aug 2017 18:36:16 +0000 Subject: [PATCH 11/12] gnu: Add mate-control-center. * gnu/packages/mate.scm (mate-control-center): New variable. --- gnu/packages/mate.scm | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index b8b40569b..ca1872a2f 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -635,6 +635,71 @@ icons on the MATE desktop. It works on local and remote filesystems.") ;; for us. (license license:gpl2+))) +(define-public mate-control-center + (package + (name "mate-control-center") + (version "1.18.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://pub.mate-desktop.org/releases/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0flnn0h8f5aqyccwrlv7qxchvr3kqmlfdga6wq28d55zkpv5m7dl")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("yelp-tools" ,yelp-tools) + ("desktop-file-utils" ,desktop-file-utils) + ("kbproto" ,kbproto) + ("randrproto" ,randrproto) + ("renderproto" ,renderproto) + ("scrnsaverproto" ,scrnsaverproto) + ("xextpro" ,xextproto) + ("xproto" ,xproto) + ("xmodmap" ,xmodmap) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("atk" ,atk) + ("cairo" ,cairo) + ("caja" ,caja) + ("dconf" ,dconf) + ("dbus" ,dbus) + ("dbus-glib" ,dbus-glib) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("glib" ,glib) + ("gtk+" ,gtk+) + ("libcanberra" ,libcanberra) + ("libmatekbd" ,libmatekbd) + ("libx11" ,libx11) + ("libxcursor" ,libxcursor) + ("libxext" ,libxext) + ("libxi" ,libxi) + ("libxklavier" ,libxklavier) + ("libxml2" ,libxml2) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("libxscrnsaver" ,libxscrnsaver) + ("marco" ,marco) + ("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+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 +of various aspects of your desktop.") + (license license:gpl2+))) + (define-public marco (package (name "marco") -- 2.14.1 [-- Attachment #1.13: 0012-gnu-Add-mate.patch --] [-- Type: text/plain, Size: 4135 bytes --] From 4174fc0b1b2a503f4ec54835cffc7d534ccf7bac Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> Date: Wed, 16 Aug 2017 11:38:35 +0000 Subject: [PATCH 12/12] gnu: Add mate. * gnu/packages/mate.scm (mate): New variable. --- gnu/packages/mate.scm | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index ca1872a2f..91489ba91 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -25,10 +25,12 @@ #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages pkg-config) #:use-module (gnu packages freedesktop) #:use-module (gnu packages fontutils) + #:use-module (gnu packages fonts) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) #:use-module (gnu packages glib) @@ -36,6 +38,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) #:use-module (gnu packages docbook) + #:use-module (gnu packages gnupg) #:use-module (gnu packages gnuzilla) #:use-module (gnu packages xorg) #:use-module (gnu packages documentation) @@ -750,3 +753,59 @@ well with the MATE desktop. It lacks some features that may be expected by some users; these users may want to investigate other available window managers for use with MATE or as a standalone window manager.") (license license:gpl2+))) + +(define-public mate + (package + (name "mate") + (version (package-version mate-desktop)) + (source #f) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build union)) + #:builder + (begin + (use-modules (ice-9 match) + (guix build union)) + (match %build-inputs + (((names . directories) ...) + (union-build (assoc-ref %outputs "out") + directories)))))) + (inputs + ;; TODO: Add more packages + `(("at-spi2-core" ,at-spi2-core) + ("caja" ,caja) + ("dbus" ,dbus) + ("dconf" ,dconf) + ("desktop-file-utils" ,desktop-file-utils) + ("font-cantarell" ,font-cantarell) + ("glib-networking" ,glib-networking) + ("gnome-keyring" ,gnome-keyring) + ("gvfs" ,gvfs) + ("libmatekbd" ,libmatekbd) + ("libmateweather" ,libmateweather) + ("libmatemixer" ,libmatemixer) + ("marco" ,marco) + ("mate-session-manager" ,mate-session-manager) + ("mate-settings-daemon" ,mate-settings-daemon) + ("mate-desktop" ,mate-desktop) + ("mate-terminal" ,mate-terminal) + ("mate-themes" ,mate-themes) + ("mate-icon-theme" ,mate-icon-theme) + ("mate-menu" ,mate-menus) + ("mate-panel" ,mate-panel) + ("mate-control-center" ,mate-control-center) + ("mate-media" ,mate-media) + ("mate-applets" ,mate-applets) + ("pinentry-gnome3" ,pinentry-gnome3) + ("pulseaudio" ,pulseaudio) + ("shared-mime-info" ,shared-mime-info) + ("yelp" ,yelp) + ("zenity" ,zenity))) + (synopsis "The MATE desktop environment") + (home-page "https://mate-desktop.org/") + (description + "The MATE Desktop Environment is the continuation of GNOME 2. It provides +an intuitive and attractive desktop environment using traditional metaphors for +GNU/Linux systems. MATE is under active development to add support for new +technologies while preserving a traditional desktop experience.") + (license license:gpl2+))) -- 2.14.1 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [bug#28116] mate partial review 2017-09-03 19:44 ` ng0 @ 2017-09-03 19:50 ` ng0 0 siblings, 0 replies; 10+ messages in thread From: ng0 @ 2017-09-03 19:50 UTC (permalink / raw) To: Efraim Flashner; +Cc: 28116 [-- Attachment #1: Type: text/plain, Size: 2474 bytes --] ng0 transcribed 38K bytes: > Efraim Flashner transcribed 27K bytes: > > 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. > > I applied all of your corrections with the exception of: > > `(#:phases -> '(#:phases > > I see no point or any reason at all to use this for the package definition > it was applied to, used 2 times. The majority of packages uses the first one. > > Then there was a cosmetical change with something like > (add-before > 'foo 'bar > > becoming > > (add-before 'foo 'bar > > I haven't applied this because it was outside of the packages I > worked on and didn't fit into any logical set of patches I had. > > This can be commited after this series. > > Thanks for going through all of this. Now what we achieved with this > change is: > - mate-panel has actual readable/recognizable symbols instead > of the garbage I assumed that was caused by individual applications > but turns out it wasn't. > - Mate Control Center looks better. > - Everything is still working. > > > So, your fixes to my patches LGTM. > Rebased and edited series attached. Actually one issue, but not related to MATE: Please check if on a system with only Mate and not additionally XFCE or GNOME you have harddrives accessible. I removed both (XFCE and GNOME) from the system and as a normal user my unmounted disks disappeared from the system view. Not bad, but this has happened with other WMs/DMs before so I just assume something is missing. Still good to go though. -- ng0 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://n0is.noblogs.org/my-keys https://www.infotropique.org https://krosos.org [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2017-09-03 19:51 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-08-16 20:56 [bug#28116] MATE (and mate-terminal + caja) ng0 2017-08-23 21:04 ` ng0 2017-08-24 20:42 ` [bug#28116] mate partial review Efraim Flashner 2017-08-25 18:11 ` ng0 2017-08-28 11:32 ` Efraim Flashner 2017-08-31 12:54 ` ng0 2017-08-31 13:21 ` ng0 2017-09-03 15:09 ` Efraim Flashner 2017-09-03 19:44 ` ng0 2017-09-03 19:50 ` ng0
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/guix.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).