summaryrefslogtreecommitdiff
path: root/extra/libjpeg-turbo
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2020-11-27 07:35:37 +0100
committerAndreas Baumann <mail@andreasbaumann.cc>2020-11-27 07:35:37 +0100
commitfb5e72bd10e971598cc2634bc94012b1081b3466 (patch)
tree8c1d663284c7ef0db0e48d5166a55c9f6c980468 /extra/libjpeg-turbo
parent3bf00d7a361194a60a5064fff5178c6be96700ab (diff)
downloadpackages-fb5e72bd10e971598cc2634bc94012b1081b3466.tar.xz
extra/libjpeg-turbo: fix for java (i486) and illegal gpg keys
Diffstat (limited to 'extra/libjpeg-turbo')
-rw-r--r--extra/libjpeg-turbo/PKGBUILD11
1 files changed, 8 insertions, 3 deletions
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
+