Date: Thursday, August 10, 2017 @ 19:57:32 Author: andyrtr Revision: 301866
upgpkg: libetonyek 0.1.6-2 fix build; FS#55083 Added: libetonyek/trunk/0001-Allow-building-with-mdds-1.2.patch libetonyek/trunk/0001-drop-test-that-violates-Unicode-tr-35.patch libetonyek/trunk/0001-fix-test-on-i686.patch Modified: libetonyek/trunk/PKGBUILD --------------------------------------------------+ 0001-Allow-building-with-mdds-1.2.patch | 83 +++++++++++++++++++++ 0001-drop-test-that-violates-Unicode-tr-35.patch | 37 +++++++++ 0001-fix-test-on-i686.patch | 27 ++++++ PKGBUILD | 22 ++++- 4 files changed, 165 insertions(+), 4 deletions(-) Added: 0001-Allow-building-with-mdds-1.2.patch =================================================================== --- 0001-Allow-building-with-mdds-1.2.patch (rev 0) +++ 0001-Allow-building-with-mdds-1.2.patch 2017-08-10 19:57:32 UTC (rev 301866) @@ -0,0 +1,83 @@ +From f6d14b3b510de5c50e45c98fe812a73ba00f3def Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <[email protected]> +Date: Thu, 9 Jun 2016 10:50:41 +0200 +Subject: [PATCH] Allow building with mdds-1.2 + +Change-Id: If8791b4c1c3fbefdd06af345276e0a724dff5482 +--- + configure.ac | 44 +++++++++++++++++++++++--------------------- + 1 file changed, 23 insertions(+), 21 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ca4bb07..bb946eb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -24,7 +24,7 @@ AC_LANG([C++]) + # Configure options + # ================= + AC_ARG_WITH([mdds], +- AS_HELP_STRING([--with-mdds=1.0|0.x], [Specify which version of mdds to use (1.0 is the default)]), ++ AS_HELP_STRING([--with-mdds=1.2|1.0|0.x], [Specify which version of mdds to use (1.0 is the default)]), + [], [with_mdds="1.0"]) + + # =========================== +@@ -47,7 +47,7 @@ AC_PROG_SED + + AM_MISSING_PROG([GPERF], [gperf]) + +-AS_IF([test "$with_mdds" = "1.0"], [AX_CXX_COMPILE_STDCXX_11([noext])]) ++AS_IF([test "$with_mdds" = "1.0" -o "$with_mdds" = "1.2" ], [AX_CXX_COMPILE_STDCXX_11([noext])]) + + # =============== + # Find librevenge +@@ -138,25 +138,27 @@ AC_SUBST([GLM_CFLAGS]) + # ========= + # Find mdds + # ========= +-AS_IF([test "$with_mdds" = "1.0"], [ +- PKG_CHECK_MODULES([MDDS], [mdds-1.0]) +-], [ +- PKG_CHECK_MODULES([MDDS], [mdds]) +- AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type]) +- old_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$MDDS_CFLAGS $CPPFLAGS" +- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ +- #include <mdds/flat_segment_tree.hpp> +- struct Value {}; +- mdds::flat_segment_tree<int, Value> tree(0, 4, Value()); +- ])], [ +- AC_MSG_RESULT([yes]) +- ], [ +- AC_MSG_RESULT([no]) +- AC_MSG_ERROR([please install mdds >= 0.12.1]) +- ]) +- CPPFLAGS="$old_CPPFLAGS" +-]) ++AS_CASE(["$with_mdds"], ++ ["1.2"], [PKG_CHECK_MODULES([MDDS], [mdds-1.2])], ++ ["1.0"], [PKG_CHECK_MODULES([MDDS], [mdds-1.0])], ++ [ ++ PKG_CHECK_MODULES([MDDS], [mdds]) ++ AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type]) ++ old_CPPFLAGS="$CPPFLAGS" ++ CPPFLAGS="$MDDS_CFLAGS $CPPFLAGS" ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ++ #include <mdds/flat_segment_tree.hpp> ++ struct Value {}; ++ mdds::flat_segment_tree<int, Value> tree(0, 4, Value()); ++ ])], [ ++ AC_MSG_RESULT([yes]) ++ ], [ ++ AC_MSG_RESULT([no]) ++ AC_MSG_ERROR([please install mdds >= 0.12.1]) ++ ]) ++ CPPFLAGS="$old_CPPFLAGS" ++ ] ++) + + # ================================= + # Libtool/Version Makefile settings +-- +2.9.3 + + Added: 0001-drop-test-that-violates-Unicode-tr-35.patch =================================================================== --- 0001-drop-test-that-violates-Unicode-tr-35.patch (rev 0) +++ 0001-drop-test-that-violates-Unicode-tr-35.patch 2017-08-10 19:57:32 UTC (rev 301866) @@ -0,0 +1,37 @@ +From 1a20d8ece2ea3e8aa1d319cd88e8a6aa637982f2 Mon Sep 17 00:00:00 2001 +From: David Tardon <[email protected]> +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 + + Added: 0001-fix-test-on-i686.patch =================================================================== --- 0001-fix-test-on-i686.patch (rev 0) +++ 0001-fix-test-on-i686.patch 2017-08-10 19:57:32 UTC (rev 301866) @@ -0,0 +1,27 @@ +From b63a2f52d95243aef4660b2d4573f0e149eeb9a6 Mon Sep 17 00:00:00 2001 +From: David Tardon <[email protected]> +Date: Wed, 22 Feb 2017 15:03:19 -0500 +Subject: [PATCH] fix test on i686 + +Change-Id: Ib9dafdfd76175cc6bbcd94596f7a7bd8b924ed34 +--- + src/test/IWORKTransformationTest.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/test/IWORKTransformationTest.cpp b/src/test/IWORKTransformationTest.cpp +index 77f0b27..5e96e60 100644 +--- a/src/test/IWORKTransformationTest.cpp ++++ b/src/test/IWORKTransformationTest.cpp +@@ -232,7 +232,7 @@ void IWORKTransformationTest::testInverseOperations() + + CPPUNIT_ASSERT(scale(2, 1) * scale(0.5, 1) == eye); + CPPUNIT_ASSERT(scale(1, 2) * scale(1, 0.5) == eye); +- CPPUNIT_ASSERT(scale(3, 2) * scale(1.0 / 3, 0.5) == eye); ++ CPPUNIT_ASSERT(approxEqual(scale(3, 2) * scale(1.0 / 3, 0.5), eye)); + + // CPPUNIT_ASSERT(shear() == eye); + +-- +2.11.1 + + Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-08-10 19:47:18 UTC (rev 301865) +++ PKGBUILD 2017-08-10 19:57:32 UTC (rev 301866) @@ -5,7 +5,7 @@ pkgname=libetonyek pkgver=0.1.6 -pkgrel=1 +pkgrel=2 pkgdesc='Library and a set of tools for reading and converting Apple Keynote presentations' arch=('i686' 'x86_64') url="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"; @@ -12,12 +12,26 @@ license=('MPL') depends=('libxml2' 'zlib' 'libwpd' 'boost-libs' 'librevenge' 'liblangtag') makedepends=('boost' 'cppunit' 'gperf' 'doxygen' 'glm' 'mdds') -source=(https://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('dfe25b0c7739283a5c61a930ea1f9bf8') +source=(https://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz + 0001-Allow-building-with-mdds-1.2.patch + 0001-drop-test-that-violates-Unicode-tr-35.patch + 0001-fix-test-on-i686.patch) +sha256sums=('df54271492070fbcc6aad9f81ca89658b25dd106cc4ab6b04b067b7a43dcc078' + '0cbf1077123a75de9373f80bdec485438683f9954c45f39aaddec94750ef48b8' + 'dcd1750e6878c0b49fdcbbdabe1f0f58e27b02a9b4544ad7a1c979fc8707ab14' + '9222ce04ce5a1a153d0bb0ac734b65bbad7a26767847c4195e545ca00cec34d2') +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../0001-Allow-building-with-mdds-1.2.patch + patch -Np1 -i ../0001-drop-test-that-violates-Unicode-tr-35.patch + patch -Np1 -i ../0001-fix-test-on-i686.patch + autoreconf -vfi +} + build() { cd $pkgname-$pkgver - ./configure --prefix=/usr + ./configure --prefix=/usr --with-mdds=1.2 make }
