Page MenuHomeSolus
Files F10863621

D10220.id24591.diff
No OneTemporary
Actions

D10220.id24591.diff
View Options

diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -1,11 +1,17 @@
libQt5Core.so.5
+libQt5DBus.so.5
libQt5Gui.so.5
libQt5Network.so.5
libQt5Widgets.so.5
+libQt5X11Extras.so.5
libc.so.6
+libdbusmenu-qt5.so.2
libgcc_s.so.1
libm.so.6
libpthread.so.0
libstdc++.so.6
libudev.so.1
+libxcb-ewmh.so.2
+libxcb-screensaver.so.0
+libxcb.so.1
libz.so.1
diff --git a/files/0001-Don-t-enable-keys-we-don-t-need-in-uinput.patch b/files/0001-Don-t-enable-keys-we-don-t-need-in-uinput.patch
deleted file mode 100644
--- a/files/0001-Don-t-enable-keys-we-don-t-need-in-uinput.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0ae46be1dd4151b7b5dc80a0271d5a86b8826af1 Mon Sep 17 00:00:00 2001
-From: Tasos Sahanidis <tasos@tasossah.com>
-Date: Tue, 12 May 2020 16:00:43 +0300
-Subject: [PATCH] Don't enable keys we don't need in uinput
-
-Specifically, enabling KEY_ALS_TOGGLE causes the kernel to complain
----
- 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 8c8a604..10ffc92 100644
---- a/src/daemon/input_linux.c
-+++ b/src/daemon/input_linux.c
-@@ -28,9 +28,11 @@ int uinputopen(struct uinput_user_dev* indev, int mouse){
- for(int i = 0; i < REL_CNT; i++)
- ioctl(fd, UI_SET_RELBIT, i);
- } else {
-- // Enable all possible keys
-- for(int i = 0; i < KEY_CNT; i++)
-+ // Enable common keyboard keys
-+ for(int i = KEY_ESC; i <= KEY_MEDIA; i++)
- ioctl(fd, UI_SET_KEYBIT, i);
-+ // Enable KEY_FN as that's also used
-+ ioctl(fd, UI_SET_KEYBIT, KEY_FN);
- // Enable LEDs
- ioctl(fd, UI_SET_EVBIT, EV_LED);
- //for(int i = 0; i < LED_CNT; i++)
---
-2.26.2
-
diff --git a/files/0001-Enable-only-mouse-buttons-on-the-mouse-device.patch b/files/0001-Enable-only-mouse-buttons-on-the-mouse-device.patch
deleted file mode 100644
--- a/files/0001-Enable-only-mouse-buttons-on-the-mouse-device.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From afd0e19f1d198b3807d137be40cb845a28ccd2d5 Mon Sep 17 00:00:00 2001
-From: Tasos Sahanidis <tasos@tasossah.com>
-Date: Sun, 15 Mar 2020 22:53:13 +0200
-Subject: [PATCH] Enable only mouse buttons on the mouse device
-
-This is needed as a workaround to prevent libgdx games from crashing
-whenever a mouse button is pressed
----
- src/daemon/input_linux.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/src/daemon/input_linux.c b/src/daemon/input_linux.c
-index 0399212..8c8a604 100644
---- a/src/daemon/input_linux.c
-+++ b/src/daemon/input_linux.c
-@@ -16,16 +16,21 @@ int uinputopen(struct uinput_user_dev* indev, int mouse){
- return 0;
- }
- }
-- // Enable all keys and mouse buttons
-+
- ioctl(fd, UI_SET_EVBIT, EV_KEY);
-- for(int i = 0; i < KEY_CNT; i++)
-- ioctl(fd, UI_SET_KEYBIT, i);
- if(mouse){
-+ // Enable only the mouse buttons as a workaround for libgdx crashing
-+ // https://github.com/libgdx/libgdx/issues/5857
-+ for(int i = BTN_LEFT; i <= BTN_TASK; i++)
-+ 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);
- } else {
-+ // Enable all possible keys
-+ for(int i = 0; i < KEY_CNT; i++)
-+ ioctl(fd, UI_SET_KEYBIT, i);
- // Enable LEDs
- ioctl(fd, UI_SET_EVBIT, EV_LED);
- //for(int i = 0; i < LED_CNT; i++)
---
-2.26.2
-
diff --git a/files/fix-segfault-when-creating-new-profile.patch b/files/fix-segfault-when-creating-new-profile.patch
new file mode 100644
--- /dev/null
+++ b/files/fix-segfault-when-creating-new-profile.patch
@@ -0,0 +1,56 @@
+From 247f2bd973bb24041363c74d560883dcfea86d64 Mon Sep 17 00:00:00 2001
+From: Tasos Sahanidis <tasos@tasossah.com>
+Date: Fri, 25 Dec 2020 16:25:14 +0200
+Subject: [PATCH] Fix segfault when creating new profile
+
+---
+ src/gui/kb.cpp | 8 ++++++++
+ src/gui/kb.h | 2 +-
+ src/gui/kbprofiledialog.cpp | 2 +-
+ 3 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/gui/kb.cpp b/src/gui/kb.cpp
+index ff24ce08..a6231404 100644
+--- a/src/gui/kb.cpp
++++ b/src/gui/kb.cpp
+@@ -808,6 +808,14 @@ void Kb::setCurrentMode(KbMode* mode){
+ mode->light()->forceFrameUpdate();
+ }
+
++KbProfile* Kb::newProfileWithBlankMode(){
++ KbProfile* p = new KbProfile(this, getKeyMap());
++ KbMode* m = newMode();
++ p->append(m);
++ p->currentMode(m);
++ return p;
++}
++
+ KeyMap::Layout Kb::getCurrentLayout(){
+ return _layout;
+ }
+diff --git a/src/gui/kb.h b/src/gui/kb.h
+index 32c3dada..bfdda7f9 100644
+--- a/src/gui/kb.h
++++ b/src/gui/kb.h
+@@ -76,7 +76,7 @@ class Kb : public QThread
+ void setCurrentMode(KbMode* mode);
+
+ // Create a new profile/mode. The newly-created object will NOT be inserted into the current profile/mode list.
+- inline KbProfile* newProfile() { return new KbProfile(this, getKeyMap()); }
++ KbProfile* newProfileWithBlankMode();
+ inline KbProfile* newProfile(KbProfile* other) { return new KbProfile(this, getKeyMap(), *other); }
+ inline KbProfile* newProfile(CkbExternalSettings* settings, QString guid) { return new KbProfile(this, getKeyMap(), *settings, guid); }
+ inline KbMode* newMode() { return new KbMode(this, getKeyMap()); }
+diff --git a/src/gui/kbprofiledialog.cpp b/src/gui/kbprofiledialog.cpp
+index d90b268d..175393cf 100644
+--- a/src/gui/kbprofiledialog.cpp
++++ b/src/gui/kbprofiledialog.cpp
+@@ -85,7 +85,7 @@ void KbProfileDialog::on_profileList_itemClicked(QListWidgetItem *item){
+ item->setFont(font);
+ item->setIcon(QIcon(":/img/icon_profile.png"));
+ // Add the new profile and assign it to this item
+- KbProfile* newProfile = device->newProfile();
++ KbProfile* newProfile = device->newProfileWithBlankMode();
+ device->appendProfile(newProfile);
+ item->setData(GUID, newProfile->id().guid);
+ item->setData(NEW_FLAG, 0);
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,18 +1,24 @@
name : ckb
-version : 0.4.2
-release : 10
+version : 0.4.3
+release : 11
source :
- - https://github.com/ckb-next/ckb-next/archive/v0.4.2.tar.gz : 75b6908d5590c293dee8258a83d4ebe206306d3df9f867596e953ef7c6a86440
-license : GPL-2.0-only
-component : desktop.core
-summary : an open-source driver for Corsair keyboards and mice
+ - https://github.com/ckb-next/ckb-next/archive/v0.4.3.tar.gz : e4fbd14227ecc63fad9eaf705ca61defd7b44bcaa3ad29aae18cd8a69bbc9ef9
+license : GPL-2.0-or-later
+component : system.utils
+homepage : https://github.com/ckb-next/ckb-next/
+summary : An open-source driver for Corsair keyboards and mice
description: |
- an open-source driver for Corsair keyboards and mice
+ ckb-next is an open-source driver for Corsair keyboards and mice. It aims to bring the features of Corsair's proprietary iCUE software to Linux operating systems.
builddeps :
+ - pkgconfig(dbusmenu-qt5)
- pkgconfig(Qt5Core)
+ - pkgconfig(Qt5UiTools)
+ - pkgconfig(Qt5X11Extras)
+ - pkgconfig(xcb-ewmh)
+ - pkgconfig(x11)
setup : |
- %patch -p1 < $pkgfiles/0001-Enable-only-mouse-buttons-on-the-mouse-device.patch
- %patch -p1 < $pkgfiles/0001-Don-t-enable-keys-we-don-t-need-in-uinput.patch
+ %patch -p1 < $pkgfiles/fix-segfault-when-creating-new-profile.patch
+
mkdir build && cd build
%cmake -DDISABLE_UPDATER=1 -DFORCE_INIT_SYSTEM="systemd" -DUDEV_RULE_DIRECTORY="%libdir%/udev/rules.d/" ..
build : |
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -1,23 +1,24 @@
<PISI>
<Source>
<Name>ckb</Name>
+ <Homepage>https://github.com/ckb-next/ckb-next/</Homepage>
<Packager>
- <Name>Georg Grabler (STiAT)</Name>
- <Email>ggrabler@gmail.com</Email>
+ <Name>Campbell Jones</Name>
+ <Email>dev@serebit.com</Email>
</Packager>
- <License>GPL-2.0-only</License>
- <PartOf>desktop.core</PartOf>
- <Summary xml:lang="en">an open-source driver for Corsair keyboards and mice</Summary>
- <Description xml:lang="en">an open-source driver for Corsair keyboards and mice
+ <License>GPL-2.0-or-later</License>
+ <PartOf>system.utils</PartOf>
+ <Summary xml:lang="en">An open-source driver for Corsair keyboards and mice</Summary>
+ <Description xml:lang="en">ckb-next is an open-source driver for Corsair keyboards and mice. It aims to bring the features of Corsair&apos;s proprietary iCUE software to Linux operating systems.
</Description>
<Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
</Source>
<Package>
<Name>ckb</Name>
- <Summary xml:lang="en">an open-source driver for Corsair keyboards and mice</Summary>
- <Description xml:lang="en">an open-source driver for Corsair keyboards and mice
+ <Summary xml:lang="en">An open-source driver for Corsair keyboards and mice</Summary>
+ <Description xml:lang="en">ckb-next is an open-source driver for Corsair keyboards and mice. It aims to bring the features of Corsair&apos;s proprietary iCUE software to Linux operating systems.
</Description>
- <PartOf>desktop.core</PartOf>
+ <PartOf>system.utils</PartOf>
<Files>
<Path fileType="executable">/usr/bin/ckb-next</Path>
<Path fileType="executable">/usr/bin/ckb-next-daemon</Path>
@@ -37,17 +38,30 @@
<Path fileType="executable">/usr/libexec/ckb-next-animations/snake</Path>
<Path fileType="executable">/usr/libexec/ckb-next-animations/wave</Path>
<Path fileType="data">/usr/share/applications/ckb-next.desktop</Path>
+ <Path fileType="data">/usr/share/icons/hicolor/128x128/apps/ckb-next-monochrome.png</Path>
+ <Path fileType="data">/usr/share/icons/hicolor/128x128/apps/ckb-next.png</Path>
+ <Path fileType="data">/usr/share/icons/hicolor/16x16/apps/ckb-next-monochrome.png</Path>
+ <Path fileType="data">/usr/share/icons/hicolor/16x16/apps/ckb-next.png</Path>
+ <Path fileType="data">/usr/share/icons/hicolor/22x22/apps/ckb-next-monochrome.png</Path>
+ <Path fileType="data">/usr/share/icons/hicolor/22x22/apps/ckb-next.png</Path>
+ <Path fileType="data">/usr/share/icons/hicolor/256x256/apps/ckb-next-monochrome.png</Path>
+ <Path fileType="data">/usr/share/icons/hicolor/256x256/apps/ckb-next.png</Path>
+ <Path fileType="data">/usr/share/icons/hicolor/32x32/apps/ckb-next-monochrome.png</Path>
+ <Path fileType="data">/usr/share/icons/hicolor/32x32/apps/ckb-next.png</Path>
+ <Path fileType="data">/usr/share/icons/hicolor/48x48/apps/ckb-next-monochrome.png</Path>
+ <Path fileType="data">/usr/share/icons/hicolor/48x48/apps/ckb-next.png</Path>
+ <Path fileType="data">/usr/share/icons/hicolor/512x512/apps/ckb-next-monochrome.png</Path>
<Path fileType="data">/usr/share/icons/hicolor/512x512/apps/ckb-next.png</Path>
</Files>
</Package>
<Package>
<Name>ckb-devel</Name>
<Summary xml:lang="en">Development files for ckb</Summary>
- <Description xml:lang="en">an open-source driver for Corsair keyboards and mice
+ <Description xml:lang="en">ckb-next is an open-source driver for Corsair keyboards and mice. It aims to bring the features of Corsair&apos;s proprietary iCUE software to Linux operating systems.
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="10">ckb</Dependency>
+ <Dependency release="11">ckb</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib64/cmake/ckb-next/Animation/AnimationConfig.cmake</Path>
@@ -56,12 +70,12 @@
</Files>
</Package>
<History>
- <Update release="10">
- <Date>2020-05-12</Date>
- <Version>0.4.2</Version>
+ <Update release="11">
+ <Date>2020-12-25</Date>
+ <Version>0.4.3</Version>
<Comment>Packaging update</Comment>
- <Name>Georg Grabler (STiAT)</Name>
- <Email>ggrabler@gmail.com</Email>
+ <Name>Campbell Jones</Name>
+ <Email>dev@serebit.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Jun 18 2023, 3:23 AM (7 w, 5 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5829779
Default Alt Text
D10220.id24591.diff (12 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.