summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO36
-rw-r--r--PKGBUILD53
2 files changed, 48 insertions, 41 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 012f3228b19e..a922c97520aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,33 @@
pkgbase = kwindowsystem-git
- pkgdesc = KWindowSystem
- pkgver = v4.100.0.rc1.r413.gfa31de1
- pkgrel = 1
- url = https://projects.kde.org/projects/frameworks/kwindowsystem
- arch = i686
+ pkgdesc = Access to the windowing system
+ pkgver = 6.0.0_r1009.g827ff06
+ pkgrel = 4
+ url = https://community.kde.org/Frameworks
arch = x86_64
- groups = kf5
- license = LGPL
- makedepends = extra-cmake-modules-git
+ groups = kf6-git
+ license = LGPL-2.0-only
+ license = LGPL-3.0-only
makedepends = git
- makedepends = qt5-tools
- depends = qt5-x11extras
+ makedepends = doxygen
+ makedepends = extra-cmake-modules-git
+ makedepends = plasma-wayland-protocols-git
+ makedepends = qt6-declarative
+ makedepends = qt6-doc
+ makedepends = qt6-tools
+ makedepends = wayland-protocols
+ depends = gcc-libs
+ depends = glibc
+ depends = libx11
+ depends = libxcb
depends = libxfixes
+ depends = qt6-base
+ depends = qt6-wayland
+ depends = wayland
+ depends = xcb-util-keysyms
+ optdepends = qt6-declarative: QML bindings
provides = kwindowsystem
conflicts = kwindowsystem
source = git+https://github.com/KDE/kwindowsystem.git
- md5sums = SKIP
+ sha256sums = SKIP
pkgname = kwindowsystem-git
-
diff --git a/PKGBUILD b/PKGBUILD
index cc647cea1b1e..41356ac2ecce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,37 @@
-# Maintainer: João Figueiredo <jf dot mundox at gmail dot com>
+# Merged with official ABS kwindowsystem PKGBUILD by João, 2021/02/01 (all respective contributors apply herein)
+# Maintainer: João Figueiredo & chaotic-aur <islandc0der@chaotic.cx>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
pkgname=kwindowsystem-git
-pkgver=v4.100.0.rc1.r413.gfa31de1
-pkgrel=1
-pkgdesc='KWindowSystem'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/frameworks/kwindowsystem'
-license=('LGPL')
-depends=('qt5-x11extras' 'libxfixes')
-makedepends=('extra-cmake-modules-git' 'git' 'qt5-tools')
-groups=('kf5')
-conflicts=(kwindowsystem)
-provides=(kwindowsystem)
-source=('git+https://github.com/KDE/kwindowsystem.git')
-md5sums=('SKIP')
+pkgver=6.0.0_r1009.g827ff06
+pkgrel=4
+pkgdesc='Access to the windowing system'
+arch=($CARCH)
+url='https://community.kde.org/Frameworks'
+license=(LGPL-2.0-only LGPL-3.0-only)
+depends=(gcc-libs glibc libx11 libxcb libxfixes qt6-base qt6-wayland wayland xcb-util-keysyms)
+makedepends=(git doxygen extra-cmake-modules-git plasma-wayland-protocols-git qt6-declarative qt6-doc qt6-tools wayland-protocols)
+optdepends=('qt6-declarative: QML bindings')
+conflicts=(${pkgname%-git})
+provides=(${pkgname%-git})
+groups=(kf6-git)
+source=("git+https://github.com/KDE/${pkgname%-git}.git")
+sha256sums=('SKIP')
pkgver() {
cd ${pkgname%-git}
- git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
- mkdir -p build
+ _ver="$(grep -m1 'set(KF_VERSION' CMakeLists.txt | cut -d '"' -f2 | tr - .)"
+ echo "${_ver}_r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
}
build() {
- cd build
- cmake ../kwindowsystem \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDE_INSTALL_LIBDIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF
- make
+ cmake -B build -S ${pkgname%-git} \
+ -DQT_MAJOR_VERSION=6 \
+ -DBUILD_TESTING=OFF \
+ -DBUILD_QCH=ON
+ cmake --build build
}
package() {
- cd build
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" cmake --install build
}