Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2021-05-01 10:24:58 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2021-05-01 10:24:58 +0200
commite8e846ad2531505e6263acaf16b12707fa1ed8bf (patch)
treeeb40db54e6bd97bc2ac79fdd9548597e9618992f
parent60a48044e3ed5fc05444d0261a269d04f2852e7a (diff)
community/gdal: ignore mariadb for 486
-rw-r--r--community/gdal/PKGBUILD0
-rw-r--r--extra/opencv/PKGBUILD22
2 files changed, 22 insertions, 0 deletions
diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/community/gdal/PKGBUILD
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index 016cb273..499054e4 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,2 +1,24 @@
# temporary workaround for FS#70653
sha256sums[0]='ae258ed50aa039279c3d36afdea5c6ecf762515836b27871a8957c610d0424f8'
+
+# no Java yet on i486
+if [ "$CARCH" = 'i486' ]; then
+ makedepends=(${makedepends[@]//java-environment/})
+ eval "$(
+ declare -f build | \
+ sed '
+ /JAVA_HOME/d
+ '
+ )
+ "
+ eval "$(
+ declare -f package_opencv | \
+ sed '
+ /ln.*java/d
+ '
+ )
+ "
+fi
+
+# Qt6 (lrelease) is linked against icu68, icu 69 is current version
+makedepends+=(icu68)