git » accounts-qml-module.git » commit 97d8943

Revert "upgpkg: 0.7-5: Build with Qt6 in kde-unstable"

author Antonio Rojas
2023-12-22 22:38:55 UTC
committer Antonio Rojas
2023-12-22 22:38:55 UTC
parent 2532f8ae80cd62ee612e33f5544c5ecd4d0e2ef3

Revert "upgpkg: 0.7-5: Build with Qt6 in kde-unstable"

This reverts commit 2532f8ae80cd62ee612e33f5544c5ecd4d0e2ef3.

.SRCINFO +0 -19
PKGBUILD +10 -15

diff --git a/.SRCINFO b/.SRCINFO
deleted file mode 100644
index f144b2f..0000000
--- a/.SRCINFO
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgbase = accounts-qml-module
-	pkgdesc = Expose the Online Accounts API to QML applications
-	pkgver = 0.7
-	pkgrel = 5
-	url = https://gitlab.com/accounts-sso/accounts-qml-module
-	arch = x86_64
-	license = LGPL
-	makedepends = git
-	makedepends = qt6-tools
-	depends = gcc-libs
-	depends = glibc
-	depends = libaccounts-qt
-	depends = qt6-base
-	depends = qt6-declarative
-	depends = signond
-	source = git+https://gitlab.com/accounts-sso/accounts-qml-module#commit=05e79ebbbf3784a87f72b7be571070125c10dfe3
-	sha256sums = SKIP
-
-pkgname = accounts-qml-module
diff --git a/PKGBUILD b/PKGBUILD
index 8edf529..3d58a29 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,32 +2,27 @@
 
 pkgname=accounts-qml-module
 pkgver=0.7
-pkgrel=5
+pkgrel=4
 pkgdesc='Expose the Online Accounts API to QML applications'
 url='https://gitlab.com/accounts-sso/accounts-qml-module'
 arch=(x86_64)
 license=(LGPL)
-depends=(gcc-libs
-         glibc
-         libaccounts-qt
-         qt6-base
-         qt6-declarative
-         signond)
-makedepends=(git
-             qt6-tools)
-# source=(https://gitlab.com/accounts-sso/$pkgname/-/archive/VERSION_$pkgver/$pkgname-VERSION_$pkgver.tar.gz)
-_commit=05e79ebbbf3784a87f72b7be571070125c10dfe3
-source=(git+https://gitlab.com/accounts-sso/accounts-qml-module#commit=$_commit)
-sha256sums=('SKIP')
+depends=(signond libaccounts-qt qt5-declarative)
+makedepends=(qt5-tools)
+source=(https://gitlab.com/accounts-sso/$pkgname/-/archive/VERSION_$pkgver/$pkgname-VERSION_$pkgver.tar.gz
+        accounts-qml-module-qmltypes.patch::https://gitlab.com/accounts-sso/accounts-qml-module/-/commit/678c493a.patch)
+sha256sums=('550a6c684bf4b4f6460a35bac0cf3afbb9090a5cf4038b880c6b86c2e9ea0195'
+            'ae1142ba51f261a9e5c128fcb6c7518c642fc17ce0d908e31e8af14440db9faa')
 
 prepare() {
   mkdir -p build
+  sed -e 's/-Werror//' -i $pkgname-VERSION_$pkgver/common-project-config.pri
+  patch -d $pkgname-VERSION_$pkgver -p1 -i ../accounts-qml-module-qmltypes.patch
 }
 
 build() {
   cd build 
-  qmake6 ../$pkgname/$pkgname.pro \
-    PREFIX=/usr
+  qmake-qt5 ../$pkgname-VERSION_$pkgver/$pkgname.pro PREFIX=/usr
   make
 }