[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/116: gnu: inkscape: Update to 0.48.5.
From: |
Mark H. Weaver |
Subject: |
04/116: gnu: inkscape: Update to 0.48.5. |
Date: |
Sat, 20 Dec 2014 04:38:15 +0000 |
mhw pushed a commit to branch xorg-updates
in repository guix.
commit 618ea7c94effc0cdd9513df01776bff0de8211f6
Author: Mark H Weaver <address@hidden>
Date: Fri Dec 19 13:40:26 2014 -0500
gnu: inkscape: Update to 0.48.5.
* gnu/packages/patches/inkscape-stray-comma.patch: Remove file.
* gnu-system.am (dist_patch_DATA): Remove it.
* gnu/packages/inkscape.scm (inkscape): Update to 0.48.5. Remove patch. Use
the .bz2 source tarball. Use current libgc. Add 'fix-test-includes'
phase.
---
gnu-system.am | 1 -
gnu/packages/inkscape.scm | 21 ++++++++++++---------
gnu/packages/patches/inkscape-stray-comma.patch | 13 -------------
3 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/gnu-system.am b/gnu-system.am
index c42843a..796262f 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -388,7 +388,6 @@ dist_patch_DATA =
\
gnu/packages/patches/icecat-CVE-2014-1592.patch \
gnu/packages/patches/icecat-CVE-2014-1593.patch \
gnu/packages/patches/icecat-CVE-2014-1594.patch \
- gnu/packages/patches/inkscape-stray-comma.patch \
gnu/packages/patches/jbig2dec-ignore-testtest.patch \
gnu/packages/patches/kmod-module-directory.patch \
gnu/packages/patches/libarchive-CVE-2013-0211.patch \
diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm
index b48bedc..26513b8 100644
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 John Darrington <address@hidden>
+;;; Copyright © 2014 Mark H Weaver <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -41,15 +42,14 @@
(define-public inkscape
(package
(name "inkscape")
- (version "0.48.4")
+ (version "0.48.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/inkscape/inkscape-"
- version ".tar.gz"))
+ version ".tar.bz2"))
(sha256
(base32
- "0nhxsgrgsx6zrgpkd1akxjvmdqjp8ccnsvlwxh62l0brg84fw6bf"))
- (patches (list (search-patch "inkscape-stray-comma.patch")))))
+ "0sfr7a1vr1066rrkkqbqvcqs3gawalj68ralnhd6k87jz62fcv1b"))))
(build-system gnu-build-system)
(inputs
`(("aspell" ,aspell)
@@ -60,11 +60,7 @@
("libpng" ,libpng)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
-
- ;; With libgc 7.4, compilation fails with:
- ;; gc.cpp:123:1: error: invalid conversion from 'int (*)(void**, const
void*)' to 'int (*)(void**, void*)'
- ("libgc" ,libgc-7.2)
-
+ ("libgc" ,libgc)
("freetype" ,freetype)
("popt" ,popt)
("python" ,python-2)
@@ -74,6 +70,13 @@
`(("intltool" ,intltool)
("perl" ,perl)
("pkg-config" ,pkg-config)))
+ (arguments
+ `(#:phases (alist-cons-after
+ 'unpack 'fix-test-includes
+ (lambda _
+ (substitute* "src/cxxtests.cpp"
+ (("\\.\\./\\.\\./src") "../src")))
+ %standard-phases)))
(home-page "http://inkscape.org/")
(synopsis "Vector graphics editor")
(description "Inkscape is a vector graphics editor. What sets Inkscape
diff --git a/gnu/packages/patches/inkscape-stray-comma.patch
b/gnu/packages/patches/inkscape-stray-comma.patch
deleted file mode 100644
index 0b000d9..0000000
--- a/gnu/packages/patches/inkscape-stray-comma.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-This is verbatim from Upstream:
http://bazaar.launchpad.net/~inkscape.dev/inkscape/RELEASE_0_48_BRANCH/diff/9943
---- a/src/widgets/desktop-widget.h 2011-06-06 06:43:00 +0000
-+++ b/src/widgets/desktop-widget.h 2013-01-05 14:34:09 +0000
-@@ -239,7 +239,7 @@
- private:
- GtkWidget *tool_toolbox;
- GtkWidget *aux_toolbox;
-- GtkWidget *commands_toolbox,;
-+ GtkWidget *commands_toolbox;
- GtkWidget *snap_toolbox;
-
- static void init(SPDesktopWidget *widget);
-
- branch xorg-updates created (now d2611ff), Mark H. Weaver, 2014/12/19
- 01/116: gnu: Add libxshmfence., Mark H. Weaver, 2014/12/19
- 02/116: gnu: libdrm: Update to 2.4.58., Mark H. Weaver, 2014/12/19
- 03/116: gnu: mesa: Update to 10.4.0., Mark H. Weaver, 2014/12/19
- 04/116: gnu: inkscape: Update to 0.48.5.,
Mark H. Weaver <=
- 08/116: gnu: dbus-glib: Update to 0.102., Mark H. Weaver, 2014/12/19
- 06/116: gnu: dbus: Update to 1.8.12., Mark H. Weaver, 2014/12/19
- 07/116: gnu: glib: Update to 2.42.1., Mark H. Weaver, 2014/12/19
- 09/116: gnu: glibmm: Update to 2.42.0., Mark H. Weaver, 2014/12/19
- 10/116: gnu: pixman: Update to 0.32.6., Mark H. Weaver, 2014/12/19
- 13/116: gnu: util-macros: Update to 1.19.0., Mark H. Weaver, 2014/12/19
- 12/116: gnu: cairomm: Update to 1.11.2., Mark H. Weaver, 2014/12/19
- 05/116: gnu: poppler: Update to 0.28.1., Mark H. Weaver, 2014/12/19
- 14/116: gnu: xproto: Update to 7.0.26., Mark H. Weaver, 2014/12/19
- 15/116: gnu: xextproto: Update to 7.3.0., Mark H. Weaver, 2014/12/19