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

podofo revert

Browse Source
This commit is contained in:
Rmys
2023-05-18 00:10:29 +03:00
parent f096cc7ace
commit 53c711c443
3 changed files with 43 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
office/misc/podofo/files/podofo-0.9.4-freetype.patch
+6 -6
View File
@@ -1,7 +1,7 @@
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)
diff -rupN --no-dereference podofo-0.9.8/CMakeLists.txt podofo-0.9.8-new/CMakeLists.txt
--- podofo-0.9.8/CMakeLists.txt 2022-05-03 14:18:23.000000000 +0200
+++ podofo-0.9.8-new/CMakeLists.txt 2022-05-03 15:21:08.930832253 +0200
@@ -407,8 +407,8 @@ ENDIF(NOT PODOFO_BUILD_LIB_ONLY)
FIND_PACKAGE(OpenSSL)
@@ -12,10 +12,10 @@ diff -rupN podofo-0.9.4/CMakeLists.txt podofo-0.9.4-new/CMakeLists.txt
FIND_PACKAGE(LIBSTLPORT)
SET(stlport_libraries_if_use_stlport)
@@ -471,7 +471,7 @@ INCLUDE_DIRECTORIES(BEFORE # before tool
@@ -487,7 +487,7 @@ INCLUDE_DIRECTORIES(BEFORE # before tool
INCLUDE_DIRECTORIES(
${PoDoFo_SOURCE_DIR}/src
${PoDoFo_SOURCE_DIR}/src/podofo
- ${FREETYPE_INCLUDE_DIR}
+ ${FREETYPE_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
office/misc/podofo/files/podofo-gcc12.patch
+27
View File
@@ -0,0 +1,27 @@
diff -rupN --no-dereference podofo-0.9.8/test/unit/StringTest.cpp podofo-0.9.8-new/test/unit/StringTest.cpp
--- podofo-0.9.8/test/unit/StringTest.cpp 2019-01-15 14:04:40.000000000 +0100
+++ podofo-0.9.8-new/test/unit/StringTest.cpp 2022-05-03 15:21:09.037838070 +0200
@@ -179,19 +179,19 @@ void StringTest::testUtf16beContructor()
CPPUNIT_ASSERT_EQUAL_MESSAGE( "Comparing UTF8 and UTF16 string converted to UTF8",
strUtf8.GetStringUtf8(), strUtf16.GetStringUtf8() );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "Comparing UTF8 and UTF16 string", strUtf8, strUtf16 );
+// CPPUNIT_ASSERT_EQUAL_MESSAGE( "Comparing UTF8 and UTF16 string", strUtf8, strUtf16 );
// Compare two UTF16 strings
CPPUNIT_ASSERT_EQUAL( strUtf16.GetCharacterLength(), strUtf16b.GetCharacterLength() );
CPPUNIT_ASSERT_EQUAL( strUtf16.GetStringUtf8(), strUtf16b.GetStringUtf8() );
- CPPUNIT_ASSERT_EQUAL( strUtf16, strUtf16b );
+// CPPUNIT_ASSERT_EQUAL( strUtf16, strUtf16b );
}
void StringTest::testWCharConstructor()
{
- CPPUNIT_ASSERT_EQUAL( PdfString("Hallo World"), PdfString(L"Hallo World") );
- CPPUNIT_ASSERT_EQUAL( PdfString(L"Hallo World"), PdfString(L"Hallo World") );
+// CPPUNIT_ASSERT_EQUAL( PdfString("Hallo World"), PdfString(L"Hallo World") );
+// CPPUNIT_ASSERT_EQUAL( PdfString(L"Hallo World"), PdfString(L"Hallo World") );
}
void StringTest::testEscapeBrackets()