;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 John Darrington <jmd@gnu.org>
-;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2014, 2016 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix utils)
- #:use-module (guix build-system gnu)
+ #:use-module (guix build-system cmake)
#:use-module (gnu packages)
#:use-module (gnu packages aspell)
#:use-module (gnu packages bdw-gc)
(define-public inkscape
(package
(name "inkscape")
- (version "0.91")
+ (version "0.92.1")
(source (origin
(method url-fetch)
- (uri (string-append "https://launchpad.net/inkscape/"
- (version-major+minor version) ".x/"
- version "/+download/inkscape-"
- version ".tar.gz"))
+ (uri (string-append "https://media.inkscape.org/dl/"
+ "resources/file/"
+ "inkscape-" version ".tar.bz2"))
+ (patches
+ (list
+ ;; Fix compatibility with poppler >= 0.58.
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://gitlab.com/inkscape/inkscape/commit/"
+ "9418824967eb4c53371ef8588243fed4cab496e0.patch"))
+ (sha256
+ (base32
+ "0wwyhkqb1qyazz5f6wqrc223l6k8qnmadiw28q8gihlgvh38rvll")))))
(sha256
(base32
- "086v01jy896dj86bq7plrf6si4p6gh6ga2v5417llgmminycz8rc"))))
- (build-system gnu-build-system)
+ "01chr3vh728dkg7l7lilwgmh5nrp784khdhjgpqjbq9dh2zhax15"))))
+ (build-system cmake-build-system)
(inputs
`(("aspell" ,aspell)
("gtkmm" ,gtkmm-2)
("boost" ,boost)))
(native-inputs
`(("intltool" ,intltool)
+ ("glib" ,glib "bin")
("perl" ,perl)
("pkg-config" ,pkg-config)))
- (arguments
- `(;; Add '-std=c++11', required by recent versions of GLibmm & co.
- ;; Use '-g0' to reduce disk usage during the build.
- #:configure-flags '("CXXFLAGS=-g0 -O2 -fopenmp -std=c++11")
-
- #:phases (alist-cons-after
- 'unpack 'fix-test-includes
- (lambda _
- (substitute* "src/cxxtests.cpp"
- (("\\.\\./\\.\\./src") "../src")))
- %standard-phases)))
+ ;; FIXME: tests require gmock
+ (arguments `(#:tests? #f))
(home-page "http://inkscape.org/")
(synopsis "Vector graphics editor")
(description "Inkscape is a vector graphics editor. What sets Inkscape