[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/06: gnu: librsvg: Fix tests.
From: |
??? |
Subject: |
02/06: gnu: librsvg: Fix tests. |
Date: |
Sat, 17 Oct 2015 03:09:53 +0000 |
iyzsong pushed a commit to branch dbus-update
in repository guix.
commit 5f37e56ba41edb1bd47b7b1663aea07078f943d2
Author: 宋文武 <address@hidden>
Date: Sat Oct 17 10:30:25 2015 +0800
gnu: librsvg: Fix tests.
GLib doesn't allow duplicate test case paths any more.
* gnu/packages/patches/librsvg-tests.patch: New file.
* gnu/packages/gnome.scm (librsvg)[source]: Add patch.
* gnu-system.am (dist_patch_DATA): Add it.
---
gnu-system.am | 1 +
gnu/packages/gnome.scm | 4 +++-
gnu/packages/patches/librsvg-tests.patch | 27 +++++++++++++++++++++++++++
3 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/gnu-system.am b/gnu-system.am
index ee3c686..36c94d6 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -527,6 +527,7 @@ dist_patch_DATA =
\
gnu/packages/patches/libmad-armv7-thumb-pt2.patch \
gnu/packages/patches/libmad-frame-length.patch \
gnu/packages/patches/libmad-mips-newgcc.patch \
+ gnu/packages/patches/librsvg-tests.patch \
gnu/packages/patches/libtheora-config-guess.patch \
gnu/packages/patches/libtool-skip-tests2.patch \
gnu/packages/patches/libssh-CVE-2014-0017.patch \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index fb7fa79..5811299 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -829,7 +829,9 @@ dealing with different structured file formats.")
name "-" version ".tar.xz"))
(sha256
(base32
- "00ifd9wjjjsw0ybk5j6qs4yyh66jj34hjmggy6dhrgfy8ksw06k1"))))
+ "00ifd9wjjjsw0ybk5j6qs4yyh66jj34hjmggy6dhrgfy8ksw06k1"))
+ (patches
+ (list (search-patch "librsvg-tests.patch")))))
(build-system gnu-build-system)
(arguments
`(#:phases
diff --git a/gnu/packages/patches/librsvg-tests.patch
b/gnu/packages/patches/librsvg-tests.patch
new file mode 100644
index 0000000..dc5b94e
--- /dev/null
+++ b/gnu/packages/patches/librsvg-tests.patch
@@ -0,0 +1,27 @@
+From e06fc71a57156123e4e50a39957100a651ab632b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <address@hidden>
+Date: Sat, 17 Oct 2015 10:20:33 +0800
+Subject: [PATCH] tests/styles: Don't duplicate test names.
+
+---
+ tests/styles.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/styles.c b/tests/styles.c
+index d09b1f2..a938835 100644
+--- a/tests/styles.c
++++ b/tests/styles.c
+@@ -97,8 +97,8 @@ static const FixtureData fixtures[] =
+ {"/styles/selectors/2 or more selectors (stroke)", "592207",
"styles/bug592207.svg", "#target", "stroke", .expected.color = 0xff0000ff},
+ {"/styles/svg-element-style", "615701", "styles/svg-class.svg", "#svg",
"fill", .expected.color = 0xff0000ff},
+ {"/styles/presentation attribute in svg element", "620693",
"styles/bug620693.svg", "#svg", "stroke", .expected.color = 0xffff0000},
+- {"/styles/!important", "379629", "styles/bug379629.svg", "#base_shadow",
"stroke", .expected.color = 0xffffc0cb /* pink */},
+- {"/styles/!important", "379629", "styles/bug379629.svg", "#base_shadow",
"stroke-width", .expected.length = {POINTS_LENGTH(5.), 'i'}},
++ {"/styles/!important/1", "379629", "styles/bug379629.svg",
"#base_shadow", "stroke", .expected.color = 0xffffc0cb /* pink */},
++ {"/styles/!important/2", "379629", "styles/bug379629.svg",
"#base_shadow", "stroke-width", .expected.length = {POINTS_LENGTH(5.), 'i'}},
+ {"/styles/!important/class", "614606", "styles/bug614606.svg",
"#path6306", "fill", .expected.color = 0xffff0000 /* red */ },
+ {"/styles/!important/element", "614606", "styles/bug614606.svg",
"#path6308", "fill", .expected.color = 0xff000000},
+ {"/styles/!important/#id prior than class", NULL, "styles/important.svg",
"#red", "fill", .expected.color = 0xffff0000 },
+--
+2.5.0
+
- branch dbus-update updated (3ad29c9 -> fd73059), ???, 2015/10/16
- 04/06: gnu: gsettings-desktop-schemas: Update to 3.18.0., ???, 2015/10/16
- 01/06: gnu: librsvg: Update to 2.40.11., ???, 2015/10/16
- 02/06: gnu: librsvg: Fix tests.,
??? <=
- 03/06: gnu: vala: Update to 0.30.0., ???, 2015/10/16
- 06/06: gnu: libsoup: Update to 2.52.1, enable vala bindings., ???, 2015/10/16
- 05/06: gnu: glib-networking: Update to 2.46.1., ???, 2015/10/16