summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRiley Trautman2015-07-09 19:00:14 -0500
committerRiley Trautman2015-07-09 19:00:14 -0500
commit5b084e38e132b5e2d51541d632bff0f67195457e (patch)
tree546be38c19e1ce8e5e877e78bbbeb28182c948ba
parent141beffe51944a55b4a58a72f4482dad5bc29084 (diff)
downloadaur-5b084e38e132b5e2d51541d632bff0f67195457e.tar.gz
Updated to v5.5.0.beta1.362.gec8c1dc
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ad2705a06dfc..0976c3b1ee60 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -31,6 +31,7 @@ pkgbase = qt5-base-git
optdepends = libfbclient: Firebird/iBase driver
provides = qt5-base
conflicts = qt5-base
+ conflicts = qtchooser
source = qt5-base::git://code.qt.io/qt/qtbase.git#branch=5.5
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 4e885d3f7c57..f206043bdf11 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,7 +25,7 @@ optdepends=(
"libfbclient: Firebird/iBase driver"
)
provides=("$_pkgname")
-conflicts=("$_pkgname")
+conflicts=("$_pkgname" "qtchooser")
source=("$_pkgname::git://code.qt.io/qt/qtbase.git#branch=5.5")
sha256sums=("SKIP")