diff --git a/dev-libs/librevenge/librevenge-0.0.4.recipe b/dev-libs/librevenge/librevenge-0.0.5.recipe similarity index 89% rename from dev-libs/librevenge/librevenge-0.0.4.recipe rename to dev-libs/librevenge/librevenge-0.0.5.recipe index 99a882fe8..57f8036e8 100644 --- a/dev-libs/librevenge/librevenge-0.0.4.recipe +++ b/dev-libs/librevenge/librevenge-0.0.5.recipe @@ -10,15 +10,14 @@ COPYRIGHT="2004-2015 Fridrich Strba 2011-2015 Laurent Alonso" LICENSE="GNU LGPL v2.1 MPL v2.0" -REVISION="6" +REVISION="1" SOURCE_URI="https://downloads.sf.net/libwpd/librevenge-$portVersion.tar.bz2" -CHECKSUM_SHA256="c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf" -PATCHES="librevenge-$portVersion.patchset" +CHECKSUM_SHA256="5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="0.0.4" +libVersion="0.0.5" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -44,8 +43,8 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libboost_serialization$secondaryArchSuffix - devel:libboost_system$secondaryArchSuffix + devel:libboost_serialization$secondaryArchSuffix >= 1.70.0 + devel:libboost_system$secondaryArchSuffix >= 1.70.0 devel:libcppunit$secondaryArchSuffix devel:libz$secondaryArchSuffix " diff --git a/dev-libs/librevenge/patches/librevenge-0.0.4.patchset b/dev-libs/librevenge/patches/librevenge-0.0.4.patchset deleted file mode 100644 index ddc44318c..000000000 --- a/dev-libs/librevenge/patches/librevenge-0.0.4.patchset +++ /dev/null @@ -1,21 +0,0 @@ -From ffb95dc0820c46ce05ac1c6a33a72b6d4efcc9c2 Mon Sep 17 00:00:00 2001 -From: begasus -Date: Thu, 13 Sep 2018 15:35:02 +0200 -Subject: gcc7 fails on missing [[fallthrough]]; - - -diff --git a/src/lib/RVNGZipStream.cpp b/src/lib/RVNGZipStream.cpp -index b15eac5..f5081a5 100644 ---- a/src/lib/RVNGZipStream.cpp -+++ b/src/lib/RVNGZipStream.cpp -@@ -478,6 +478,7 @@ RVNGInputStream *RVNGZipStream::getSubstream(RVNGInputStream *input, const char - // TODO: return partial result on Z_BUF_ERROR/Z_DATA_ERROR? - default: - data.clear(); -+ [[fallthrough]]; - // fall-through intended - case Z_STREAM_END: - done = true; --- -2.19.0 -