git » libaccounts-qt.git » commit 2c54dfc

Revert "upgpkg: 1.16-4: Build with Qt6 in kde-unstable"

author Antonio Rojas
2023-12-22 07:35:27 UTC
committer Antonio Rojas
2023-12-22 07:35:27 UTC
parent 8cb3621928c4790a17c2b24d862d30f5e42e6c62
Revert "upgpkg: 1.16-4: Build with Qt6 in kde-unstable"

This reverts commit 8cb3621928c4790a17c2b24d862d30f5e42e6c62.
.SRCINFO +0 -18
PKGBUILD +12 -16 
diff --git a/.SRCINFO b/.SRCINFO
deleted file mode 100644
index 77efe07..0000000
--- a/.SRCINFO
+++ /dev/null
@@ -1,18 +0,0 @@
-pkgbase = libaccounts-qt
-	pkgdesc = Qt-based client library for accessing the online accounts database
-	pkgver = 1.16
-	pkgrel = 4
-	url = https://gitlab.com/accounts-sso/libaccounts-qt
-	arch = x86_64
-	license = LGPL
-	makedepends = doxygen
-	makedepends = git
-	depends = gcc-libs
-	depends = glib2
-	depends = glibc
-	depends = libaccounts-glib
-	depends = qt6-base
-	source = git+https://gitlab.com/nicolasfella/libaccounts-qt#commit=18557f7def9af8f4a9e0e93e9f575ae11e5066aa
-	sha256sums = SKIP
-
-pkgname = libaccounts-qt
diff --git a/PKGBUILD b/PKGBUILD
index f0f7857..817d706 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,35 +5,31 @@
 pkgname=libaccounts-qt
 pkgdesc='Qt-based client library for accessing the online accounts database'
 pkgver=1.16
-pkgrel=4
+pkgrel=3
 arch=(x86_64)
 url='https://gitlab.com/accounts-sso/libaccounts-qt'
 license=(LGPL)
-depends=(gcc-libs
-         glib2
-         glibc
-         libaccounts-glib
-         qt6-base)
-makedepends=(doxygen
-             git)
-# source=(https://gitlab.com/accounts-sso/libaccounts-qt/-/archive/VERSION_$pkgver/libaccounts-qt-VERSION_$pkgver.tar.gz)
-_commit=18557f7def9af8f4a9e0e93e9f575ae11e5066aa
-source=(git+https://gitlab.com/nicolasfella/libaccounts-qt#commit=$_commit)
-sha256sums=('SKIP')
+depends=(libaccounts-glib qt5-base)
+makedepends=(doxygen)
+conflicts=(libaccounts-qt5)
+provides=(libaccounts-qt5)
+replaces=(libaccounts-qt5)
+source=(https://gitlab.com/accounts-sso/libaccounts-qt/-/archive/VERSION_$pkgver/libaccounts-qt-VERSION_$pkgver.tar.gz)
+sha256sums=('3e527b151ee87e851b0f027214bda1353d8e48e10a5b54109f1e4b7d422a7de3')
 
 prepare() {
-  cd $pkgname
+  cd $pkgname-VERSION_$pkgver
   sed -i 's|SUBDIRS  += Accounts tests|SUBDIRS += Accounts|' accounts-qt.pro
 }
 
 build() {
-  cd $pkgname
-  qmake6 PREFIX=/usr LIBDIR=/usr/lib
+  cd $pkgname-VERSION_$pkgver
+  qmake PREFIX=/usr LIBDIR=/usr/lib
   make
 }
 
 package() {
-  cd $pkgname
+  cd $pkgname-VERSION_$pkgver
   make INSTALL_ROOT="$pkgdir" install
 
 # Remove docs