summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheCynicalLiger2021-01-03 21:56:05 +0000
committerTheCynicalLiger2021-01-03 21:56:05 +0000
commita31eaecb0ac0839cbe94406c4b7d6189b302e495 (patch)
tree048417289fe3bdc00e7fc748ed80d1758b5a0044
parenta39c7dd92aaf766c86955916270cbe5fd16d3e6d (diff)
downloadaur-a31eaecb0ac0839cbe94406c4b7d6189b302e495.tar.gz
fixed conflicts
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 2 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c258b78e87f2..33ea891b71c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,6 +9,7 @@ pkgbase = qt6gtk2
depends = qt6-svg
depends = qt6-base
depends = gtk2
+ conflicts = qt6gtk2-git
source = qt6gtk2-0.1.tar.gz::https://github.com/trialuser02/qt6gtk2/releases/download/0.1/qt6gtk2-0.1.tar.xz
sha256sums = 8974459b5000d5443847faf833a9ad13d7928fcc8677ed5714e8107b18b18719
diff --git a/PKGBUILD b/PKGBUILD
index ad8edad73146..399606c3291b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,6 +7,7 @@ pkgdesc='GTK+2.0 integration plugins for Qt6'
arch=(x86_64)
url='https://github.com/trialuser02/qt6gtk2'
license=(GPL2)
+conflicts=($pkgname-git)
depends=(qt6-svg qt6-base gtk2)
makedepends=(qt6-tools)
source=("${pkgname}-$pkgver.tar.gz::${url}/releases/download/$pkgver/$pkgname-$pkgver.tar.xz")