summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2021-04-21 20:24:58 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2021-04-21 20:24:58 +0200
commit0ad55ad186698554c9d0125b8c119c0ba2e4b584 (patch)
tree6d27339bb86cec61c6b3af54c9a1070fa1a9f7d9
parent35fe01dff86225d65b97148fd2bee372e99f7ad9 (diff)
downloadpackages-0ad55ad186698554c9d0125b8c119c0ba2e4b584.tar.xz
extra/qt5-tools: added icu68 to fullfil qt5-webkit dependencies
-rw-r--r--extra/qt5-tools/PKGBUILD10
1 files changed, 8 insertions, 2 deletions
diff --git a/extra/qt5-tools/PKGBUILD b/extra/qt5-tools/PKGBUILD
index 02ccc2f5..f66fbf05 100644
--- a/extra/qt5-tools/PKGBUILD
+++ b/extra/qt5-tools/PKGBUILD
@@ -1,2 +1,8 @@
-# break cycle with qt5-webkit (icu68, icu69 mess-up)
-makedepends=(${makedepends[@]//qt5-webkit/})
+# break cycle on i486 with qt5-webkit
+if [ "$CARCH" = 'i486' ]; then
+ makedepends=(${makedepends[@]//qt5-webkit/})
+fi
+
+# qt5-webkit is linked against icu68, icu 69 is current version
+# (breaking linkage)
+makedepends+=(icu68)