From 45004e23b1bb8d0e8164462e5c066de25c59d45c Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 18 Nov 2015 12:25:24 +0100 Subject: [PATCH] fix build on i386 --- 0001-fix-compilation-on-i386.patch | 35 ++++++++++++++++++++++++++++++ libetonyek.spec | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 0001-fix-compilation-on-i386.patch diff --git a/0001-fix-compilation-on-i386.patch b/0001-fix-compilation-on-i386.patch new file mode 100644 index 0000000..24d178a --- /dev/null +++ b/0001-fix-compilation-on-i386.patch @@ -0,0 +1,35 @@ +From f48bd16df9c0a99ba5480d918ecb6d6e48e6f383 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Wed, 18 Nov 2015 12:24:26 +0100 +Subject: [PATCH] fix compilation on i386 + +Change-Id: Ia8b63e6aeb07f4f697211f4d8ede6f840773a9f2 +--- + src/test/IWASnappyStreamTest.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/test/IWASnappyStreamTest.cpp b/src/test/IWASnappyStreamTest.cpp +index 015208a..bc11724 100644 +--- a/src/test/IWASnappyStreamTest.cpp ++++ b/src/test/IWASnappyStreamTest.cpp +@@ -36,7 +36,7 @@ void assertCompressed(const string &message, const unsigned char *const expected + unsigned long uncompressedSize = 0; + const unsigned char *const uncompressed = uncompressedStream->read(expectedSize, uncompressedSize); + assert(uncompressed); +- CPPUNIT_ASSERT_EQUAL_MESSAGE(message + ": size", expectedSize, uncompressedSize); ++ CPPUNIT_ASSERT_EQUAL_MESSAGE(message + ": size", expectedSize, size_t(uncompressedSize)); + CPPUNIT_ASSERT_MESSAGE(message + ": input exhausted", uncompressedStream->isEnd()); + CPPUNIT_ASSERT_MESSAGE(message + ": content", std::equal(expected, expected + expectedSize, uncompressed)); + } +@@ -48,7 +48,7 @@ void assertCompressedFull(const string &message, const unsigned char *const expe + unsigned long uncompressedSize = 0; + const unsigned char *const uncompressed = uncompressedStream.read(expectedSize, uncompressedSize); + assert(uncompressed); +- CPPUNIT_ASSERT_EQUAL_MESSAGE(message + ": size", expectedSize, uncompressedSize); ++ CPPUNIT_ASSERT_EQUAL_MESSAGE(message + ": size", expectedSize, size_t(uncompressedSize)); + CPPUNIT_ASSERT_MESSAGE(message + ": input exhausted", uncompressedStream.isEnd()); + CPPUNIT_ASSERT_MESSAGE(message + ": content", std::equal(expected, expected + expectedSize, uncompressed)); + } +-- +2.5.0 + diff --git a/libetonyek.spec b/libetonyek.spec index b96fac8..c72465c 100644 --- a/libetonyek.spec +++ b/libetonyek.spec @@ -20,6 +20,8 @@ BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(mdds) BuildRequires: pkgconfig(zlib) +Patch0: 0001-fix-compilation-on-i386.patch + %description %{name} is library for import of documents from Apple iWork applications (Keynote, Pages and Numbers). It can import documents created by