From 833b7e0af05b88254928a8ea15d05d5d22dc2df9 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 16 Aug 2017 10:27:04 +0000 Subject: gnu: mate: Use https. * gnu/packages/mate.scm (mate-icon-theme)[source, home-page]: Use https. (mate-themes)[source, home-page]: Likewise. (mate-desktop)[source, home-page]: Likewise. (libmateweather)[source, home-page]: Likewise. (mate-menus)[source, home-page]: Likewise. Signed-off-by: Efraim Flashner --- gnu/packages/mate.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu/packages/mate.scm') diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 316385a6f8..66c40c6926 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 ;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2017 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,7 +41,7 @@ (define-public mate-icon-theme (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 @@ (define-public mate-icon-theme ("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 @@ (define-public mate-themes (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 @@ (define-public mate-themes ("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 @@ (define-public mate-desktop (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 @@ (define-public mate-desktop ("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 @@ (define-public libmateweather (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 @@ (define-public libmateweather ;; 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 @@ (define-public mate-menus (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 @@ (define-public mate-menus (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 -- cgit v1.2.3 From 4915c51986721acb8991f8ef9df51e73d81c5cc3 Mon Sep 17 00:00:00 2001 From: ng0 Date: Fri, 25 Aug 2017 17:53:03 +0000 Subject: gnu: mate-icon-theme: Remove 'gtk+' from native-inputs. * gnu/packages/mate.scm (mate-icon-theme)[native-inputs]: Remove 'gtk+'. Signed-off-by: Efraim Flashner --- gnu/packages/mate.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/mate.scm') diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 66c40c6926..0bbb4044ca 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -51,7 +51,6 @@ (define-public mate-icon-theme (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") -- cgit v1.2.3 From 68d2eea0b8d7234b576e4da9894f6a1a7a81a6f5 Mon Sep 17 00:00:00 2001 From: ng0 Date: Fri, 25 Aug 2017 17:54:47 +0000 Subject: gnu: mate-themes: Update inputs. * gnu/packages/mate.scm (mate-themes)[inputs]: Remove gtk+, gtk-engines, murrine. Move gdk-pixbuf ... [native-inputs]: ... to here. Add gtk+@2. Signed-off-by: Efraim Flashner --- gnu/packages/mate.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu/packages/mate.scm') diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 0bbb4044ca..5dcd3d87c1 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Fabian Harfert -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2017 ng0 ;;; ;;; This file is part of GNU Guix. @@ -73,12 +73,9 @@ (define-public mate-themes (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("intltool" ,intltool))) - (inputs - `(("gtk+" ,gtk+) - ("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") -- cgit v1.2.3 From 60692df286d9a4d340086adeda41795df94d6015 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 23 Aug 2017 13:53:30 +0000 Subject: gnu: mate-themes: Update to 3.22.13. * gnu/packages/mate.scm (mate-themes): Update to 3.22.13. Signed-off-by: Efraim Flashner --- gnu/packages/mate.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/mate.scm') diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 5dcd3d87c1..0ce001b1e3 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -61,7 +61,7 @@ (define-public mate-icon-theme (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/" @@ -69,7 +69,7 @@ (define-public mate-themes version ".tar.xz")) (sha256 (base32 - "1gfa1cny3q68y139m96iz8haiik6ygad5613gx0m4wd9hi5scafm")))) + "1p7w63an8qs15hkj79nppy7471glv0rm1b0himn3c4w69q8qdc9i")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 6a548c56ef422f18a1effe89d82671f2ffae6a90 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 23 Aug 2017 13:59:30 +0000 Subject: gnu: mate-desktop: Add 'gtk-doc' back to native-inputs. * gnu/packages/mate.scm (mate-desktop)[native-inputs]: Uncomment 'gtk-doc' as input. Signed-off-by: Efraim Flashner --- gnu/packages/mate.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/mate.scm') diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 0ce001b1e3..8e3958879f 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -104,8 +104,8 @@ (define-public mate-desktop ("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) -- cgit v1.2.3 From 5804c7b616a39c05280aaabf3cec753db5fc6002 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 3 Sep 2017 15:27:04 +0300 Subject: gnu: libmateweather: Update inputs. * gnu/packages/mate.scm (libmateweather)[inputs]: Remove gdk-pixpuf. Move dconf ... [native-inputs]: ... to here. --- gnu/packages/mate.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages/mate.scm') diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 8e3958879f..c64e26124d 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -133,14 +133,13 @@ (define-public libmateweather "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") @@ -150,11 +149,10 @@ (define-public libmateweather (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 -- cgit v1.2.3