summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Wouter van Kesteren <woutershep@gmail.com> 2016-10-08 15:08:14 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2016-10-09 11:22:39 +0200
commit97b49d4176f3685ee6441fbcfba9b8e5dd18b098 (patch)
tree5acb793f01cb2f93253baeb39bfccec7645e75db
parent5b1b86fbca8d8631f65d5682a135d6593b6859fd (diff)
downloadoffice-97b49d4176f3685ee6441fbcfba9b8e5dd18b098.tar.gz
office-97b49d4176f3685ee6441fbcfba9b8e5dd18b098.tar.xz
libetonyek: fix tests
Change-Id: I9393f5ec109af70fbc7c7bfe70c05764c015c4e1 Reviewed-on: https://galileo.mailstation.de/gerrit/7355 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Heiko Becker <heirecka@exherbo.org>
-rw-r--r--packages/office-libs/libetonyek/files/0001-drop-test-that-violates-Unicode-tr-35.patch38
-rw-r--r--packages/office-libs/libetonyek/libetonyek-0.1.6-r1.exheres-05
2 files changed, 42 insertions, 1 deletions
diff --git a/packages/office-libs/libetonyek/files/0001-drop-test-that-violates-Unicode-tr-35.patch b/packages/office-libs/libetonyek/files/0001-drop-test-that-violates-Unicode-tr-35.patch
new file mode 100644
index 0000000..a35da1e
--- /dev/null
+++ b/packages/office-libs/libetonyek/files/0001-drop-test-that-violates-Unicode-tr-35.patch
@@ -0,0 +1,38 @@
+Upstream: Yes
+
+From 1a20d8ece2ea3e8aa1d319cd88e8a6aa637982f2 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Fri, 30 Sep 2016 09:57:15 +0200
+Subject: [PATCH] drop test that violates Unicode tr#35
+
+(and therefore fails with latest liblangtag)
+
+Change-Id: I0e06c6c4e8bcf999cf5559d6287e77ae97e555d8
+---
+ src/test/IWORKLanguageManagerTest.cpp | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/src/test/IWORKLanguageManagerTest.cpp b/src/test/IWORKLanguageManagerTest.cpp
+index 8fca0a6..e663bd2 100644
+--- a/src/test/IWORKLanguageManagerTest.cpp
++++ b/src/test/IWORKLanguageManagerTest.cpp
+@@ -104,16 +104,6 @@ void IWORKLanguageManagerTest::testTagToProps()
+ }
+
+ {
+- const string tag(mgr.addTag("ccc"));
+- CPPUNIT_ASSERT(!tag.empty());
+- RVNGPropertyList props;
+- mgr.writeProperties(tag, props);
+- assertProperty("unknown lang", props, "fo:language", "ccc");
+- CPPUNIT_ASSERT(!props["fo:country"]);
+- CPPUNIT_ASSERT(!props["fo:script"]);
+- }
+-
+- {
+ // invalid tag
+ const string tag(mgr.addTag("13c"));
+ CPPUNIT_ASSERT(tag.empty());
+--
+2.9.3
+
diff --git a/packages/office-libs/libetonyek/libetonyek-0.1.6-r1.exheres-0 b/packages/office-libs/libetonyek/libetonyek-0.1.6-r1.exheres-0
index 562711b..721bc39 100644
--- a/packages/office-libs/libetonyek/libetonyek-0.1.6-r1.exheres-0
+++ b/packages/office-libs/libetonyek/libetonyek-0.1.6-r1.exheres-0
@@ -28,7 +28,10 @@ DEPENDENCIES="
dev-cpp/cppunit
"
-DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}"/f6d14b3b510de5c50e45c98fe812a73ba00f3def.patch )
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/f6d14b3b510de5c50e45c98fe812a73ba00f3def.patch
+ "${FILES}"/0001-drop-test-that-violates-Unicode-tr-35.patch
+)
DEFAULT_SRC_CONFIGURE_PARAMS=(
--disable-werror