* [gentoo-commits] repo/gentoo:master commit in: app-misc/ckb/files/, app-misc/ckb/
@ 2020-11-29 13:52 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2020-11-29 13:52 UTC (permalink / raw
To: gentoo-commits
commit: 4dd504abf0b68bc12d394045501d5626eaa91d5c
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Sun Nov 29 13:52:12 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 29 13:52:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dd504ab
app-misc/ckb: fixes to package
* Migrate cmake-utils to cmake eclass
* fix GCC10 compilation (#715046, thanks to Erik Zeek <zeekec <AT> gmail.com>)
Closes: https://bugs.gentoo.org/715046
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-misc/ckb/ckb-0.4.2-r1.ebuild | 42 ++++++++++++++++++++++++++++++++
app-misc/ckb/files/ckb-0.4.2-gcc10.patch | 28 +++++++++++++++++++++
2 files changed, 70 insertions(+)
diff --git a/app-misc/ckb/ckb-0.4.2-r1.ebuild b/app-misc/ckb/ckb-0.4.2-r1.ebuild
new file mode 100644
index 00000000000..5dcd46ea00a
--- /dev/null
+++ b/app-misc/ckb/ckb-0.4.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg cmake
+
+DESCRIPTION="Corsair K65/K70/K95 Driver"
+HOMEPAGE="https://github.com/ckb-next/ckb-next"
+SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ >=dev-libs/quazip-0.7.2[qt5(+)]
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ virtual/libudev:=
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-next-${PV}"
+
+PATCHES=( "${FILESDIR}"/${P}-gcc10.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ -DDISABLE_UPDATER=yes
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ dodoc CHANGELOG.md
+
+ newinitd "${FILESDIR}"/ckb.initd ckb-daemon
+}
diff --git a/app-misc/ckb/files/ckb-0.4.2-gcc10.patch b/app-misc/ckb/files/ckb-0.4.2-gcc10.patch
new file mode 100644
index 00000000000..e070471cdc0
--- /dev/null
+++ b/app-misc/ckb/files/ckb-0.4.2-gcc10.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;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/ckb/files/, app-misc/ckb/
@ 2022-09-09 17:24 John Helmert III
0 siblings, 0 replies; 3+ messages in thread
From: John Helmert III @ 2022-09-09 17:24 UTC (permalink / raw
To: gentoo-commits
commit: 18a0c46a9c8a7a0a07437a9b0480a79ac9647b33
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 9 17:22:39 2022 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Fri Sep 9 17:22:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18a0c46a
app-misc/ckb: drop 0.4.4-r2
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
app-misc/ckb/Manifest | 1 -
app-misc/ckb/ckb-0.4.4-r2.ebuild | 65 -----------------------
app-misc/ckb/files/ckb-0.4.4-libinput-1.2.0.patch | 29 ----------
app-misc/ckb/files/ckb.initd | 29 ----------
4 files changed, 124 deletions(-)
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index 2d5a0b1a5219..4cdf752d6a62 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1,2 +1 @@
-DIST ckb-0.4.4.tar.gz 1593244 BLAKE2B 99476d3be98b3edac540b67b275a1ebec440f2a55d8bedd9bbdc815abd15bbeb3d035c703faa2dfdf9f4dcb70f49024c82b2990b1151b0ad5b78b741430d80f9 SHA512 b03d301a6b984957b5a3047769f25311c479f7992c59222b0ce9314b3204dac2d937c26997b97ec2ee1fdc79e3208c76a57a5c603dc1cd99ffb39fd426f58385
DIST ckb-0.5.0.tar.gz 1868880 BLAKE2B 867923f4eaf5d0e9d4ec14c5bd5952d88436c12a0d615528e083705cff7346a654dc801e743519e5482e8beb1cd28284710000e69b20032856b0e22d48792ee3 SHA512 d4e46466df4cdac7f4d4be05072592101780c94af261ec1b0bf6ec8bb1f97f892fb5da17dd91cf5f9b45fe128547cc7393c13e29843d6a7ae0de7a4688a5cdb1
diff --git a/app-misc/ckb/ckb-0.4.4-r2.ebuild b/app-misc/ckb/ckb-0.4.4-r2.ebuild
deleted file mode 100644
index c1bff1e3aab4..000000000000
--- a/app-misc/ckb/ckb-0.4.4-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake
-
-DESCRIPTION="Corsair K65/K70/K95 Driver"
-HOMEPAGE="https://github.com/ckb-next/ckb-next"
-SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="systemd"
-
-RDEPEND="
- dev-libs/libdbusmenu-qt
- dev-libs/quazip:0=[qt5(+)]
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- media-sound/pulseaudio
- virtual/libudev:=
- x11-libs/libX11
- x11-libs/libxcb:=
- x11-libs/xcb-util-wm"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-S="${WORKDIR}/${PN}-next-${PV}"
-
-PATCHES=(
- "${FILESDIR}/${P}-libinput-1.2.0.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DDISABLE_UPDATER=yes
- -DFORCE_INIT_SYSTEM=$(usex systemd systemd openrc)
- )
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- dodoc CHANGELOG.md
-
- newinitd "${FILESDIR}"/ckb.initd ckb-daemon
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- elog "The ckb daemon will have to be started before use:"
- elog
- if use systemd ; then
- elog "# systemctl start ckb-next-daemon"
- else
- elog "# rc-service ckb start"
- fi
- fi
-}
diff --git a/app-misc/ckb/files/ckb-0.4.4-libinput-1.2.0.patch b/app-misc/ckb/files/ckb-0.4.4-libinput-1.2.0.patch
deleted file mode 100644
index 211d5e4ea01e..000000000000
--- a/app-misc/ckb/files/ckb-0.4.4-libinput-1.2.0.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++)
diff --git a/app-misc/ckb/files/ckb.initd b/app-misc/ckb/files/ckb.initd
deleted file mode 100644
index 76af0fd8438b..000000000000
--- a/app-misc/ckb/files/ckb.initd
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-## Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-command="/usr/bin/ckb-daemon"
-description="Controller for Corsair Keyboard Driver"
-pidfile="/run/ckb.pid"
-logfile="/var/run/ckb.log"
-
-start() {
- ebegin "Starting Corsair Keyboard Driver"
- start-stop-daemon --start --exec "${command}" --pidfile "${pidfile}" --background \
- --stdout "${logfile}" --stderr "${logfile}"
- eend $?
-}
-
-stop() {
- ebegin "Stopping Corsair Keyboard Driver"
- start-stop-daemon --stop --exec "${command}" --pidfile "${pidfile}"
- eend $?
-
-}
-
-reload() {
- stop
- sleep 3
- start
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/ckb/files/, app-misc/ckb/
@ 2023-12-21 21:42 John Helmert III
0 siblings, 0 replies; 3+ messages in thread
From: John Helmert III @ 2023-12-21 21:42 UTC (permalink / raw
To: gentoo-commits
commit: d25b69713f97c643e96e971270b6193f346d99f6
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 21:41:27 2023 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 21:42:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d25b6971
app-misc/ckb: fix bashism in init script
Closes: https://bugs.gentoo.org/920456
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
app-misc/ckb/{ckb-0.6.0.ebuild => ckb-0.6.0-r1.ebuild} | 4 ++++
app-misc/ckb/files/ckb-0.6.0-fix-bashism.patch | 16 ++++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/app-misc/ckb/ckb-0.6.0.ebuild b/app-misc/ckb/ckb-0.6.0-r1.ebuild
similarity index 96%
rename from app-misc/ckb/ckb-0.6.0.ebuild
rename to app-misc/ckb/ckb-0.6.0-r1.ebuild
index 2c6dac302860..ff1d9c5f596f 100644
--- a/app-misc/ckb/ckb-0.6.0.ebuild
+++ b/app-misc/ckb/ckb-0.6.0-r1.ebuild
@@ -40,6 +40,10 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="dev-qt/linguist-tools:5"
+PATCHES=(
+ "${FILESDIR}/${P}-fix-bashism.patch"
+)
+
src_configure() {
local mycmakeargs=(
-DDISABLE_UPDATER=yes
diff --git a/app-misc/ckb/files/ckb-0.6.0-fix-bashism.patch b/app-misc/ckb/files/ckb-0.6.0-fix-bashism.patch
new file mode 100644
index 000000000000..8cdc2aa59a0e
--- /dev/null
+++ b/app-misc/ckb/files/ckb-0.6.0-fix-bashism.patch
@@ -0,0 +1,16 @@
+From https://github.com/ckb-next/ckb-next/commit/76a47f95b442a1ae5a9c7448566eaafd8863ca8d
+From: Willow Barraco <contact@willowbarraco.fr>
+Date: Wed, 19 Jul 2023 09:38:09 +0200
+Subject: [PATCH] Fix ckb-next-daemon OpenRC service file
+
+--- a/linux/openrc/ckb-next-daemon.in
++++ b/linux/openrc/ckb-next-daemon.in
+@@ -7,4 +7,4 @@ command="@CMAKE_INSTALL_PREFIX@/bin/ckb-next-daemon"
+ description="Corsair Keyboards and Mice Daemon"
+ pidfile="/dev/input/ckb0/pid"
+ logfile="/var/log/${RC_SVCNAME}.log"
+-start_stop_daemon_args+="--background --stdout ${logfile} --stderr ${logfile}"
++start_stop_daemon_args="$start_stop_daemon_args --background --stdout ${logfile} --stderr ${logfile}"
+--
+2.43.0
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-12-21 21:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-29 13:52 [gentoo-commits] repo/gentoo:master commit in: app-misc/ckb/files/, app-misc/ckb/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2022-09-09 17:24 John Helmert III
2023-12-21 21:42 John Helmert III
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox