diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2017-01-04 16:38:57 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2017-01-04 18:06:44 +0100 |
| commit | 68f90673242777feea9537d6e506d97ea8506c45 (patch) | |
| tree | 0bb9d99576ff2780e53dd10e72797451abda9613 /gnu/packages/inkscape.scm | |
| parent | 6548e53fcbb125062719a9324ff65f6994e7b847 (diff) | |
| download | guix-68f90673242777feea9537d6e506d97ea8506c45.tar.gz | |
gnu: inkscape: Update to 0.92.0.
* gnu/packages/patches/inkscape-drop-wait-for-targets.patch: Remove it. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/inkscape.scm (inkscape): Update to 0.92.0. [build-system]: Use "cmake-build-system". [native-inputs]: Add glib:bin. [arguments]: Remove obsolete arguments; disable tests.
Diffstat (limited to 'gnu/packages/inkscape.scm')
| -rw-r--r-- | gnu/packages/inkscape.scm | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index d98a4cd7a9..e20ca666bd 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -23,7 +23,7 @@ #: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) @@ -44,20 +44,16 @@ (define-public inkscape (package (name "inkscape") - (version "0.91") + (version "0.92.0") (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")) (sha256 (base32 - "086v01jy896dj86bq7plrf6si4p6gh6ga2v5417llgmminycz8rc")) - (patch-flags '("-p0")) - (patches - (search-patches "inkscape-drop-wait-for-targets.patch")))) - (build-system gnu-build-system) + "0mmssxnxsvb3bpm7ck5pqvwyacrz1nkyacs571jx8j04l1cw3d5q")))) + (build-system cmake-build-system) (inputs `(("aspell" ,aspell) ("gtkmm" ,gtkmm-2) @@ -75,19 +71,11 @@ ("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 - (modify-phases %standard-phases - (add-after 'unpack 'fix-test-includes - (lambda _ - (substitute* "src/cxxtests.cpp" - (("\\.\\./\\.\\./src") "../src")) - #t))))) + ;; 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 |