From 448885263851c16fce0a1777acf9db21a2da2566 Mon Sep 17 00:00:00 2001 From: Rmys Date: Sat, 24 Mar 2018 10:39:11 +0300 Subject: [PATCH] podofo:rebuild --- .../podofo/files/podofo-0.9.4-freetype.patch | 23 +++++++++++++++++++ .../podofo/files/podofo-0.9.4_build.patch | 12 ++++++++++ .../podofo/files/podofo-0.9.5_stdc++98.patch | 12 ++++++++++ office/misc/podofo/pspec.xml | 5 ++++ 4 files changed, 52 insertions(+) create mode 100644 office/misc/podofo/files/podofo-0.9.4-freetype.patch create mode 100644 office/misc/podofo/files/podofo-0.9.4_build.patch create mode 100644 office/misc/podofo/files/podofo-0.9.5_stdc++98.patch diff --git a/office/misc/podofo/files/podofo-0.9.4-freetype.patch b/office/misc/podofo/files/podofo-0.9.4-freetype.patch new file mode 100644 index 0000000000..71f18ab8a7 --- /dev/null +++ b/office/misc/podofo/files/podofo-0.9.4-freetype.patch @@ -0,0 +1,23 @@ +diff -rupN podofo-0.9.4/CMakeLists.txt podofo-0.9.4-new/CMakeLists.txt +--- podofo-0.9.4/CMakeLists.txt 2016-06-08 22:55:08.000000000 +0200 ++++ podofo-0.9.4-new/CMakeLists.txt 2016-09-17 22:27:38.342555473 +0200 +@@ -391,8 +391,8 @@ ENDIF(NOT PODOFO_BUILD_LIB_ONLY) + + FIND_PACKAGE(OpenSSL) + +-FIND_PACKAGE(FREETYPE REQUIRED) +-MESSAGE("Found freetype library at ${FREETYPE_LIBRARIES}, headers ${FREETYPE_INCLUDE_DIR}") ++FIND_PACKAGE(Freetype REQUIRED) ++MESSAGE("Found freetype library at ${FREETYPE_LIBRARIES}, headers ${FREETYPE_INCLUDE_DIRS}") + + FIND_PACKAGE(LIBSTLPORT) + SET(stlport_libraries_if_use_stlport) +@@ -471,7 +471,7 @@ INCLUDE_DIRECTORIES(BEFORE # before tool + + INCLUDE_DIRECTORIES( + ${PoDoFo_SOURCE_DIR}/src +- ${FREETYPE_INCLUDE_DIR} ++ ${FREETYPE_INCLUDE_DIRS} + ${ZLIB_INCLUDE_DIR} + ${EXTRA_INCLUDES} + ) diff --git a/office/misc/podofo/files/podofo-0.9.4_build.patch b/office/misc/podofo/files/podofo-0.9.4_build.patch new file mode 100644 index 0000000000..3c4b72a751 --- /dev/null +++ b/office/misc/podofo/files/podofo-0.9.4_build.patch @@ -0,0 +1,12 @@ +diff -rupN podofo-0.9.4/test/unit/EncryptTest.h podofo-0.9.4-new/test/unit/EncryptTest.h +--- podofo-0.9.4/test/unit/EncryptTest.h 2012-12-12 23:55:46.000000000 +0100 ++++ podofo-0.9.4-new/test/unit/EncryptTest.h 2016-09-18 10:41:30.476635230 +0200 +@@ -83,7 +83,7 @@ class EncryptTest : public CppUnit::Test + + private: + char* m_pEncBuffer; +- long m_lLen; ++ PoDoFo::pdf_long m_lLen; + int m_protection; + + }; diff --git a/office/misc/podofo/files/podofo-0.9.5_stdc++98.patch b/office/misc/podofo/files/podofo-0.9.5_stdc++98.patch new file mode 100644 index 0000000000..09976affc8 --- /dev/null +++ b/office/misc/podofo/files/podofo-0.9.5_stdc++98.patch @@ -0,0 +1,12 @@ +diff -rupN podofo-0.9.5/CMakeLists.txt podofo-0.9.5-new/CMakeLists.txt +--- podofo-0.9.5/CMakeLists.txt 2017-02-01 22:23:03.000000000 +0100 ++++ podofo-0.9.5-new/CMakeLists.txt 2017-02-10 14:40:25.472066545 +0100 +@@ -296,8 +296,6 @@ IF(CMAKE_COMPILER_IS_GNUCXX) + SET(PODOFO_USE_VISIBILITY ${PODOFO_HAVE_GCC4}) + ENDIF(NOT DEFINED PODOFO_USE_VISIBILITY) + +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98") +- + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Woverloaded-virtual -Wswitch-enum -Wcast-qual -Wwrite-strings -Wredundant-decls -Wreorder") + + # diff --git a/office/misc/podofo/pspec.xml b/office/misc/podofo/pspec.xml index 42918bd890..b5ed956187 100644 --- a/office/misc/podofo/pspec.xml +++ b/office/misc/podofo/pspec.xml @@ -29,6 +29,11 @@ boost-devel openssl-devel + + podofo-0.9.4-freetype.patch + podofo-0.9.4_build.patch + podofo-0.9.5_stdc++98.patch +