From 02033538e7113a8d3380d6e219a8ee47163d1e1e Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 2 Aug 2020 14:54:53 +0200 Subject: [PATCH] Fix issues founds by package builder. --- dev-lang/php/php-5.6.37.recipe | 4 ++-- dev-lang/r/r-3.6.2.recipe | 4 ++-- dev-libs/boost/boost169-1.69.0.recipe | 14 +++++++------- dev-libs/libical/libical-2.0.0.recipe | 10 +++++----- dev-libs/libxml2/libxml2-2.9.10.recipe | 2 +- media-libs/libcdr/libcdr-0.1.5.recipe | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dev-lang/php/php-5.6.37.recipe b/dev-lang/php/php-5.6.37.recipe index 728ba5906..29919478c 100644 --- a/dev-lang/php/php-5.6.37.recipe +++ b/dev-lang/php/php-5.6.37.recipe @@ -36,7 +36,7 @@ REQUIRES=" lib:libcrypto lib:libcurl lib:libfreetype - lib:libicuuc >= 66 + lib:libicuuc lib:libjpeg lib:libnghttp2 lib:libpcre @@ -51,7 +51,7 @@ BUILD_REQUIRES=" devel:libcrypto devel:libcurl devel:libfreetype - devel:libicuuc >= 66 + devel:libicuuc devel:libjpeg devel:libnghttp2 devel:libpcre diff --git a/dev-lang/r/r-3.6.2.recipe b/dev-lang/r/r-3.6.2.recipe index e7a932a63..364232fe0 100644 --- a/dev-lang/r/r-3.6.2.recipe +++ b/dev-lang/r/r-3.6.2.recipe @@ -51,7 +51,7 @@ REQUIRES=" lib:libquadmath$secondaryArchSuffix lib:libreadline$secondaryArchSuffix lib:libssl$secondaryArchSuffix - lib:libtcl8.5$secondaryArchSuffix + lib:libtcl8.6$secondaryArchSuffix lib:libtiff$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -81,7 +81,7 @@ BUILD_REQUIRES=" devel:libquadmath$secondaryArchSuffix devel:libreadline$secondaryArchSuffix devel:libssl$secondaryArchSuffix - devel:libtclstub8.5$secondaryArchSuffix + devel:libtclstub8.6$secondaryArchSuffix devel:libtiff$secondaryArchSuffix devel:libz$secondaryArchSuffix " diff --git a/dev-libs/boost/boost169-1.69.0.recipe b/dev-libs/boost/boost169-1.69.0.recipe index 451637386..544facb41 100644 --- a/dev-libs/boost/boost169-1.69.0.recipe +++ b/dev-libs/boost/boost169-1.69.0.recipe @@ -6,7 +6,7 @@ expressions, and unit testing. It contains over eighty individual libraries." HOMEPAGE="https://www.boost.org/" SOURCE_URI="https://dl.bintray.com/boostorg/release/$portVersion/source/boost_${portVersion//./_}.tar.bz2" CHECKSUM_SHA256="8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406" -REVISION="1" +REVISION="2" LICENSE="Boost v1.0" COPYRIGHT="1998-2018 Beman Dawes, David Abrahams, Rene Rivera, et al." SOURCE_DIR="boost_${portVersion//./_}" @@ -54,9 +54,9 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libbz2$secondaryArchSuffix - lib:libicudata$secondaryArchSuffix - lib:libicui18n$secondaryArchSuffix - lib:libicuuc$secondaryArchSuffix + lib:libicudata$secondaryArchSuffix >= 66 + lib:libicui18n$secondaryArchSuffix >= 66 + lib:libicuuc$secondaryArchSuffix >= 66 lib:libz$secondaryArchSuffix " @@ -111,9 +111,9 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= r1~alpha4_pm_hrev51470 devel:libbz2$secondaryArchSuffix - devel:libicudata$secondaryArchSuffix - devel:libicui18n$secondaryArchSuffix - devel:libicuuc$secondaryArchSuffix + devel:libicudata$secondaryArchSuffix >= 66 + devel:libicui18n$secondaryArchSuffix >= 66 + devel:libicuuc$secondaryArchSuffix >= 66 devel:libz$secondaryArchSuffix " diff --git a/dev-libs/libical/libical-2.0.0.recipe b/dev-libs/libical/libical-2.0.0.recipe index 2255126e0..6466e56af 100644 --- a/dev-libs/libical/libical-2.0.0.recipe +++ b/dev-libs/libical/libical-2.0.0.recipe @@ -7,7 +7,7 @@ HOMEPAGE="http://libical.github.io/libical/" COPYRIGHT="1999-2015 Eric Busboom" LICENSE="MPL v1.0 GNU LGPL v2.1" -REVISION="3" +REVISION="4" SOURCE_URI="https://github.com/libical/libical/releases/download/v$portVersion/libical-$portVersion.tar.gz" CHECKSUM_SHA256="654c11f759c19237be39f6ad401d917e5a05f36f1736385ed958e60cf21456da" PATCHES="libical-$portVersion.patchset" @@ -25,8 +25,8 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - lib:libicui18n$secondaryArchSuffix - lib:libicuuc$secondaryArchSuffix + lib:libicui18n$secondaryArchSuffix >= 66 + lib:libicuuc$secondaryArchSuffix >= 66 " PROVIDES_devel=" @@ -43,8 +43,8 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libicui18n$secondaryArchSuffix - devel:libicuuc$secondaryArchSuffix + devel:libicui18n$secondaryArchSuffix >= 66 + devel:libicuuc$secondaryArchSuffix >= 66 " BUILD_PREREQUIRES=" cmd:cmake diff --git a/dev-libs/libxml2/libxml2-2.9.10.recipe b/dev-libs/libxml2/libxml2-2.9.10.recipe index aca622114..618947f59 100644 --- a/dev-libs/libxml2/libxml2-2.9.10.recipe +++ b/dev-libs/libxml2/libxml2-2.9.10.recipe @@ -10,7 +10,7 @@ available in other environments." HOMEPAGE="http://www.xmlsoft.org/" COPYRIGHT="1998-2013 Daniel Veillard. All Rights Reserved." LICENSE="MIT" -REVISION="1" +REVISION="2" SOURCE_URI="ftp://xmlsoft.org/libxml2/libxml2-$portVersion.tar.gz" CHECKSUM_SHA256="aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f" PATCHES="libxml2-$portVersion.patchset" diff --git a/media-libs/libcdr/libcdr-0.1.5.recipe b/media-libs/libcdr/libcdr-0.1.5.recipe index eb7aea713..dfbecedf0 100644 --- a/media-libs/libcdr/libcdr-0.1.5.recipe +++ b/media-libs/libcdr/libcdr-0.1.5.recipe @@ -24,7 +24,7 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libicui18n$secondaryArchSuffix >= 66 - lib:liblcms2$secondaryArchSuffix >= 66 + lib:liblcms2$secondaryArchSuffix lib:librevenge_0.0$secondaryArchSuffix lib:librevenge_generators_0.0$secondaryArchSuffix lib:librevenge_stream_0.0$secondaryArchSuffix