Add fix for segfault in wayland. Update license and cmake commands.

2 files changed, 19 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 34352d6f76d0..7533fa9d64df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,19 @@
 pkgbase = qhotkey
 	pkgdesc = Library for creating global shortcut/hotkey for desktop Qt6 applications
 	pkgver = 1.5.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/Skycoder42/QHotkey/
 	arch = x86_64
-	license = BSD
+	license = BSD-3-Clause
 	makedepends = cmake
 	makedepends = libx11
 	makedepends = qt5-base
 	makedepends = qt5-x11extras
 	makedepends = qt6-base
 	source = https://github.com/Skycoder42/QHotkey/archive/1.5.0/qhotkey-1.5.0.tar.gz
+	source = 010-qhotkey-fix-segfault-under-wayland.patch::https://github.com/Skycoder42/QHotkey/pull/96.patch
 	sha256sums = e8ca5ba77ad04662c18dce8de4b37b373bcb693a7e062fca3d832bf63473b143
+	sha256sums = acac579950e7a160f396387f9fdcb8b7964a1e1ae7a38f13c636e2121536b15c
 
 pkgname = qhotkey-qt6
 	depends = libx11
diff --git a/PKGBUILD b/PKGBUILD
index 1dbeb0e4629c..694201367698 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,17 +3,24 @@
 pkgbase=qhotkey
 pkgname=('qhotkey-qt6' 'qhotkey-qt5')
 pkgver=1.5.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Library for creating global shortcut/hotkey for desktop Qt6 applications'
 arch=('x86_64')
 url='https://github.com/Skycoder42/QHotkey/'
-license=('BSD')
+license=('BSD-3-Clause')
 makedepends=('cmake' 'libx11' 'qt5-base' 'qt5-x11extras' 'qt6-base')
-source=("https://github.com/Skycoder42/QHotkey/archive/${pkgver}/qhotkey-${pkgver}.tar.gz")
-sha256sums=('e8ca5ba77ad04662c18dce8de4b37b373bcb693a7e062fca3d832bf63473b143')
+source=("https://github.com/Skycoder42/QHotkey/archive/${pkgver}/qhotkey-${pkgver}.tar.gz"
+        '010-qhotkey-fix-segfault-under-wayland.patch'::'https://github.com/Skycoder42/QHotkey/pull/96.patch')
+sha256sums=('e8ca5ba77ad04662c18dce8de4b37b373bcb693a7e062fca3d832bf63473b143'
+            'acac579950e7a160f396387f9fdcb8b7964a1e1ae7a38f13c636e2121536b15c')
+
+prepare() {
+    patch -d "QHotkey-${pkgver}" -Np1 -i "${srcdir}/010-qhotkey-fix-segfault-under-wayland.patch"
+}
 
 build() {
     local -a _common_opts=(
+        '-GUnix Makefiles' \
         '-DCMAKE_BUILD_TYPE:STRING=None'
         '-DCMAKE_INSTALL_PREFIX:PATH=/usr'
         '-DBUILD_SHARED_LIBS:BOOL=ON'
@@ -24,19 +31,19 @@ build() {
         -DCMAKE_INSTALL_LIBDIR:PATH='lib/qhotkey-qt6' \
         -DQT_DEFAULT_MAJOR_VERSION:STRING='6' \
         "${_common_opts[@]}"
-    make -C build-qt6
+    cmake --build build-qt6
     
     cmake -B build-qt5 -S "QHotkey-${pkgver}" \
         -DCMAKE_INSTALL_INCLUDEDIR:PATH='include/qhotkey-qt5' \
         -DCMAKE_INSTALL_LIBDIR:PATH='lib/qhotkey-qt5' \
         "${_common_opts[@]}"
-    make -C build-qt5
+    cmake --build build-qt5
 }
 
 package_qhotkey-qt6() {
     depends=('libx11' 'qt6-base')
     
-    make -C build-qt6 DESTDIR="$pkgdir" install
+    DESTDIR="$pkgdir" cmake --install build-qt6
     install -D -m644 "QHotkey-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
     
     # create symlinks on the default paths, for the Qt6 library to be the default one
@@ -60,6 +67,6 @@ package_qhotkey-qt5() {
     pkgdesc="$(sed '/Qt6/s/6/5/' <<< "$pkgdesc")"
     depends=('libx11' 'qt5-base' 'qt5-x11extras')
     
-    make -C build-qt5 DESTDIR="$pkgdir" install
+    DESTDIR="$pkgdir" cmake --install build-qt5
     install -D -m644 "QHotkey-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }