diff --git a/app-arch/brotli/brotli-1.0.7.recipe b/app-arch/brotli/brotli-1.0.9.recipe similarity index 90% rename from app-arch/brotli/brotli-1.0.7.recipe rename to app-arch/brotli/brotli-1.0.9.recipe index 516ba95b3..0d9850a70 100644 --- a/app-arch/brotli/brotli-1.0.7.recipe +++ b/app-arch/brotli/brotli-1.0.9.recipe @@ -9,8 +9,13 @@ COPYRIGHT="2009, 2010, 2013-2018 Brotli Authors" LICENSE="MIT" REVISION="1" SOURCE_URI="https://github.com/google/brotli/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="4c61bfb0faca87219ea587326c467b95acb25555b53d1a421ffa3c8a9296ee2c" +# Testdata missing in Tarball, see https://github.com/google/brotli/issues/850 +# For tests 1/ use the git URL +# 2/ add --worktree-attributes to 'git archive' in HaikuPorter/SourceFetcher.py +#SOURCE_URI="git+${HOMEPAGE}.git#v$portVersion" +CHECKSUM_SHA256="f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46" SOURCE_FILENAME="brotli-$portVersion.tar.gz" +PATCHES="brotli-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -72,7 +77,7 @@ fi # gcc2 does not support the flags passed by python3 if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then PYTHON_PACKAGES+=(python3) - PYTHON_VERSIONS+=(3.6) + PYTHON_VERSIONS+=(3.7) PYTHON_LIBSUFFIXES+=(m) BUILD_REQUIRES+=" setuptools_python3 diff --git a/app-arch/brotli/patches/brotli-1.0.9.patchset b/app-arch/brotli/patches/brotli-1.0.9.patchset new file mode 100644 index 000000000..f771a0920 --- /dev/null +++ b/app-arch/brotli/patches/brotli-1.0.9.patchset @@ -0,0 +1,44 @@ +From 649862e0942420cbbf58d799f2df247f401a3f0a Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Mon, 19 Oct 2020 17:31:53 +0200 +Subject: fix pkgconfig scripts regression + + +diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in +index 10ca969..2a8cf7a 100644 +--- a/scripts/libbrotlicommon.pc.in ++++ b/scripts/libbrotlicommon.pc.in +@@ -7,5 +7,5 @@ Name: libbrotlicommon + URL: https://github.com/google/brotli + Description: Brotli common dictionary library + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -R${libdir} -lbrotlicommon ++Libs: -L${libdir} -lbrotlicommon + Cflags: -I${includedir} +diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in +index e7c3124..6f8ef2e 100644 +--- a/scripts/libbrotlidec.pc.in ++++ b/scripts/libbrotlidec.pc.in +@@ -7,6 +7,6 @@ Name: libbrotlidec + URL: https://github.com/google/brotli + Description: Brotli decoder library + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -R${libdir} -lbrotlidec ++Libs: -L${libdir} -lbrotlidec + Requires.private: libbrotlicommon >= 1.0.2 + Cflags: -I${includedir} +diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in +index 4dd0811..2098afe 100644 +--- a/scripts/libbrotlienc.pc.in ++++ b/scripts/libbrotlienc.pc.in +@@ -7,6 +7,6 @@ Name: libbrotlienc + URL: https://github.com/google/brotli + Description: Brotli encoder library + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -R${libdir} -lbrotlienc ++Libs: -L${libdir} -lbrotlienc + Requires.private: libbrotlicommon >= 1.0.2 + Cflags: -I${includedir} +-- +2.28.0 +