From fb5e72bd10e971598cc2634bc94012b1081b3466 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Fri, 27 Nov 2020 07:35:37 +0100 Subject: extra/libjpeg-turbo: fix for java (i486) and illegal gpg keys --- extra/libjpeg-turbo/PKGBUILD | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'extra/libjpeg-turbo') diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD index 2d315874..e3b65bef 100644 --- a/extra/libjpeg-turbo/PKGBUILD +++ b/extra/libjpeg-turbo/PKGBUILD @@ -1,6 +1,6 @@ # no Java on i486 -makedepends=(${makedepends[@]//jdk8-openjdk/}) -makedepends_i686+=(jdk8-openjdk) +makedepends=(${makedepends[@]//java-environment>11/}) +makedepends_i686+=("java-environment>11") makedepends_pentium4=("${makedepends_i686[@]}") if [ "${CARCH}" = "i486" ]; then @@ -8,7 +8,7 @@ if [ "${CARCH}" = "i486" ]; then eval "$( declare -f build | \ sed ' - s/-DWITH_JAVA=1/-DWITH_JAVA=0/ + s/-DWITH_JAVA=ON/-DWITH_JAVA=OFF/ ' )" @@ -20,3 +20,8 @@ if [ "${CARCH}" = "i486" ]; then ' )" fi + +# broken keys, see upstream FS#68677, solved by +# downloading the key manually and adding it +# manually to the build slaves + -- cgit v1.2.3