diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2021-04-21 19:18:23 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2021-04-21 19:18:23 +0200 |
| commit | 6293ab4267ef388c19c68502b681a874cd2e2019 (patch) | |
| tree | fecefb21c02c37ad3cc0de9805e6f07f9c35eace | |
| parent | 71ac65aa0feb7e8e58edcddf00f000bf41db29e7 (diff) | |
| download | packages-6293ab4267ef388c19c68502b681a874cd2e2019.tar.xz | |
extra/qt5-tools: breaking cycle with qt5-webkit (icu linkage problems)
| -rw-r--r-- | extra/brltty/PKGBUILD | 7 | ||||
| -rw-r--r-- | extra/qt5-tools/PKGBUILD | 6 |
2 files changed, 3 insertions, 10 deletions
diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD index cf6a11f2..3aaa9705 100644 --- a/extra/brltty/PKGBUILD +++ b/extra/brltty/PKGBUILD @@ -3,14 +3,9 @@ if [ "$CARCH" = 'i486' ]; then makedepends=(${makedepends[@]//java-environment/}) fi -# add espeak explicitely on i486 -if [ "$CARCH" = 'i486' ]; then - makedepends+=(espeak) -fi - # no polkit on i486 if [ "$CARCH" = 'i486' ]; then - makedepends=(${makedepends[@]//polkit/}) + depends=(${depends[@]//polkit/}) eval "$( declare -f package | \ sed ' diff --git a/extra/qt5-tools/PKGBUILD b/extra/qt5-tools/PKGBUILD index dfcc0a4a..02ccc2f5 100644 --- a/extra/qt5-tools/PKGBUILD +++ b/extra/qt5-tools/PKGBUILD @@ -1,4 +1,2 @@ -# break cycle on i486 with qt5-webkit -if [ "$CARCH" = 'i486' ]; then - makedepends=(${makedepends[@]//qt5-webkit/}) -fi +# break cycle with qt5-webkit (icu68, icu69 mess-up) +makedepends=(${makedepends[@]//qt5-webkit/}) |