summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorjustforlxz2021-04-02 11:16:11 +0800
committerjustforlxz2021-04-02 11:16:11 +0800
commit22fd8dd145a707ac20c174ad5525c405008edafa (patch)
treefbac0daab55cf80a525d556799e00704aafae2d8
parent19c3479163cde6c736731aa9ddb9ea8c79a29e45 (diff)
downloadaur-22fd8dd145a707ac20c174ad5525c405008edafa.tar.gz
upgpkg: 5.5.2.r1.g5a27b3b
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD5
2 files changed, 9 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 68c4406fa5d9..f0d5f5ff603b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = dtkcommon-git
pkgdesc = DTK common modules
- pkgver = 5.5.2.r0.g3d8ba1c
+ pkgver = 5.5.2.r1.g5a27b3b
pkgrel = 1
url = https://github.com/linuxdeepin/dtkcommon
arch = x86_64
@@ -9,6 +9,10 @@ pkgbase = dtkcommon-git
makedepends = git
makedepends = qt5-tools
makedepends = gtest
+ conflicts = dtkcore-git<5.4.0
+ conflicts = dtkcore<5.4.0
+ conflicts = dtkgui-git<5.4.0
+ conflicts = dtkgui<5.4.0
source = dtkcommon-git::git://github.com/linuxdeepin/dtkcommon.git
sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index f3d40447145b..7108af919e5c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: justforlxz <justforlxz@gmail.com>
pkgname=dtkcommon-git
-pkgver=5.5.2.r0.g3d8ba1c
+pkgver=5.5.2.r1.g5a27b3b
pkgrel=1
pkgdesc='DTK common modules'
arch=('x86_64')
@@ -9,6 +9,8 @@ url="https://github.com/linuxdeepin/dtkcommon"
license=('LGPL3')
depends=()
makedepends=('git' 'qt5-tools' 'gtest')
+conflicts=('dtkcore-git<5.4.0' 'dtkcore<5.4.0' 'dtkgui-git<5.4.0' 'dtkgui<5.4.0')
+providers=('dtkcore-git' 'dtkgui-git')
groups=('deepin-git')
source=("$pkgname::git://github.com/linuxdeepin/dtkcommon.git")
sha512sums=('SKIP')
@@ -16,6 +18,7 @@ sha512sums=('SKIP')
pkgver() {
cd $pkgname
git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+ sed -i 's/qt5/qt/g' dtkcommon.pro
}
build() {