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@gmail.com>
Signed-off-by: David Seifert <soap@gentoo.org>
This commit is contained in:
Azamat H. Hackimov
2020-11-29 14:52:15 +01:00
committed by David Seifert
parent 4dd504abf0
commit 14c8358fd5
6 changed files with 0 additions and 276 deletions

View File

@@ -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

View File

@@ -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
}

View File

@@ -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
}

View File

@@ -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
}

View File

@@ -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
}

View File

@@ -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);
}