gnu: inkscape: Add inkscape-1.0.
* gnu/packages/inkscape.scm (inkscape-1.0): New variable. * gnu/packages/gtk.scm (at-spi2-atk): Add a TODO comment.
This commit is contained in:
Maxim Cournoyer
parent
3f1f98d9d8
commit
ff8a1a88d9
2 changed files with 175 additions and 0 deletions
|
|
@ -690,6 +690,8 @@ is part of the GNOME accessibility project.")
|
||||||
(setenv "DBUS_FATAL_WARNINGS" "0")
|
(setenv "DBUS_FATAL_WARNINGS" "0")
|
||||||
(invoke "dbus-launch" "meson" "test"))))))
|
(invoke "dbus-launch" "meson" "test"))))))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
|
;; TODO: Replace by at-spi2-core-minimal in the next staging window, or
|
||||||
|
;; when Inkscape 0.92 is upgraded to 1.0 to avoid a cycle.
|
||||||
`(("at-spi2-core" ,at-spi2-core))) ; required by atk-bridge-2.0.pc
|
`(("at-spi2-core" ,at-spi2-core))) ; required by atk-bridge-2.0.pc
|
||||||
(inputs
|
(inputs
|
||||||
`(("atk" ,atk)))
|
`(("atk" ,atk)))
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@
|
||||||
;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
|
;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||||
;;; Copyright © 2017, 2020 Marius Bakke <mbakke@fastmail.com>
|
;;; Copyright © 2017, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
|
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
|
@ -30,8 +31,13 @@
|
||||||
#:use-module (gnu packages aspell)
|
#:use-module (gnu packages aspell)
|
||||||
#:use-module (gnu packages bdw-gc)
|
#:use-module (gnu packages bdw-gc)
|
||||||
#:use-module (gnu packages boost)
|
#:use-module (gnu packages boost)
|
||||||
|
#:use-module (gnu packages check)
|
||||||
#:use-module (gnu packages glib)
|
#:use-module (gnu packages glib)
|
||||||
|
#:use-module (gnu packages gnome)
|
||||||
|
#:use-module (gnu packages graphics)
|
||||||
#:use-module (gnu packages gtk)
|
#:use-module (gnu packages gtk)
|
||||||
|
#:use-module (gnu packages imagemagick)
|
||||||
|
#:use-module (gnu packages libreoffice)
|
||||||
#:use-module (gnu packages maths)
|
#:use-module (gnu packages maths)
|
||||||
#:use-module (gnu packages perl)
|
#:use-module (gnu packages perl)
|
||||||
#:use-module (gnu packages pdf)
|
#:use-module (gnu packages pdf)
|
||||||
|
|
@ -107,3 +113,170 @@
|
||||||
apart is its use of Scalable Vector Graphics (SVG), an XML-based W3C standard,
|
apart is its use of Scalable Vector Graphics (SVG), an XML-based W3C standard,
|
||||||
as the native format.")
|
as the native format.")
|
||||||
(license license:gpl2+)))
|
(license license:gpl2+)))
|
||||||
|
|
||||||
|
(define-public inkscape-1.0
|
||||||
|
(package
|
||||||
|
(name "inkscape")
|
||||||
|
(version "1.0")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "https://media.inkscape.org/dl/"
|
||||||
|
"resources/file/"
|
||||||
|
"inkscape-" version ".tar.xz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1fwl7yjkykqb86555k4fm24inhc40mrvxqwgl2v2vi9alv8j7hc9"))
|
||||||
|
(modules '((guix build utils)
|
||||||
|
(ice-9 format)))
|
||||||
|
(snippet
|
||||||
|
'(begin
|
||||||
|
(let-syntax
|
||||||
|
;; XXX: The build system doesn't currently support using
|
||||||
|
;; system libraries over bundled ones (see:
|
||||||
|
;; https://gitlab.com/inkscape/inkscape/issues/876).
|
||||||
|
((unbundle
|
||||||
|
(syntax-rules ()
|
||||||
|
((_ (name source-dir use-pkg-config?) ...)
|
||||||
|
(begin
|
||||||
|
;; Delete bundled source directories.
|
||||||
|
(delete-file-recursively source-dir) ...
|
||||||
|
(substitute* '("src/CMakeLists.txt"
|
||||||
|
"src/3rdparty/CMakeLists.txt")
|
||||||
|
(((string-append ".*add_subdirectory\\("
|
||||||
|
(basename source-dir) "\\).*"))
|
||||||
|
"") ...)
|
||||||
|
;; Remove bundled entries from INKSCAPE_TARGET_LIBS.
|
||||||
|
(substitute* "src/CMakeLists.txt"
|
||||||
|
(((string-append name "_LIB.*")) "") ...)
|
||||||
|
;; Register the external libraries, so that their
|
||||||
|
;; headers are added to INKSCAPE_INCS_SYS and their
|
||||||
|
;; shared libraries added to INKSCAPE_LIBS.
|
||||||
|
(if use-pkg-config?
|
||||||
|
(let* ((width (string-length "pkg_check_modules("))
|
||||||
|
(indent (string-join (make-list width " ") "")))
|
||||||
|
(substitute* "CMakeScripts/DefineDependsandFlags.cmake"
|
||||||
|
(("^pkg_check_modules\\(INKSCAPE_DEP REQUIRED.*" start)
|
||||||
|
(string-append start
|
||||||
|
(format #f "~a~a~%" indent name)))))
|
||||||
|
(substitute* "CMakeScripts/DefineDependsandFlags.cmake"
|
||||||
|
(("^find_package\\(Iconv REQUIRED\\).*" start)
|
||||||
|
(string-append (format #f "
|
||||||
|
find_path(~a_INCLUDE_DIR NAMES ~:*~a/~:*~a.h ~:*~a.h)
|
||||||
|
if(NOT ~:*~a_INCLUDE_DIR)
|
||||||
|
message(FATAL_ERROR \"~:*~a headers not found\")
|
||||||
|
else()
|
||||||
|
list(APPEND INKSCAPE_INCS_SYS ${~:*~a_INCLUDE_DIR})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
find_library(~:*~a_LIB NAMES ~:*~a)
|
||||||
|
if(NOT ~:*~a_LIB)
|
||||||
|
message(FATAL_ERROR \"~:*~a library not found\")
|
||||||
|
else()
|
||||||
|
list(APPEND INKSCAPE_LIBS ~:*~a_LIB)
|
||||||
|
endif()~%~%"
|
||||||
|
name)
|
||||||
|
start)))) ...
|
||||||
|
;; Fix the references to the headers of the
|
||||||
|
;; unbundled libraries.
|
||||||
|
(substitute* (find-files "." "\\.h$|\\.cpp$")
|
||||||
|
(((string-append "#include (\"|<)3rdparty/"
|
||||||
|
(basename source-dir)) _ quote)
|
||||||
|
(string-append "#include " quote
|
||||||
|
(basename source-dir)))
|
||||||
|
...))))))
|
||||||
|
(unbundle ("2geom" "src/2geom" #t)
|
||||||
|
;; libcroco cannot be unbundled as it is heavily
|
||||||
|
;; modified (see:
|
||||||
|
;; https://gitlab.com/inkscape/inkscape/issues/876#note_276114904).
|
||||||
|
;; ("croco" "src/3rdparty/libcroco" #t)
|
||||||
|
;; FIXME: Unbundle the following libraries once they
|
||||||
|
;; have been packaged.
|
||||||
|
;; ("cola" "src/3rdparty/adaptagrams/libcola")
|
||||||
|
;; ("avoid" "src/3rdparty/adaptagrams/libavoid")
|
||||||
|
;; ("vpsc" "src/3rdparty/adaptagrams/libvpsc")
|
||||||
|
;; libuemf cannot be unbundled as it slightly modified
|
||||||
|
;; from upstream (see:
|
||||||
|
;; https://gitlab.com/inkscape/inkscape/issues/973).
|
||||||
|
;; ("uemf" "src/3rdparty/libuemf" #f)
|
||||||
|
;; FIXME: libdepixelize upstream is ancient and doesn't
|
||||||
|
;; build with a recent lib2geom
|
||||||
|
;; (see: https://bugs.launchpad.net/libdepixelize/+bug/1862458).
|
||||||
|
;;("depixelize" "src/3rdparty/libdepixelize")
|
||||||
|
("autotrace" "src/3rdparty/autotrace" #t)))
|
||||||
|
;; Lift the requirement on the double-conversion library, as
|
||||||
|
;; it is only needed by lib2geom, which is now unbundled.
|
||||||
|
(substitute* "CMakeScripts/DefineDependsandFlags.cmake"
|
||||||
|
((".*find_package\\(DoubleConversion.*") ""))
|
||||||
|
#t))))
|
||||||
|
(build-system cmake-build-system)
|
||||||
|
(arguments
|
||||||
|
`(#:tests? #t
|
||||||
|
#:test-target "check" ;otherwise some test binaries are missing
|
||||||
|
#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
(add-after 'unpack 'patch-icon-cache-generator
|
||||||
|
(lambda _
|
||||||
|
(substitute* "share/icons/application/CMakeLists.txt"
|
||||||
|
(("gtk-update-icon-cache") "true"))
|
||||||
|
#t))
|
||||||
|
(add-after 'unpack 'disable-latex-export-tests
|
||||||
|
;; FIXME: For some reason the test.pdf_tex file generated by the
|
||||||
|
;; "--export-latex" lacks "some text" in its content when run in
|
||||||
|
;; the build environment. Skip the related tests.
|
||||||
|
(lambda _
|
||||||
|
(substitute* "testfiles/cli_tests/CMakeLists.txt"
|
||||||
|
(("add_cli_test\\(export-latex")
|
||||||
|
"message(TEST_DISABLED: export-latex"))
|
||||||
|
#t))
|
||||||
|
(add-after 'unpack 'set-home
|
||||||
|
;; Mute Inkscape warnings during tests.
|
||||||
|
(lambda _
|
||||||
|
(setenv "HOME" (getcwd))
|
||||||
|
(format #t "ARGS is set to: ~a" (getenv "ARGS"))
|
||||||
|
#t))
|
||||||
|
;; Move the check phase after the install phase, as when run in the
|
||||||
|
;; tests, Inkscape relies on files that are not yet installed, such
|
||||||
|
;; as the "share/inkscape/ui/units.xml" file.
|
||||||
|
(delete 'check)
|
||||||
|
(add-after 'install 'check
|
||||||
|
(assoc-ref %standard-phases 'check)))))
|
||||||
|
(inputs
|
||||||
|
`(("aspell" ,aspell)
|
||||||
|
("autotrace" ,autotrace)
|
||||||
|
("gdl" ,gdl-minimal)
|
||||||
|
("gtkmm" ,gtkmm)
|
||||||
|
("gtk" ,gtk+)
|
||||||
|
("gtkspell3" ,gtkspell3)
|
||||||
|
("gsl" ,gsl)
|
||||||
|
("poppler" ,poppler)
|
||||||
|
("lib2geom" ,lib2geom)
|
||||||
|
("libjpeg" ,libjpeg-turbo)
|
||||||
|
("libpng" ,libpng)
|
||||||
|
("libxml2" ,libxml2)
|
||||||
|
("libxslt" ,libxslt)
|
||||||
|
("libgc" ,libgc)
|
||||||
|
("libsoup" ,libsoup-minimal)
|
||||||
|
("libcdr" ,libcdr)
|
||||||
|
("libvisio" ,libvisio)
|
||||||
|
("libwpd" ,libwpd)
|
||||||
|
("libwpg" ,libwpg)
|
||||||
|
("freetype" ,freetype)
|
||||||
|
("popt" ,popt)
|
||||||
|
("potrace" ,potrace)
|
||||||
|
("lcms" ,lcms)
|
||||||
|
("boost" ,boost)))
|
||||||
|
(native-inputs
|
||||||
|
`(("imagemagick" ,imagemagick) ;for tests
|
||||||
|
("intltool" ,intltool)
|
||||||
|
("glib" ,glib "bin")
|
||||||
|
("googletest" ,googletest)
|
||||||
|
("perl" ,perl)
|
||||||
|
("pkg-config" ,pkg-config)
|
||||||
|
("python" ,python-wrapper)))
|
||||||
|
(home-page "https://inkscape.org/")
|
||||||
|
(synopsis "Vector graphics editor")
|
||||||
|
(description "Inkscape is a vector graphics editor. What sets Inkscape
|
||||||
|
apart is its use of Scalable Vector Graphics (SVG), an XML-based W3C standard,
|
||||||
|
as the native format.")
|
||||||
|
(license license:gpl3+))) ;see the file COPYING
|
||||||
|
|
|
||||||
Reference in a new issue