diff options
| -rw-r--r-- | .SRCINFO | 13 | ||||
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | c2c12fc981458ca59d515dc5d9c007ea78f141ef.patch | 36 | ||||
| -rw-r--r-- | dc4dc54c5ebac7e4b455d8df35076fc044a581a7.patch | 29 |
4 files changed, 8 insertions, 82 deletions
@@ -1,7 +1,7 @@ pkgbase = ckb-next pkgdesc = Corsair Keyboard and Mouse Input Driver, release version - pkgver = 0.4.4 - pkgrel = 5 + pkgver = 0.5.0 + pkgrel = 1 url = https://github.com/ckb-next/ckb-next install = ckb-next.install arch = i686 @@ -24,13 +24,10 @@ pkgbase = ckb-next conflicts = ckb-git conflicts = ckb-git-latest conflicts = ckb-next-git - source = https://github.com/ckb-next/ckb-next/archive/v0.4.4.tar.gz - source = dc4dc54c5ebac7e4b455d8df35076fc044a581a7.patch - source = c2c12fc981458ca59d515dc5d9c007ea78f141ef.patch + source = https://github.com/ckb-next/ckb-next/archive/v0.5.0.tar.gz source = AUR-wrapper::git+https://github.com/ckb-next/AUR-wrapper.git - sha256sums = 6946bd035cdbbbd2f139e543d2ca84ba422176c62c3a3665b544118dc6d618d0 - sha256sums = ca662407404a0b22c3f2706f729717ab73575101247689ce80b7528fea0de87e - sha256sums = 97d56be2873f61d54518e4fa8fdc429ca48a8c5b53ed907ec9abdb08a3bbad0b + sha256sums = 12705aa86cb544a77df6d7a73744f21513bcc6cce805ed8caf5d3b72a950157e sha256sums = SKIP pkgname = ckb-next + @@ -1,8 +1,8 @@ # Maintainer: Tasos Sahanidis <aur@tasossah.com> # Contributor: Light2Yellow <oleksii.vilchanskyi@gmail.com> pkgname=ckb-next -pkgver=0.4.4 -pkgrel=5 +pkgver=0.5.0 +pkgrel=1 pkgdesc="Corsair Keyboard and Mouse Input Driver, release version" arch=('i686' 'x86_64') url="https://github.com/ckb-next/ckb-next" @@ -14,12 +14,8 @@ conflicts=('ckb-git' 'ckb-git-latest' 'ckb-next-git') provides=('ckb-next') install=ckb-next.install source=("https://github.com/ckb-next/$pkgname/archive/v$pkgver.tar.gz" - 'dc4dc54c5ebac7e4b455d8df35076fc044a581a7.patch' - 'c2c12fc981458ca59d515dc5d9c007ea78f141ef.patch' 'AUR-wrapper::git+https://github.com/ckb-next/AUR-wrapper.git') -sha256sums=('6946bd035cdbbbd2f139e543d2ca84ba422176c62c3a3665b544118dc6d618d0' - 'ca662407404a0b22c3f2706f729717ab73575101247689ce80b7528fea0de87e' - '97d56be2873f61d54518e4fa8fdc429ca48a8c5b53ed907ec9abdb08a3bbad0b' +sha256sums=('12705aa86cb544a77df6d7a73744f21513bcc6cce805ed8caf5d3b72a950157e' 'SKIP') build() { @@ -38,8 +34,6 @@ build() { prepare() { cd "$srcdir/${pkgname}-${pkgver}" - patch -p1 -i "$srcdir/dc4dc54c5ebac7e4b455d8df35076fc044a581a7.patch" - patch -p1 -i "$srcdir/c2c12fc981458ca59d515dc5d9c007ea78f141ef.patch" } package() { diff --git a/c2c12fc981458ca59d515dc5d9c007ea78f141ef.patch b/c2c12fc981458ca59d515dc5d9c007ea78f141ef.patch deleted file mode 100644 index 38acc23fd5a4..000000000000 --- a/c2c12fc981458ca59d515dc5d9c007ea78f141ef.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c2c12fc981458ca59d515dc5d9c007ea78f141ef Mon Sep 17 00:00:00 2001 -From: Tasos Sahanidis <tasos@tasossah.com> -Date: Fri, 16 Jul 2021 17:43:52 +0300 -Subject: [PATCH] Fix cmake reconfiguration with quazip 1 - ---- - cmake/modules/FindQuaZip.cmake | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/cmake/modules/FindQuaZip.cmake b/cmake/modules/FindQuaZip.cmake -index 2fe94c12..021ed21e 100644 ---- a/cmake/modules/FindQuaZip.cmake -+++ b/cmake/modules/FindQuaZip.cmake -@@ -20,13 +20,13 @@ - # QuaZip_LIBRARIES - List of QuaZip libraries - # QuaZip_ZLIB_INCLUDE_DIR - The include dir of zlib headers - -+# First try to find QuaZip 1.0 -+find_package(QuaZip-Qt5 QUIET) - - IF (QuaZip_LIBRARIES) - # in cache already - SET(QuaZip_FOUND TRUE) --ELSE (QuaZip_LIBRARIES) -- # First try to find QuaZip 1.0 -- find_package(QuaZip-Qt5 QUIET) -+ELSE () - IF(QuaZip-Qt5_FOUND) - message("-- Found QuaZip: QuaZip::QuaZip") - SET(QuaZip_FOUND TRUE) -@@ -48,4 +48,4 @@ ELSE (QuaZip_LIBRARIES) - SET(QuaZip_INCLUDE_DIRS ${QuaZip_INCLUDE_DIR} ${QuaZip_ZLIB_INCLUDE_DIR}) - find_package_handle_standard_args(QuaZip DEFAULT_MSG QuaZip_LIBRARIES QuaZip_INCLUDE_DIR QuaZip_ZLIB_INCLUDE_DIR QuaZip_INCLUDE_DIRS) - ENDIF () --ENDIF (QuaZip_LIBRARIES) -+ENDIF () diff --git a/dc4dc54c5ebac7e4b455d8df35076fc044a581a7.patch b/dc4dc54c5ebac7e4b455d8df35076fc044a581a7.patch deleted file mode 100644 index 211d5e4ea01e..000000000000 --- a/dc4dc54c5ebac7e4b455d8df35076fc044a581a7.patch +++ /dev/null @@ -1,29 +0,0 @@ -From dc4dc54c5ebac7e4b455d8df35076fc044a581a7 Mon Sep 17 00:00:00 2001 -From: Tasos Sahanidis <tasos@tasossah.com> -Date: Mon, 20 Sep 2021 14:48:18 +0300 -Subject: [PATCH] Don't enable unneeded axes in mouse device - -Specifically, we used to enable HI_RES wheel events without ever -sending any. This breaks scrolling in latest libinput as it expects -us to actually send HI_RES events. ---- - src/daemon/input_linux.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/daemon/input_linux.c b/src/daemon/input_linux.c -index 68cc0ebb..a9ac8c8e 100644 ---- a/src/daemon/input_linux.c -+++ b/src/daemon/input_linux.c -@@ -25,8 +25,10 @@ int uinputopen(struct uinput_user_dev* indev, int mouse){ - ioctl(fd, UI_SET_KEYBIT, i); - // Enable mouse axes - ioctl(fd, UI_SET_EVBIT, EV_REL); -- for(int i = 0; i < REL_CNT; i++) -- ioctl(fd, UI_SET_RELBIT, i); -+ ioctl(fd, UI_SET_RELBIT, REL_X); -+ ioctl(fd, UI_SET_RELBIT, REL_Y); -+ ioctl(fd, UI_SET_RELBIT, REL_WHEEL); -+ ioctl(fd, UI_SET_RELBIT, REL_HWHEEL); - } else { - // Enable common keyboard keys - for(int i = KEY_ESC; i <= KEY_MEDIA; i++) |