diff options
| author |   Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2016-10-22 11:26:58 +0200 |
|---|---|---|
| committer |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2016-11-05 22:00:48 +0100 |
| commit | 7879d7b792884b295c9bff2c4858521e78c20041 (patch) | |
| tree | 6cb7b07e6d13833feb2b1ac0bc6de49a7a394356 | |
| parent | app-text/liblangtag: Drop old (diff) | |
| download | gentoo-7879d7b792884b295c9bff2c4858521e78c20041.tar.gz gentoo-7879d7b792884b295c9bff2c4858521e78c20041.tar.bz2 gentoo-7879d7b792884b295c9bff2c4858521e78c20041.zip | |
app-text/libetonyek: Fix tests
Gentoo-bug: 595022
Package-Manager: portage-2.3.0
| -rw-r--r-- | app-text/libetonyek/files/libetonyek-0.1.6-drop-test.patch | 36 | ||||
| -rw-r--r-- | app-text/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch | 6 | ||||
| -rw-r--r-- | app-text/libetonyek/libetonyek-0.1.6.ebuild | 5 |
3 files changed, 43 insertions, 4 deletions
diff --git a/app-text/libetonyek/files/libetonyek-0.1.6-drop-test.patch b/app-text/libetonyek/files/libetonyek-0.1.6-drop-test.patch new file mode 100644 index 000000000000..a868f797484d --- /dev/null +++ b/app-text/libetonyek/files/libetonyek-0.1.6-drop-test.patch @@ -0,0 +1,36 @@ +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()); +-- +1.7.9.5 + diff --git a/app-text/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch b/app-text/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch index 0ca085f5844c..7a3f22e94c2f 100644 --- a/app-text/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch +++ b/app-text/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch @@ -16,7 +16,7 @@ AM_MISSING_PROG([GPERF], [gperf]) -AS_IF([test "$with_mdds" = "1.0"], [AX_CXX_COMPILE_STDCXX_11([noext])]) -+AS_IF([test "$with_mdds" = "1.2"], [AX_CXX_COMPILE_STDCXX_11([noext])]) ++AS_IF([test "$with_mdds" != "0.x"], [AX_CXX_COMPILE_STDCXX_11([noext])]) # =============== # Find librevenge @@ -26,8 +26,8 @@ # ========= -AS_IF([test "$with_mdds" = "1.0"], [ - PKG_CHECK_MODULES([MDDS], [mdds-1.0]) -+AS_IF([test "$with_mdds" = "1.2"], [ -+ PKG_CHECK_MODULES([MDDS], [mdds-1.2]) ++AS_IF([test "$with_mdds" != "0.x"], [ ++ PKG_CHECK_MODULES([MDDS], [mdds-][$with_mdds]) ], [ PKG_CHECK_MODULES([MDDS], [mdds]) AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type]) diff --git a/app-text/libetonyek/libetonyek-0.1.6.ebuild b/app-text/libetonyek/libetonyek-0.1.6.ebuild index b4a4e5b681a7..5990e49db276 100644 --- a/app-text/libetonyek/libetonyek-0.1.6.ebuild +++ b/app-text/libetonyek/libetonyek-0.1.6.ebuild @@ -34,7 +34,10 @@ DEPEND="${RDEPEND} test? ( dev-util/cppunit ) " -PATCHES=( "${FILESDIR}/${P}-mdds-1.2.patch" ) # patch taken from Debian +PATCHES=( + "${FILESDIR}/${P}-mdds-1.2.patch" # patch taken from Debian + "${FILESDIR}/${P}-drop-test.patch" # bug 595022 +) pkg_pretend() { if [[ $(gcc-major-version) -lt 4 ]] || { |