diff options
author | Ludovic Courtès <ludo@gnu.org> | 2019-01-20 22:12:10 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2019-01-20 22:12:10 +0100 |
commit | 3e2d4e69c340c3520f546f8c7e21e52383058d1c (patch) | |
tree | 0bc92edb753cfdf9a9e7ef763ebc19f0cd2d528c /gnu/packages/inkscape.scm | |
parent | ad79ae7e2d7505292b11e87302b08f4db0f934e9 (diff) | |
parent | e5ad2cdf172eecc7edef37a500593b1941af013c (diff) | |
download | patches-3e2d4e69c340c3520f546f8c7e21e52383058d1c.tar patches-3e2d4e69c340c3520f546f8c7e21e52383058d1c.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/inkscape.scm')
-rw-r--r-- | gnu/packages/inkscape.scm | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index eae8ac962b..7b17ebae40 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -46,7 +46,7 @@ (define-public inkscape (package (name "inkscape") - (version "0.92.3") + (version "0.92.4") (source (origin (method url-fetch) (uri (string-append "https://media.inkscape.org/dl/" @@ -54,41 +54,7 @@ "inkscape-" version ".tar.bz2")) (sha256 (base32 - "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6")) - (patches - (list (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/inkscape/inkscape/commit/" - "a600c6438fef2f4c06f9a4a7d933d99fb054a973.diff")) - (file-name "inkscape-poppler-compat.patch") - (sha256 - (base32 - "19dam5vsy571xszgjddl5g0958dmcsv0wvgxidp4bhj2lban222i"))) - (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/inkscape/inkscape/commit/" - "fa1c469aa8c005e07bb8676d72af9f7c16fae3e0.diff")) - (file-name "inkscape-poppler-compat2.patch") - (sha256 - (base32 - "14k9yrfjz4nx3bz9dk91q74mc0i7rvl2qzkwhcy1br71yqjvngn5"))) - (search-patch "inkscape-poppler-compat3.patch") - (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/inkscape/inkscape/commit/" - "d047859d90cef3784e2d13e40887a70d8d517897.diff")) - (file-name "inkscape-poppler-compat4.patch") - (sha256 - (base32 - "0xdfg3q4g4m15z7wna4brjn5j4kr15qiqc2f25vcw2nnr6x54qcp"))) - (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/inkscape/inkscape/commit/" - "b3d59cc8106da3bf6020a6c47eeb3b8a7bbae1a9.diff")) - (file-name "inkscape-poppler-compat5.patch") - (sha256 - (base32 - "0haviy66q9szizmvb82msfj80bb3wgi1fnq3ml8fyfp8l90a1217"))))))) + "0pjinhjibfsz1aywdpgpj3k23xrsszpj4a1ya5562dkv2yl2vv2p")))) (build-system cmake-build-system) (inputs `(("aspell" ,aspell) |