podofo: bump, debuginfo (#3611)

This commit is contained in:
miqlas
2019-04-12 10:07:49 +02:00
committed by Jérôme Duval
parent 74dcde75bf
commit f28049c576
2 changed files with 29 additions and 26 deletions

View File

@@ -1,14 +1,14 @@
From 57c02713fc1fa6084d347cd21f8c1f1fb5aeb4f4 Mon Sep 17 00:00:00 2001
From 5785180af2325c301b98ce93adcb11eccad1747a Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 6 Jan 2016 13:57:24 +0000
Subject: haiku patch
diff --git a/src/base/PdfFiltersPrivate.cpp b/src/base/PdfFiltersPrivate.cpp
index e564df8..737a972 100644
index 01fec67..5a2d056 100644
--- a/src/base/PdfFiltersPrivate.cpp
+++ b/src/base/PdfFiltersPrivate.cpp
@@ -925,7 +925,7 @@ void PdfDCTFilter::EndDecodeImpl()
@@ -928,7 +928,7 @@ void PdfDCTFilter::EndDecodeImpl()
jpeg_memory_src ( &m_cinfo, reinterpret_cast<JOCTET*>(m_buffer.GetBuffer()), m_buffer.GetSize() );
@@ -17,7 +17,7 @@ index e564df8..737a972 100644
{
(void) jpeg_destroy_decompress(&m_cinfo);
@@ -1056,7 +1056,7 @@ fill_input_buffer (j_decompress_ptr cinfo)
@@ -1059,7 +1059,7 @@ fill_input_buffer (j_decompress_ptr cinfo)
src->pub.next_input_byte = src->eoi_buffer;
src->pub.bytes_in_buffer = 2;
@@ -49,28 +49,28 @@ index 8cd712a..23972b5 100644
(void) jpeg_destroy_decompress(&cinfo);
--
2.19.0
2.19.1
From 4e19557010e7ef77f39b616b4086809717fce4b1 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Thu, 13 Sep 2018 10:20:09 +0200
Subject: use -std=c++11
From a9630f963722a0a301c167462ab63671d641683b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Mon, 4 Feb 2019 19:47:48 +0100
Subject: Build fix
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d804426..939ae56 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -296,7 +296,7 @@ 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} -std=c++11")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Woverloaded-virtual -Wswitch-enum -Wcast-qual -Wwrite-strings -Wredundant-decls -Wreorder")
diff --git a/test/unit/ParserTest.cpp b/test/unit/ParserTest.cpp
index ee01d4a..d0014cd 100644
--- a/test/unit/ParserTest.cpp
+++ b/test/unit/ParserTest.cpp
@@ -2037,7 +2037,7 @@ bool ParserTest::canOutOfMemoryKillUnitTests()
#elif defined( __linux__ )
// TODO do big allocs succeed then trigger OOM-killer fiasco??
bool bCanTerminateProcess = false;
-#elif
+#else
// other systems - assume big allocs faily gracefully and throw bad_alloc
bool bCanTerminateProcess = false;
#endif
--
2.19.0
2.19.1

View File

@@ -7,15 +7,15 @@ COPYRIGHT="2005-2014 Dominik Seichter
2008 Craig Ringer"
LICENSE="GNU GPL v2
GNU LGPL v2.1"
REVISION="5"
REVISION="1"
SOURCE_URI="https://sourceforge.net/projects/podofo/files/podofo/$portVersion/podofo-$portVersion.tar.gz"
CHECKSUM_SHA256="854981cb897ebc14bac854ea0f25305372261a48a205363fe1c61659ba7b5304"
CHECKSUM_SHA256="e9163650955ab8e4b9532e7aa43b841bac45701f7b0f9b793a98c8ca3ef14072"
PATCHES="podofo-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
libVersion="0.9.5"
libVersion="$portVersion"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
if [ $targetArchitecture != x86_gcc2 ]; then
@@ -85,6 +85,9 @@ BUILD_PREREQUIRES="
cmd:sed
"
defineDebugInfoPackage podofo$secondaryArchSuffix \
$libDir/libpodofo.so.$libVersion
PATCH()
{
headersDir=