update

2 files changed, 21 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 32ae85402313..4172cde478b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = dtkcommon-git
 	pkgdesc = DTK common modules
-	pkgver = 5.5.20.r3.g71cf434
+	pkgver = 5.5.23.r18.gb7830a3
 	pkgrel = 1
 	url = https://github.com/linuxdeepin/dtkcommon
 	arch = x86_64
@@ -11,12 +11,10 @@ pkgbase = dtkcommon-git
 	makedepends = qt5-tools
 	makedepends = gtest
 	makedepends = gmock
-	conflicts = dtkcore-git<5.4.0
-	conflicts = dtkcore<5.4.0
-	conflicts = dtkgui-git<5.4.0
-	conflicts = dtkgui<5.4.0
+	makedepends = cmake
+	makedepends = ninja
 	conflicts = dtkcommon
-	source = dtkcommon-git::git+https://github.com/linuxdeepin/dtkcommon.git
-	sha512sums = SKIP
+	source = dtkcommon.tar.gz::https://github.com/linuxdeepin/dtkcommon/archive/b7830a3221c99cc7715675ecfaed2a04388f8af6.tar.gz
+	sha512sums = ea89005ac7de534a7d63dce9dda00aa485cdae3e337997cea01a8b624aad3c6f0676a8bc1127dbfc251fee4b6363deb10a3bb4b36366420aee8be97d2b34f17d
 
 pkgname = dtkcommon-git
diff --git a/PKGBUILD b/PKGBUILD
index 076e9572ee22..448c96f07e64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,32 @@
 # Maintainer: justforlxz <justforlxz@gmail.com>
 
 pkgname=dtkcommon-git
-pkgver=5.5.20.r3.g71cf434
+_pkgname=dtkcommon
+_commit=b7830a3221c99cc7715675ecfaed2a04388f8af6
+pkgver=5.5.23.r18.gb7830a3
 pkgrel=1
 pkgdesc='DTK common modules'
 arch=('x86_64' 'aarch64')
 url="https://github.com/linuxdeepin/dtkcommon"
 license=('LGPL3')
 depends=()
-makedepends=('git' 'qt5-tools' 'gtest' 'gmock')
-conflicts=('dtkcore-git<5.4.0' 'dtkcore<5.4.0' 'dtkgui-git<5.4.0' 'dtkgui<5.4.0' 'dtkcommon')
-providers=('dtkcore-git' 'dtkgui-git')
+makedepends=('git' 'qt5-tools' 'gtest' 'gmock' 'cmake' 'ninja')
+conflicts=('dtkcommon')
+providers=('dtkcommon')
 groups=('deepin-git')
-source=("$pkgname::git+https://github.com/linuxdeepin/dtkcommon.git")
-sha512sums=('SKIP')
-
-pkgver() {
-    cd $pkgname
-    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-    sed -i 's/qt5/qt/g' dtkcommon.pro
-}
-
-prepare() {
-    cd $pkgname
-    if [[ ! -z ${sha} ]];then
-      git checkout -b $sha
-    fi
-}
+source=("$_pkgname.tar.gz::https://github.com/linuxdeepin/dtkcommon/archive/$_commit.tar.gz")
+sha512sums=('ea89005ac7de534a7d63dce9dda00aa485cdae3e337997cea01a8b624aad3c6f0676a8bc1127dbfc251fee4b6363deb10a3bb4b36366420aee8be97d2b34f17d')
 
 build() {
-  cd $pkgname
-  qmake-qt5 PREFIX=/usr DTK_VERSION=$pkgver LIB_INSTALL_DIR=/usr/lib
-  make
+  cd $_pkgname-$_commit
+  cmake -GNinja \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+    -DLINUXNAME="archlinux" \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  ninja
 }
 
 package() {
-  cd $pkgname
-  make INSTALL_ROOT="$pkgdir" install
+  cd $_pkgname-$_commit
+  DESTDIR="$pkgdir" ninja install
 }