From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roel Janssen Subject: [PATCH] gnu: Add dia. Date: Thu, 19 May 2016 10:31:43 +0200 Message-ID: <87posih2j4.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53181) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3JN0-0003mp-R6 for guix-devel@gnu.org; Thu, 19 May 2016 04:31:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3JMv-0002ti-Qb for guix-devel@gnu.org; Thu, 19 May 2016 04:31:49 -0400 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:58309) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3JMv-0002te-Nw for guix-devel@gnu.org; Thu, 19 May 2016 04:31:45 -0400 Received: from [143.121.239.252] (port=32092 helo=roel-tp) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1b3JMu-0004B7-1R for guix-devel@gnu.org; Thu, 19 May 2016 04:31:44 -0400 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel Dear Guix, Here's a patch for Dia. I used a git commit because it doesn't seem like there's going to be a new version soon, and this specific version includes some bugfixes for building the program (which makes the package recipe a lot simpler). >From 0b4f0f04c207a96d3b1a263222b8371e7b6d269a Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Thu, 19 May 2016 10:26:45 +0200 Subject: [PATCH] gnu: Add dia. * gnu/packages/gnome.scm (dia): New variable. --- gnu/packages/gnome.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8963e3f..54e8006 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2016 Rene Saavedra ;;; Copyright © 2016 Kei Yamashita ;;; 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 "Program to draw structured diagrams") + (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") -- 2.7.4 Kind regards, Roel Janssen