From 277a7d82b84c0b9ae86a9466479c34548209b0bf Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 3 Apr 2016 12:56:11 +0200 Subject: gnu: libnotify: Add dependency on gobject-introspection. * gnu/packages/gnome.scm (libnotify)[native-inputs]: Add gobject-introspection. Signed-off-by: Leo Famulari --- gnu/packages/gnome.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 83e4f83163..6b78d0f720 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2016 Jochem Raat ;;; Copyright © 2016 Rene Saavedra ;;; Copyright © 2016 Kei Yamashita +;;; Copyright © 2016 Jan Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -682,7 +683,8 @@ database is translated at Transifex.") ("libpng" ,libpng))) (native-inputs `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin"))) + ("glib" ,glib "bin") + ("gobject-introspection" ,gobject-introspection))) (home-page "https://developer-next.gnome.org/libnotify/") (synopsis "GNOME desktop notification library") -- cgit 1.4.1 From 9365ee1c464b1a4bda5325b9c5a16f9c09029d2a Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 3 Apr 2016 12:52:37 +0200 Subject: gnu: Add gnome-tweak-tool. * gnu/packages/patches/gnome-tweak-tool-search-paths.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gnome.scm (gnome-tweak-tool): New variable. Signed-off-by: Leo Famulari --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 43 ++++++++++++++++++ .../patches/gnome-tweak-tool-search-paths.patch | 52 ++++++++++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 gnu/packages/patches/gnome-tweak-tool-search-paths.patch (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/local.mk b/gnu/local.mk index acb979067b..553e0f39b0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -509,6 +509,7 @@ dist_patch_DATA = \ gnu/packages/patches/glibc-versioned-locpath.patch \ gnu/packages/patches/gmp-arm-asm-nothumb.patch \ gnu/packages/patches/gmp-faulty-test.patch \ + gnu/packages/patches/gnome-tweak-tool-search-paths.patch \ gnu/packages/patches/gnucash-price-quotes-perl.patch \ gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch \ gnu/packages/patches/gobject-introspection-cc.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6b78d0f720..8963e3fca6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5024,3 +5024,46 @@ specified duration and save it as a GIF encoded animated image file.") "Libzapojit is a GLib-based library for accessing online service APIs of Microsoft SkyDrive and Hotmail, using their REST protocols.") (license license:lgpl2.1+))) + +(define-public gnome-tweak-tool + (package + (name "gnome-tweak-tool") + (version "3.20.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/gnome-tweak-tool/" + (version-major+minor version) "/" + "gnome-tweak-tool-" version ".tar.xz")) + (patches (list + (search-patch "gnome-tweak-tool-search-paths.patch"))) + (sha256 + (base32 + "1fj6wjvnjygzm9br3sw9gya6d18yly1rm69yaiar9spfbkvv4wai")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--localstatedir=/tmp" + "--sysconfdir=/tmp") + #:imported-modules ((guix build python-build-system) + ,@%gnu-build-system-modules) + #:phases (modify-phases %standard-phases + (add-after 'install 'wrap + (@@ (guix build python-build-system) wrap))))) + (native-inputs + `(("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (inputs + `(("python" ,python-2) + ("python2-pygobject" ,python2-pygobject))) + (propagated-inputs + `(("libnotify" ,libnotify) + ("gobject-introspection" ,gobject-introspection) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gtk+" ,gtk+))) + (synopsis "Customize advanced GNOME 3 options") + (home-page "https://wiki.gnome.org/action/show/Apps/GnomeTweakTool") + (description + "GNOME Tweak Tool allows adjusting advanced configuration settings in +GNOME 3. This includes things like the fonts used in user interface elements, +alternative user interface themes, changes in window management behavior, +GNOME Shell appearance and extension, etc.") + (license license:gpl3+))) diff --git a/gnu/packages/patches/gnome-tweak-tool-search-paths.patch b/gnu/packages/patches/gnome-tweak-tool-search-paths.patch new file mode 100644 index 0000000000..027c61b3af --- /dev/null +++ b/gnu/packages/patches/gnome-tweak-tool-search-paths.patch @@ -0,0 +1,52 @@ +Gnome-tweak-tool does not look at GSETTINGS_SCHEMA_PATH or XDG_DATA_DIRS, it +assumes that schemas are installed in one global directory +(GSETTINGS_SCHEMA_DIR/gsettingsschemadir). + +Guix/GuixSD uses a different directory for every gir package and has +packages pick-up files using XDG_DATA_DIRS. + +Upstream ticket: https://bugzilla.gnome.org/show_bug.cgi?id=764537 +janneke@gnu.org + +--- gnome-tweak-tool-3.18.1.orig/gtweak/gsettings.py 2015-04-08 15:21:32.000000000 +0200 ++++ gnome-tweak-tool-3.18.1/gtweak/gsettings.py 2016-04-03 11:26:38.658482704 +0200 +@@ -16,7 +16,8 @@ + # along with gnome-tweak-tool. If not, see . + + import logging +-import os.path ++import os ++import sys + import xml.dom.minidom + import gettext + +@@ -31,6 +32,13 @@ + class GSettingsMissingError(Exception): + pass + ++def file_from_path(path, file_name): ++ for dir in path: ++ f = os.path.join(dir, file_name) ++ if os.path.exists(f): ++ return f ++ return None ++ + class _GSettingsSchema: + def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options): + if not schema_dir: +@@ -38,9 +46,14 @@ + if not schema_filename: + schema_filename = schema_name + ".gschema.xml" + ++ schema_prefix = os.path.join('glib-2.0', 'schemas') + schema_path = os.path.join(schema_dir, schema_filename) + if not os.path.exists(schema_path): +- logging.critical("Could not find schema %s" % schema_path) ++ schema_path = file_from_path(os.environ.get ('GSETTINGS_SCHEMA_PATH', '').split(os.path.pathsep), schema_filename) ++ if not (schema_path and os.path.exists(schema_path)): ++ schema_path = file_from_path(os.environ.get ('XDG_DATA_DIRS', '').split(os.path.pathsep), os.path.join(schema_prefix, schema_filename)) ++ if not (schema_path and os.path.exists(schema_path)): ++ logging.critical("Could not find schema %s" % schema_filename) + assert(False) + + self._schema_name = schema_name -- cgit 1.4.1 From 21f05134fc35edf5a15baf4fdb2e62905f3848e9 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 18 May 2016 09:58:47 -0400 Subject: Update name for Kei Kebreau. * .mailmap: Add Kei Kebreau. * gnu/local.mk: Replace "Kei Yamashita" with "Kei Kebreau". * gnu/packages/calendar.scm: Likewise. * gnu/packages/dillo.scm: Likewise. * gnu/packages/fltk.scm: Likewise. * gnu/packages/game-development.scm: Likewise. * gnu/packages/games.scm: Likewise. * gnu/packages/gnome.scm: Likewise. * gnu/packages/gtk.scm: Likewise. * gnu/packages/music.scm: Likewise. * gnu/packages/xfce.scm: Likewise. Signed-off-by: Alex Kost --- .mailmap | 1 + gnu/local.mk | 2 +- gnu/packages/calendar.scm | 2 +- gnu/packages/dillo.scm | 2 +- gnu/packages/fltk.scm | 2 +- gnu/packages/game-development.scm | 2 +- gnu/packages/games.scm | 2 +- gnu/packages/gnome.scm | 2 +- gnu/packages/gtk.scm | 2 +- gnu/packages/music.scm | 2 +- gnu/packages/xfce.scm | 2 +- 11 files changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/.mailmap b/.mailmap index 8f61e0efae..21841c1a0a 100644 --- a/.mailmap +++ b/.mailmap @@ -24,6 +24,7 @@ Joshua Grant Joshua Grant Joshua Grant Joshua Grant +Kei Kebreau Leo Famulari Ludovic Courtès Mathieu Lirzin diff --git a/gnu/local.mk b/gnu/local.mk index 0e461b3209..3fa27925ec 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -4,7 +4,7 @@ # Copyright © 2016 Mathieu Lirzin # Copyright © 2013, 2014, 2015, 2016 Mark H Weaver # Copyright © 2016 Chris Marusich -# Copyright © 2016 Kei Yamashita +# Copyright © 2016 Kei Kebreau # # This file is part of GNU Guix. # diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index ff57ba10b3..3b5aba72c8 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 David Thompson ;;; Copyright © 2015, 2016 Leo Famulari -;;; Copyright © 2016 Kei Yamashita +;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2016 Efraim Flashner ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/dillo.scm b/gnu/packages/dillo.scm index 0fd84d9177..6e0c4d17a9 100644 --- a/gnu/packages/dillo.scm +++ b/gnu/packages/dillo.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016 Kei Yamashita +;;; Copyright © 2016 Kei Kebreau ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/fltk.scm b/gnu/packages/fltk.scm index bc6b4ab5e6..27d2f62ca7 100644 --- a/gnu/packages/fltk.scm +++ b/gnu/packages/fltk.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014 John Darrington ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2015 Ricardo Wurmus -;;; Copyright © 2016 Kei Yamashita +;;; Copyright © 2016 Kei Kebreau ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index f6b3c0bbb7..56617bb895 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015 Alex Kost ;;; Copyright © 2015, 2016 David Thompson ;;; Copyright © 2016 Efraim Flashner -;;; Copyright © 2016 Kei Yamashita +;;; Copyright © 2016 Kei Kebreau ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 1af40e9409..fc16862471 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis ;;; Copyright © 2016 Nils Gillmann ;;; Copyright © 2016 Albin Söderqvist -;;; Copyright © 2016 Kei Yamashita +;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2016 Alex Griffin ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8963e3fca6..c42dfc26e0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2016 Rene Saavedra ;;; Copyright © 2016 Jochem Raat ;;; Copyright © 2016 Rene Saavedra -;;; Copyright © 2016 Kei Yamashita +;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 8abf16ef36..1fe52a4b83 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2015 David Hashe ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Fabian Harfert -;;; Copyright © 2016 Kei Yamashita +;;; Copyright © 2016 Kei Kebreau ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 39e261df8c..f2787ee2d1 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Leo Famulari -;;; Copyright © 2016 Kei Yamashita +;;; Copyright © 2016 Kei Kebreau ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index c164c66a18..c201f03ab5 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2016 Florian Paul Schmidt -;;; Copyright © 2016 Kei Yamashita +;;; Copyright © 2016 Kei Kebreau ;;; ;;; This file is part of GNU Guix. ;;; -- cgit 1.4.1 From a56be436d0253c96d0ff766092e3f94432033187 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Thu, 19 May 2016 10:26:45 +0200 Subject: gnu: Add dia. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (dia): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c42dfc26e0..8726d3d88b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2016 Rene Saavedra ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2016 Jan Nieuwenhuizen +;;; Copyright © 2016 Roel Janssen ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,6 +60,7 @@ #:use-module (gnu packages flex) #:use-module (gnu packages docbook) #:use-module (gnu packages enchant) + #:use-module (gnu packages fontutils) #:use-module (gnu packages game-development) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -163,6 +165,55 @@ Desktop. It is designed to be as simple as possible and has some unique features to enable users to create their discs easily and quickly.") (license license:gpl2+))) +(define-public dia + ;; This version from GNOME's repository includes fixes for compiling with + ;; recent versions of the build tools. The latest activity on the + ;; pre-GNOME version has been in 2014, while GNOME has continued applying + ;; fixes in 2016. + (let ((commit "fbc306168edab63db80b904956117cbbdc514ee4")) + (package + (name "dia") + (version (string-append "0.97.2-" (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.gnome.org/browse/dia") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1b4bba0k8ph4cwgw8xjglss0p6n111bpd5app67lrq79mp0ad06l")))) + (build-system gnu-build-system) + (inputs + `(("glib" ,glib "bin") + ("pango" ,pango) + ("gdk-pixbuf" ,gdk-pixbuf) + ("gtk+" ,gtk+-2) + ("libxml2" ,libxml2) + ("freetype" ,freetype) + ("libart-lgpl" ,libart-lgpl))) + (native-inputs + `(("intltool" ,intltool) + ("pkg-config" ,pkg-config) + ("automake" ,automake) + ("autoconf" ,autoconf) + ("libtool" ,libtool) + ("perl" ,perl) + ("python-wrapper" ,python-wrapper))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'run-autogen + (lambda _ + (system* "sh" "autogen.sh")))))) + (home-page "https://wiki.gnome.org/Apps/Dia") + (synopsis "Diagram creation for GNOME") + (description "Dia can be used to draw different types of diagrams, and +includes support for UML static structure diagrams (class diagrams), entity +relationship modeling, and network diagrams. The program supports various file +formats like PNG, SVG, PDF and EPS.") + (license license:gpl2+)))) + (define-public gnome-common (package (name "gnome-common") -- cgit 1.4.1 From 3c47489766bbf3d381b63d4eda63b2aff2f35d0f Mon Sep 17 00:00:00 2001 From: Kei Yamashita Date: Sat, 14 May 2016 21:27:08 -0400 Subject: gnu: Add gnome-calendar. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (gnome-calendar): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8726d3d88b..c5d53d1e0a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5076,6 +5076,34 @@ specified duration and save it as a GIF encoded animated image file.") Microsoft SkyDrive and Hotmail, using their REST protocols.") (license license:lgpl2.1+))) +(define-public gnome-calendar + (package + (name "gnome-calendar") + (version "3.20.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1vny8fclwglapdyxd2g9fbwdlk5hhnb993k2hvq3rf0hcgswycpi")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (inputs + `(("bdb" ,bdb) + ("desktop-file-utils" ,desktop-file-utils) + ("evolution-data-server" ,evolution-data-server) + ("gnome-online-accounts" ,gnome-online-accounts))) + (home-page "https://wiki.gnome.org/Apps/Calendar") + (synopsis "GNOME's calendar application") + (description + "GNOME Calendar is a simple calendar application designed to fit the GNOME +desktop. It supports multiple calendars, monthly view and yearly view.") + (license license:gpl3+))) + (define-public gnome-tweak-tool (package (name "gnome-tweak-tool") -- cgit 1.4.1