From 95afec5e96645155608a1ea9c49a43739a5c8e45 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Thu, 31 Oct 2019 01:55:45 +0300 Subject: [PATCH] libpagemaker: build with newer boost --- .../libpagemaker/libpagemaker-0.0.4.recipe | 5 +-- .../patches/libpagemaker-0.0.4.patchset | 31 +++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 media-libs/libpagemaker/patches/libpagemaker-0.0.4.patchset diff --git a/media-libs/libpagemaker/libpagemaker-0.0.4.recipe b/media-libs/libpagemaker/libpagemaker-0.0.4.recipe index 9b25bba13..cae71e011 100644 --- a/media-libs/libpagemaker/libpagemaker-0.0.4.recipe +++ b/media-libs/libpagemaker/libpagemaker-0.0.4.recipe @@ -8,9 +8,10 @@ COPYRIGHT="2013-2014, 2017 Fridrich Štrba 2014 Brennan Vincent 2014-2018 David Tardon" LICENSE="MPL v2.0" -REVISION="1" +REVISION="2" SOURCE_URI="https://dev-www.libreoffice.org/src/libpagemaker/libpagemaker-$portVersion.tar.xz" CHECKSUM_SHA256="66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d" +PATCHES="libpagemaker-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -51,7 +52,7 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libboost_system$secondaryArchSuffix + devel:libboost_system$secondaryArchSuffix >= 1.69.0 devel:librevenge_0.0$secondaryArchSuffix devel:libz$secondaryArchSuffix " diff --git a/media-libs/libpagemaker/patches/libpagemaker-0.0.4.patchset b/media-libs/libpagemaker/patches/libpagemaker-0.0.4.patchset new file mode 100644 index 000000000..32e305d0d --- /dev/null +++ b/media-libs/libpagemaker/patches/libpagemaker-0.0.4.patchset @@ -0,0 +1,31 @@ +From 87b6afa177096ffeea16eef401208c99dd6a2f9e Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Thu Feb 01 16:48:35 2018 +0100 +Subject: WaE: catching polymorphic type by value + + +diff --git a/src/lib/PMDParser.cpp b/src/lib/PMDParser.cpp +index 481f6bf..d5378f2 100644 +--- a/src/lib/PMDParser.cpp ++++ b/src/lib/PMDParser.cpp +@@ -852,7 +852,7 @@ void PMDParser::parseHeader(uint32_t *tocOffset, uint16_t *tocLength) + *tocLength = readU16(m_input, m_bigEndian); + PMD_DEBUG_MSG(("[Header] TOC length is %d\n", *tocLength)); + } +- catch (PMDStreamException) ++ catch (const PMDStreamException &) + { + throw PMDParseException("Can't find the table of contents length in the header."); + } +@@ -862,7 +862,7 @@ void PMDParser::parseHeader(uint32_t *tocOffset, uint16_t *tocLength) + *tocOffset = readU32(m_input, m_bigEndian); + PMD_DEBUG_MSG(("[Header] TOC offset is 0x%x\n", *tocOffset)); + } +- catch (PMDStreamException) ++ catch (const PMDStreamException &) + { + throw PMDParseException("Can't find the table of contents offset in the header."); + } +-- +2.23.0 +