summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD7
-rw-r--r--a9f41cd8b8f5b04c0c66c6d94f96a9725943831e.patch28
3 files changed, 35 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0455c540b22b..189611948000 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ckb-next
pkgdesc = Corsair Keyboard and Mouse Input Driver, release version
pkgver = 0.4.2
- pkgrel = 3
+ pkgrel = 4
url = https://github.com/ckb-next/ckb-next
install = ckb-next.install
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index cab0e1da078e..e2d32dce2c66 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Light2Yellow <oleksii.vilchanskyi@gmail.com>
pkgname=ckb-next
pkgver=0.4.2
-pkgrel=3
+pkgrel=4
pkgdesc="Corsair Keyboard and Mouse Input Driver, release version"
arch=('i686' 'x86_64')
url="https://github.com/ckb-next/ckb-next"
@@ -30,6 +30,11 @@ build() {
cmake --build build --target all
}
+prepare() {
+ cd "$srcdir/${pkgname}-${pkgver}"
+ patch -p1 -i "$srcdir/../a9f41cd8b8f5b04c0c66c6d94f96a9725943831e.patch"
+}
+
package() {
cd "$srcdir/${pkgname}-${pkgver}"
diff --git a/a9f41cd8b8f5b04c0c66c6d94f96a9725943831e.patch b/a9f41cd8b8f5b04c0c66c6d94f96a9725943831e.patch
new file mode 100644
index 000000000000..e070471cdc02
--- /dev/null
+++ b/a9f41cd8b8f5b04c0c66c6d94f96a9725943831e.patch
@@ -0,0 +1,28 @@
+From a9f41cd8b8f5b04c0c66c6d94f96a9725943831e Mon Sep 17 00:00:00 2001
+From: Erik Zeek <zeekec@gmail.com>
+Date: Tue, 12 May 2020 09:56:49 -0600
+Subject: [PATCH] Fix gcc-10/-fno-common error
+
+gcc-10 now defaults to -fno-common and does not automatically add extern
+to variables declared in headers.
+
+https://gcc.gnu.org/gcc-10/porting_to.html
+
+Signed-off-by: Erik Zeek <zeekec@gmail.com>
+---
+ src/daemon/devnode.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/daemon/devnode.h b/src/daemon/devnode.h
+index a0b3a931..349e778d 100644
+--- a/src/daemon/devnode.h
++++ b/src/daemon/devnode.h
+@@ -5,7 +5,7 @@
+ #include "usb.h"
+
+ /// Device path base ("/dev/input/ckb" or "/var/run/ckb")
+-const char *const devpath;
++extern const char *const devpath;
+
+ /// Group ID for the control nodes. -1 to give read/write access to everybody
+ extern long gid;