Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4657 from Rmys/master

Browse Source 
podofo:rebuild
This commit is contained in:
Rmys
2018-03-24 10:42:21 +03:00
committed by GitHub
parent eb74b7c2bc 4488852638
commit c823e22d9e
4 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
office/misc/podofo/files/podofo-0.9.4-freetype.patch
+23
View File
@@ -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}
)
office/misc/podofo/files/podofo-0.9.4_build.patch
+12
View File
@@ -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;
};
office/misc/podofo/files/podofo-0.9.5_stdc++98.patch
+12
View File
@@ -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")
#
office/misc/podofo/pspec.xml
+5
View File
@@ -29,6 +29,11 @@
<Dependency>boost-devel</Dependency>
<Dependency>openssl-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">podofo-0.9.4-freetype.patch</Patch>
<Patch level="1">podofo-0.9.4_build.patch</Patch>
<Patch level="1">podofo-0.9.5_stdc++98.patch</Patch>
</Patches>
</Source>
<Package>