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

Merge pull request #11889 from Rmys/master

Browse Source 
podofo revert
This commit is contained in:
Rmys
2023-05-18 00:11:26 +03:00
committed by GitHub
parent 79e52fd734 53c711c443
commit 8af11d98ed
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()
office/misc/podofo/pspec.xml
+10 -3
View File
@@ -14,7 +14,7 @@
<IsA>app:console</IsA>
<Summary>A library to work with the PDF file format</Summary>
<Description>The PoDoFo library is a free, portable C++ library which includes classes to parse PDF files and modify their contents into memory. The changes can be written back to disk easily. The parser can also be used to extract information from a PDF file (for example the parser could be used in a PDF viewer). Besides parsing PoDoFo includes also very simple classes to create your own PDF files. All classes are documented so it is easy to start writing your own application using PoDoFo.</Description>
<Archive sha1sum="0f2d88629a8668c3e7e6668a31081c168d00137e" type="targz">https://github.com/podofo/podofo/archive/refs/tags/0.10.0.tar.gz</Archive>
<Archive sha1sum="a83d825088a67cdfc4b118af9dd31fb72f388741" type="targz">https://github.com/podofo/podofo/archive/refs/tags/0.9.8.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>zlib-devel</Dependency>
@@ -31,8 +31,8 @@
<Dependency>libxml2-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.4-freetype.patch</Patch>
<Patch level="1">podofo-gcc12.patch</Patch>
<!-- <Patch level="1">podofo-0.9.5_stdc++98.patch</Patch> -->
</Patches>
</Source>
@@ -75,6 +75,13 @@
</Package>
<History>
<Update release="8">
<Date>2023-05-17</Date>
<Version>0.9.8</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="7">
<Date>2023-05-14</Date>
<Version>0.10.0</Version>