summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntonio Rojas2020-08-07 11:08:29 +0200
committerAntonio Rojas2020-08-07 11:08:29 +0200
commit68f8c73f2733ed83da8aac42fafc2ce3e2908120 (patch)
tree102525ec4514b6765dc0ffd8653d216a038d3d23
parent3ba56ed22f63ad178e3c1a3eb0fa18a801f17e04 (diff)
downloadaur-qt6-declarative-git.tar.gz
Switch to cmake
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD19
2 files changed, 12 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 322bd2355280..88a1595eb4de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = qt6-declarative-git
pkgdesc = Classes for QML and JavaScript languages
- pkgver = 5.15.0.alpha1.r248.g48deaf9a3e
+ pkgver = 5.15.0.r1160.geb2ac8dadf
pkgrel = 1
url = https://www.qt.io
arch = x86_64
@@ -9,10 +9,14 @@ pkgbase = qt6-declarative-git
license = LGPL3
license = FDL
license = custom
+ makedepends = cmake
makedepends = python
makedepends = vulkan-headers
+ makedepends = at-spi2-core
makedepends = git
depends = qt6-base-git
+ provides = qt6-declarative
+ conflicts = qt6-declarative
source = git+https://code.qt.io/qt/qtdeclarative.git#branch=dev
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 6dd963db987b..01f7cb820dfa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,17 @@
# Contributor: Andrea Scarpino <andrea@archlinux.org>
pkgname=qt6-declarative-git
-pkgver=5.15.0.alpha1.r248.g48deaf9a3e
+pkgver=5.15.0.r1160.geb2ac8dadf
pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
pkgdesc='Classes for QML and JavaScript languages'
depends=(qt6-base-git)
-makedepends=(python vulkan-headers git)
+makedepends=(cmake python vulkan-headers at-spi2-core git)
groups=(qt6)
+conflicts=(qt6-declarative)
+provides=(qt6-declarative)
source=(git+https://code.qt.io/qt/qtdeclarative.git#branch=dev)
sha256sums=('SKIP')
@@ -20,20 +22,13 @@ pkgver() {
git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
-prepare() {
- mkdir -p build
-}
-
build() {
- cd build
-
- qmake-qt6 ../qtdeclarative QMAKE_SYNCQT=/usr/bin/syncqt.pl-qt6
- make
+ cmake -B build -S qtdeclarative
+ cmake --build build
}
package() {
- cd build
- make INSTALL_ROOT="$pkgdir" install
+ DESTDIR="$pkgdir" cmake --install build
mkdir "$pkgdir"/usr/bin
for b in "${pkgdir}"/usr/lib/qt6/bin/*; do