* [gentoo-commits] repo/gentoo:master commit in: app-misc/ckb/, app-misc/ckb/files/
@ 2019-05-16 11:15 Tony Vroon
0 siblings, 0 replies; 5+ messages in thread
From: Tony Vroon @ 2019-05-16 11:15 UTC (permalink / raw
To: gentoo-commits
commit: bb42f42e01fafe107eb30977080e8811d10b6b72
Author: Tony Vroon <chainsaw <AT> gentoo <DOT> org>
AuthorDate: Thu May 16 11:14:31 2019 +0000
Commit: Tony Vroon <chainsaw <AT> gentoo <DOT> org>
CommitDate: Thu May 16 11:15:20 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb42f42e
app-misc/ckb: Version bump to 0.4.0
Adds coping mechanisms for non-modular kernels like mine, sent upstream.
Copes with significantly changed build system and shortens ebuild accordingly.
I am taking maintainership.
Closes: https://bugs.gentoo.org/680918
Suggested-By: Chicago <chicago <AT> blkid.net>
Signed-Off-By: Tony Vroon <chainsaw <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
app-misc/ckb/Manifest | 1 +
app-misc/ckb/ckb-0.4.0.ebuild | 50 ++++++++++++++++++++
app-misc/ckb/files/ckb-0.4.0-modprobe.patch | 72 +++++++++++++++++++++++++++++
app-misc/ckb/metadata.xml | 5 +-
4 files changed, 127 insertions(+), 1 deletion(-)
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index 6882c728c07..2dc7598a993 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1 +1,2 @@
DIST ckb-0.2.9.tar.gz 664625 BLAKE2B 37dc9c75876ca46fb10241da7b223ca67e5b9c0a998386f0f82eba15a97045e269b1f8a75dea18297865826bff241c21b255a507fd26e73747ee2656a228c4ce SHA512 7910f089d7b01ceade5ae8282db931c9decb9296d4c9c5fc2419eb7fb4ba5a2c0f85721a3a6846ed24a72f61b18374baa7fd27e11329b5d2f65b21916e8b96e1
+DIST ckb-0.4.0.tar.gz 838586 BLAKE2B 42d786d1934cce6bb082ba4c9f7081401153fa2bd209f290659cfd42787ef69fad9ad86c35df973f1934a03699a1472aa2a1ceb8ef70f46316558e764e5cd88c SHA512 81058d1e31e7328dac1b3a83cb443b9d9f29593e872d189766c1dfe8b502965fd9ea7a962423e94d5053c99d8dd8c50bd98638c11631a2ca586fb9ade700284f
diff --git a/app-misc/ckb/ckb-0.4.0.ebuild b/app-misc/ckb/ckb-0.4.0.ebuild
new file mode 100644
index 00000000000..a0ae0373699
--- /dev/null
+++ b/app-misc/ckb/ckb-0.4.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop cmake-utils systemd
+
+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=""
+
+DEPEND="
+ >=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
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=( "${FILESDIR}/${P}-modprobe.patch" )
+S="${WORKDIR}/${PN}-next-${PV}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DDISABLE_UPDATER=yes
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ newinitd "${FILESDIR}"/ckb.initd ckb-daemon
+ cmake-utils_src_install
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/app-misc/ckb/files/ckb-0.4.0-modprobe.patch b/app-misc/ckb/files/ckb-0.4.0-modprobe.patch
new file mode 100644
index 00000000000..31dc3303b32
--- /dev/null
+++ b/app-misc/ckb/files/ckb-0.4.0-modprobe.patch
@@ -0,0 +1,72 @@
+---
+ src/daemon/input_linux.c | 21 ++++++++++++++-------
+ src/gui/mainwindow.cpp | 14 ++++++++------
+ 2 files changed, 22 insertions(+), 13 deletions(-)
+
+diff --git a/src/daemon/input_linux.c b/src/daemon/input_linux.c
+index 0391243e..8489f5b5 100644
+--- a/src/daemon/input_linux.c
++++ b/src/daemon/input_linux.c
+@@ -55,13 +55,20 @@ int uinputopen(struct uinput_user_dev* indev, int mouse){
+ ///
+ /// Some tips on using [uinput_user_dev in](http://thiemonge.org/getting-started-with-uinput)
+ int os_inputopen(usbdevice* kb){
+- /// First check whether the uinput module is loaded by the kernel.
+- ///
+- // Load the uinput module (if it's not loaded already)
+- if(system("modprobe uinput") != 0) {
+- ckb_fatal("Failed to load uinput module\n");
+- return 1;
++ /// Let's see if uinput is already available
++ int fd = open("/dev/uinput", O_RDWR);
++ if(fd < 0){
++ fd = open("/dev/input/uinput", O_RDWR);
++ }
++
++ // If not available, load the module
++ if(fd < 0){
++ if(system("modprobe uinput") != 0) {
++ ckb_fatal("Failed to load uinput module\n");
++ return 1;
++ }
+ }
++ close(fd);
+
+ if(IS_SINGLE_EP(kb)) {
+ kb->uinput_kb = 0;
+@@ -79,7 +86,7 @@ int os_inputopen(usbdevice* kb){
+ indev.id.product = kb->product;
+ indev.id.version = kb->fwversion;
+ // Open keyboard
+- int fd = uinputopen(&indev, 0);
++ fd = uinputopen(&indev, 0);
+ kb->uinput_kb = fd;
+ if(fd <= 0)
+ return 0;
+diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
+index 968764e7..1eb95bda 100644
+--- a/src/gui/mainwindow.cpp
++++ b/src/gui/mainwindow.cpp
+@@ -282,14 +282,16 @@ void MainWindow::updateVersion(){
+ if(kextstatOut.isEmpty())
+ daemonWarning.append(tr("<br /><b>Warning:</b> System Extension by \"Fumihiko Takayama\" is not allowed in Security & Privacy. Please allow it and then unplug and replug your devices."));
+ #elif defined(Q_OS_LINUX)
+- QProcess modprobe;
+- modprobe.start("modprobe", QStringList("uinput"));
++ if(!(QFileInfo("/dev/uinput").exists() || QFileInfo("/dev/input/uinput").exists())){
++ QProcess modprobe;
++ modprobe.start("modprobe", QStringList("uinput"));
+
+- if(!modprobe.waitForFinished())
+- qDebug() << "Modprobe error";
++ if(!modprobe.waitForFinished())
++ qDebug() << "Modprobe error";
+
+- if(modprobe.exitCode())
+- daemonWarning.append(tr("<br /><b>Warning:</b> The uinput module could not be loaded. If this issue persists after rebooting, compile a kernel with CONFIG_INPUT_UINPUT=y."));
++ if(modprobe.exitCode())
++ daemonWarning.append(tr("<br /><b>Warning:</b> The uinput module could not be loaded. If this issue persists after rebooting, compile a kernel with CONFIG_INPUT_UINPUT=y."));
++ }
+ #endif
+ settingsWidget->setStatus(tr("No devices connected") + daemonWarning);
+ }
diff --git a/app-misc/ckb/metadata.xml b/app-misc/ckb/metadata.xml
index 2a82acaed1c..dd1c6d1b01c 100644
--- a/app-misc/ckb/metadata.xml
+++ b/app-misc/ckb/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>chainsaw@gentoo.org</email>
+ <name>Tony Vroon</name>
+ </maintainer>
<upstream>
<remote-id type="github">ccMSC/ckb</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/ckb/, app-misc/ckb/files/
@ 2020-11-29 13:52 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2020-11-29 13:52 UTC (permalink / raw
To: gentoo-commits
commit: 14c8358fd544a72d4187e781f2b024d9fe185139
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Sun Nov 29 13:52:15 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 29 13:52:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14c8358f
app-misc/ckb: remove old versions
Closes: https://github.com/gentoo/gentoo/pull/16489
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/Manifest | 3 --
app-misc/ckb/ckb-0.2.9-r1.ebuild | 53 ---------------------
app-misc/ckb/ckb-0.4.0.ebuild | 50 --------------------
app-misc/ckb/ckb-0.4.1.ebuild | 49 --------------------
app-misc/ckb/ckb-0.4.2.ebuild | 49 --------------------
app-misc/ckb/files/ckb-0.4.0-modprobe.patch | 72 -----------------------------
6 files changed, 276 deletions(-)
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index 0d1474d32f3..fa95dc0c740 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1,4 +1 @@
-DIST ckb-0.2.9.tar.gz 664625 BLAKE2B 37dc9c75876ca46fb10241da7b223ca67e5b9c0a998386f0f82eba15a97045e269b1f8a75dea18297865826bff241c21b255a507fd26e73747ee2656a228c4ce SHA512 7910f089d7b01ceade5ae8282db931c9decb9296d4c9c5fc2419eb7fb4ba5a2c0f85721a3a6846ed24a72f61b18374baa7fd27e11329b5d2f65b21916e8b96e1
-DIST ckb-0.4.0.tar.gz 838586 BLAKE2B 42d786d1934cce6bb082ba4c9f7081401153fa2bd209f290659cfd42787ef69fad9ad86c35df973f1934a03699a1472aa2a1ceb8ef70f46316558e764e5cd88c SHA512 81058d1e31e7328dac1b3a83cb443b9d9f29593e872d189766c1dfe8b502965fd9ea7a962423e94d5053c99d8dd8c50bd98638c11631a2ca586fb9ade700284f
-DIST ckb-0.4.1.tar.gz 845316 BLAKE2B 03b6d09ab9297fea30ecff5485fcb33d7ad00335b25ce8bbd7727db1b794c7016a8f161562b5271e29fcefb332b50797d91ff8c09724b96b8929033763ad6624 SHA512 294a29146978c722fdfbb9c2581ed3fc492b2ffead0de8c434bfe90e6aff6e61748517c0f98ae0d8747e7a95684cf22badf778b35358dbaa8acbc18a25ade993
DIST ckb-0.4.2.tar.gz 883681 BLAKE2B b3d921010b1caa8cb870770c6cf3ff0e9f6c65ea742325995e26351331e3063a16e8a391f593bfc8b16663cef0580e087d776796ea69776465122b08e00e9382 SHA512 4c80101e935a4d5137b0fd6aaf7d97889913af0bbb8e3097e035e2420043d6525094c1e3f7b5676e8c50328454251ff3260f6aa9b81ec583a2e8136333ee6af8
diff --git a/app-misc/ckb/ckb-0.2.9-r1.ebuild b/app-misc/ckb/ckb-0.2.9-r1.ebuild
deleted file mode 100644
index a0d3d2a09f0..00000000000
--- a/app-misc/ckb/ckb-0.2.9-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils systemd
-
-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=""
-
-DEPEND="
- >=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
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md BUILD.md DAEMON.md )
-
-S="${WORKDIR}/${PN}-next-${PV}"
-
-src_prepare() {
- default
- sed -i -e "s/-Werror=all//" src/ckb-daemon/ckb-daemon.pro || die
- sed -i -e "/quazip/d" -e "s/^.*QUAZIP_STATIC/LIBS += -lquazip5/" src/ckb/ckb.pro || die
- sed -i -e "s#/usr/lib#/usr/libexec#" src/ckb/animscript.cpp || die
-}
-
-src_configure() {
- eqmake5
-}
-
-src_install() {
- dobin bin/ckb bin/ckb-daemon
- dodir /usr/bin/ckb-animations
- exeinto /usr/libexec/ckb-animations
- doexe bin/ckb-animations/*
-
- newinitd "${FILESDIR}"/ckb.initd ckb-daemon
- domenu usr/ckb.desktop
- doicon usr/ckb.png
- systemd_dounit service/systemd/ckb-daemon.service
-}
diff --git a/app-misc/ckb/ckb-0.4.0.ebuild b/app-misc/ckb/ckb-0.4.0.ebuild
deleted file mode 100644
index a0ae0373699..00000000000
--- a/app-misc/ckb/ckb-0.4.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop cmake-utils systemd
-
-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=""
-
-DEPEND="
- >=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
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
-PATCHES=( "${FILESDIR}/${P}-modprobe.patch" )
-S="${WORKDIR}/${PN}-next-${PV}"
-
-src_configure() {
- local mycmakeargs=(
- -DDISABLE_UPDATER=yes
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- newinitd "${FILESDIR}"/ckb.initd ckb-daemon
- cmake-utils_src_install
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/app-misc/ckb/ckb-0.4.1.ebuild b/app-misc/ckb/ckb-0.4.1.ebuild
deleted file mode 100644
index b9d31b54b0e..00000000000
--- a/app-misc/ckb/ckb-0.4.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop cmake-utils systemd
-
-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=""
-
-DEPEND="
- >=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
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
-S="${WORKDIR}/${PN}-next-${PV}"
-
-src_configure() {
- local mycmakeargs=(
- -DDISABLE_UPDATER=yes
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- newinitd "${FILESDIR}"/ckb.initd ckb-daemon
- cmake-utils_src_install
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/app-misc/ckb/ckb-0.4.2.ebuild b/app-misc/ckb/ckb-0.4.2.ebuild
deleted file mode 100644
index b9d31b54b0e..00000000000
--- a/app-misc/ckb/ckb-0.4.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop cmake-utils systemd
-
-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=""
-
-DEPEND="
- >=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
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
-S="${WORKDIR}/${PN}-next-${PV}"
-
-src_configure() {
- local mycmakeargs=(
- -DDISABLE_UPDATER=yes
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- newinitd "${FILESDIR}"/ckb.initd ckb-daemon
- cmake-utils_src_install
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/app-misc/ckb/files/ckb-0.4.0-modprobe.patch b/app-misc/ckb/files/ckb-0.4.0-modprobe.patch
deleted file mode 100644
index 31dc3303b32..00000000000
--- a/app-misc/ckb/files/ckb-0.4.0-modprobe.patch
+++ /dev/null
@@ -1,72 +0,0 @@
----
- src/daemon/input_linux.c | 21 ++++++++++++++-------
- src/gui/mainwindow.cpp | 14 ++++++++------
- 2 files changed, 22 insertions(+), 13 deletions(-)
-
-diff --git a/src/daemon/input_linux.c b/src/daemon/input_linux.c
-index 0391243e..8489f5b5 100644
---- a/src/daemon/input_linux.c
-+++ b/src/daemon/input_linux.c
-@@ -55,13 +55,20 @@ int uinputopen(struct uinput_user_dev* indev, int mouse){
- ///
- /// Some tips on using [uinput_user_dev in](http://thiemonge.org/getting-started-with-uinput)
- int os_inputopen(usbdevice* kb){
-- /// First check whether the uinput module is loaded by the kernel.
-- ///
-- // Load the uinput module (if it's not loaded already)
-- if(system("modprobe uinput") != 0) {
-- ckb_fatal("Failed to load uinput module\n");
-- return 1;
-+ /// Let's see if uinput is already available
-+ int fd = open("/dev/uinput", O_RDWR);
-+ if(fd < 0){
-+ fd = open("/dev/input/uinput", O_RDWR);
-+ }
-+
-+ // If not available, load the module
-+ if(fd < 0){
-+ if(system("modprobe uinput") != 0) {
-+ ckb_fatal("Failed to load uinput module\n");
-+ return 1;
-+ }
- }
-+ close(fd);
-
- if(IS_SINGLE_EP(kb)) {
- kb->uinput_kb = 0;
-@@ -79,7 +86,7 @@ int os_inputopen(usbdevice* kb){
- indev.id.product = kb->product;
- indev.id.version = kb->fwversion;
- // Open keyboard
-- int fd = uinputopen(&indev, 0);
-+ fd = uinputopen(&indev, 0);
- kb->uinput_kb = fd;
- if(fd <= 0)
- return 0;
-diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
-index 968764e7..1eb95bda 100644
---- a/src/gui/mainwindow.cpp
-+++ b/src/gui/mainwindow.cpp
-@@ -282,14 +282,16 @@ void MainWindow::updateVersion(){
- if(kextstatOut.isEmpty())
- daemonWarning.append(tr("<br /><b>Warning:</b> System Extension by \"Fumihiko Takayama\" is not allowed in Security & Privacy. Please allow it and then unplug and replug your devices."));
- #elif defined(Q_OS_LINUX)
-- QProcess modprobe;
-- modprobe.start("modprobe", QStringList("uinput"));
-+ if(!(QFileInfo("/dev/uinput").exists() || QFileInfo("/dev/input/uinput").exists())){
-+ QProcess modprobe;
-+ modprobe.start("modprobe", QStringList("uinput"));
-
-- if(!modprobe.waitForFinished())
-- qDebug() << "Modprobe error";
-+ if(!modprobe.waitForFinished())
-+ qDebug() << "Modprobe error";
-
-- if(modprobe.exitCode())
-- daemonWarning.append(tr("<br /><b>Warning:</b> The uinput module could not be loaded. If this issue persists after rebooting, compile a kernel with CONFIG_INPUT_UINPUT=y."));
-+ if(modprobe.exitCode())
-+ daemonWarning.append(tr("<br /><b>Warning:</b> The uinput module could not be loaded. If this issue persists after rebooting, compile a kernel with CONFIG_INPUT_UINPUT=y."));
-+ }
- #endif
- settingsWidget->setStatus(tr("No devices connected") + daemonWarning);
- }
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/ckb/, app-misc/ckb/files/
@ 2021-02-23 19:53 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2021-02-23 19:53 UTC (permalink / raw
To: gentoo-commits
commit: 008949933f85efb7938e262a00d1a7f0f2ed4744
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 20:25:33 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 19:52:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00894993
app-misc/ckb: Drop 0.4.2-r2 and 0.4.3-r1
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-misc/ckb/Manifest | 1 -
app-misc/ckb/ckb-0.4.2-r2.ebuild | 42 -----------------------
app-misc/ckb/ckb-0.4.3-r1.ebuild | 58 --------------------------------
app-misc/ckb/files/ckb-0.4.2-gcc10.patch | 28 ---------------
4 files changed, 129 deletions(-)
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index 0701fab0cdd..7b2b389c186 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1,2 +1 @@
-DIST ckb-0.4.2.tar.gz 883681 BLAKE2B b3d921010b1caa8cb870770c6cf3ff0e9f6c65ea742325995e26351331e3063a16e8a391f593bfc8b16663cef0580e087d776796ea69776465122b08e00e9382 SHA512 4c80101e935a4d5137b0fd6aaf7d97889913af0bbb8e3097e035e2420043d6525094c1e3f7b5676e8c50328454251ff3260f6aa9b81ec583a2e8136333ee6af8
DIST ckb-0.4.3.tar.gz 1588845 BLAKE2B bdf11580c8224dfe0a7d01f99e3bea1d36fa3d7c1de84ec991ee4454c838db614bd74757ec3b952d28ab672244bb4c28888f6b80366255cfb57ec37ff8742c1d SHA512 6772812fb9608251f3a14efeb16960966be446462ab3f5b1bec896761aeae9e5f5cf9c07b21e509dbef057825c3017323f82f066519cb512ebe2fc6eea6ec217
diff --git a/app-misc/ckb/ckb-0.4.2-r2.ebuild b/app-misc/ckb/ckb-0.4.2-r2.ebuild
deleted file mode 100644
index 6cf15eba6ad..00000000000
--- a/app-misc/ckb/ckb-0.4.2-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 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:0[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/ckb-0.4.3-r1.ebuild b/app-misc/ckb/ckb-0.4.3-r1.ebuild
deleted file mode 100644
index 8d8485e09da..00000000000
--- a/app-misc/ckb/ckb-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 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/libdbusmenu-qt
- dev-libs/quazip:0
- 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"
-BDEPEND="dev-qt/linguist-tools:5"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-next-${PV}"
-
-src_configure() {
- local mycmakeargs=(
- -DDISABLE_UPDATER=yes
- )
- 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
- elog "OpenRC:"
- elog "# rc-service ckb start"
- elog
- elog "Systemd:"
- elog "# systemctl start ckb-next-daemon"
- fi
-}
diff --git a/app-misc/ckb/files/ckb-0.4.2-gcc10.patch b/app-misc/ckb/files/ckb-0.4.2-gcc10.patch
deleted file mode 100644
index e070471cdc0..00000000000
--- a/app-misc/ckb/files/ckb-0.4.2-gcc10.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/ckb/, app-misc/ckb/files/
@ 2021-09-25 20:48 John Helmert III
0 siblings, 0 replies; 5+ messages in thread
From: John Helmert III @ 2021-09-25 20:48 UTC (permalink / raw
To: gentoo-commits
commit: 97302339c8c2d04c2ea5dae831f03aa8e499694a
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 25 18:53:35 2021 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sat Sep 25 20:46:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97302339
app-misc/ckb: fix compatibility with libinput drivers 1.2.0
Closes: https://bugs.gentoo.org/814797
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
app-misc/ckb/ckb-0.4.4-r2.ebuild | 65 +++++++++++++++++++++++
app-misc/ckb/files/ckb-0.4.4-libinput-1.2.0.patch | 29 ++++++++++
2 files changed, 94 insertions(+)
diff --git a/app-misc/ckb/ckb-0.4.4-r2.ebuild b/app-misc/ckb/ckb-0.4.4-r2.ebuild
new file mode 100644
index 00000000000..e5c7f397433
--- /dev/null
+++ b/app-misc/ckb/ckb-0.4.4-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 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=
+ 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
new file mode 100644
index 00000000000..211d5e4ea01
--- /dev/null
+++ b/app-misc/ckb/files/ckb-0.4.4-libinput-1.2.0.patch
@@ -0,0 +1,29 @@
+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++)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/ckb/, app-misc/ckb/files/
@ 2024-05-11 17:23 John Helmert III
0 siblings, 0 replies; 5+ messages in thread
From: John Helmert III @ 2024-05-11 17:23 UTC (permalink / raw
To: gentoo-commits
commit: 6fed1bde14cd4b9a885215fb0643cad74b25d51f
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Sat May 11 17:22:05 2024 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sat May 11 17:23:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fed1bde
app-misc/ckb: fix ODR build failure
Closes: https://bugs.gentoo.org/924410
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
app-misc/ckb/ckb-0.6.0-r2.ebuild | 77 ++++++++++++++++++++++++++++++++++
app-misc/ckb/files/ckb-0.6.0-odr.patch | 32 ++++++++++++++
2 files changed, 109 insertions(+)
diff --git a/app-misc/ckb/ckb-0.6.0-r2.ebuild b/app-misc/ckb/ckb-0.6.0-r2.ebuild
new file mode 100644
index 000000000000..c70828a260ad
--- /dev/null
+++ b/app-misc/ckb/ckb-0.6.0-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake udev xdg
+
+DESCRIPTION="Corsair K65/K70/K95 Driver"
+HOMEPAGE="https://github.com/ckb-next/ckb-next"
+
+if [[ ${PV} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ckb-next/ckb-next.git"
+else
+ SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+ S="${WORKDIR}/${PN}-next-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+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-libs/libpulse
+ media-sound/apulse[sdk]
+ )
+ virtual/libudev:=
+ x11-libs/libxcb:=
+ x11-libs/xcb-util-wm"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-bashism.patch"
+ "${FILESDIR}/${P}-odr.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
+}
+
+pkg_postinst() {
+ udev_reload
+
+ 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-config start ckb-next-daemon"
+ fi
+ fi
+}
+
+pkg_postrm() {
+ udev_reload
+}
diff --git a/app-misc/ckb/files/ckb-0.6.0-odr.patch b/app-misc/ckb/files/ckb-0.6.0-odr.patch
new file mode 100644
index 000000000000..9547fe4edaf9
--- /dev/null
+++ b/app-misc/ckb/files/ckb-0.6.0-odr.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/924410
+
+From c5b68a00867b2add28bfd62430c45781ac2e9cb8 Mon Sep 17 00:00:00 2001
+From: John Helmert III <ajak@gentoo.org>
+Date: Fri, 16 Feb 2024 22:14:24 -0800
+Subject: [PATCH] ckbsettingswriter: mirror QT version guards from ckbsettings
+
+The differing definitions between ckbsettingswriter.cpp and
+ckbsettings.cpp trigger compilation errors with -Werror=odr.
+
+Signed-off-by: John Helmert III <ajak@gentoo.org>
+--- a/src/gui/ckbsettingswriter.cpp
++++ b/src/gui/ckbsettingswriter.cpp
+@@ -1,9 +1,18 @@
+ #include "ckbsettingswriter.h"
++
++#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
++#include <QRecursiveMutex>
++#else
+ #include <QMutex>
++#endif
+
+ // Mirror ckbsettings.cpp
+ extern QAtomicInt cacheWritesInProgress;
++#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
++extern QRecursiveMutex settingsMutex, settingsCacheMutex;
++#else
+ extern QMutex settingsMutex, settingsCacheMutex;
++#endif
+ #define lockMutex QMutexLocker locker(backing == _globalSettings ? &mutex : 0)
+ #define lockMutexStatic QMutexLocker locker(&settingsMutex)
+ #define lockMutexStatic2 QMutexLocker locker2(&settingsMutex)
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-05-11 17:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-23 19:53 [gentoo-commits] repo/gentoo:master commit in: app-misc/ckb/, app-misc/ckb/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-05-11 17:23 John Helmert III
2021-09-25 20:48 John Helmert III
2020-11-29 13:52 David Seifert
2019-05-16 11:15 Tony Vroon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox