diff --git a/422.patch b/422.patch index 94b3780..14c4767 100644 --- a/422.patch +++ b/422.patch @@ -20,10 +20,10 @@ This matches usage in src/daemon/CMakeLists.txt src/ckbnextconfig.h.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 07804972..1b9a9e59 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt +Index: ckb-next-0.4.3/src/CMakeLists.txt +=================================================================== +--- ckb-next-0.4.3.orig/src/CMakeLists.txt ++++ ckb-next-0.4.3/src/CMakeLists.txt @@ -27,7 +27,7 @@ # Export version, etc. to source code @@ -33,14 +33,14 @@ index 07804972..1b9a9e59 100644 configure_file( ${CMAKE_CURRENT_LIST_DIR}/ckbnextconfig.h.in ${CMAKE_BINARY_DIR}/ckbnextconfig.h) -diff --git a/src/ckbnextconfig.h.in b/src/ckbnextconfig.h.in -index 7842968a..ed5e2404 100644 ---- a/src/ckbnextconfig.h.in -+++ b/src/ckbnextconfig.h.in +Index: ckb-next-0.4.3/src/ckbnextconfig.h.in +=================================================================== +--- ckb-next-0.4.3.orig/src/ckbnextconfig.h.in ++++ ckb-next-0.4.3/src/ckbnextconfig.h.in @@ -1,5 +1,5 @@ #cmakedefine CKB_NEXT_VERSION_STR "${ckb-next_VERSION}" -#cmakedefine CKB_NEXT_ANIMATIONS_PATH "${CMAKE_INSTALL_PREFIX}/${INSTALL_DIR_ANIMATIONS}" +#cmakedefine CKB_NEXT_ANIMATIONS_PATH "${INSTALL_DIR_ANIMATIONS}" #define CKB_NEXT_PROFILE_VER ${ckb-next_PROFILE_VER} - + #define CKB_NEXT_SETTINGS_VER ${ckb-next_SETTINGS_VER} diff --git a/ckb-next-0.4.2.tar.gz b/ckb-next-0.4.2.tar.gz deleted file mode 100644 index 23f583e..0000000 --- a/ckb-next-0.4.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75b6908d5590c293dee8258a83d4ebe206306d3df9f867596e953ef7c6a86440 -size 883681 diff --git a/ckb-next-0.4.3.tar.gz b/ckb-next-0.4.3.tar.gz new file mode 100644 index 0000000..0163ca0 --- /dev/null +++ b/ckb-next-0.4.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4fbd14227ecc63fad9eaf705ca61defd7b44bcaa3ad29aae18cd8a69bbc9ef9 +size 1588845 diff --git a/ckb-next-gcc10.patch b/ckb-next-gcc10.patch deleted file mode 100644 index abe12c4..0000000 --- a/ckb-next-gcc10.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a9f41cd8b8f5b04c0c66c6d94f96a9725943831e Mon Sep 17 00:00:00 2001 -From: Erik Zeek -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 ---- - 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; diff --git a/ckb-next-systemd.patch b/ckb-next-systemd.patch index 75920e4..8cabe04 100644 --- a/ckb-next-systemd.patch +++ b/ckb-next-systemd.patch @@ -1,8 +1,8 @@ -Index: ckb-next-0.4.1/src/daemon/CMakeLists.txt +Index: ckb-next-0.4.3/src/daemon/CMakeLists.txt =================================================================== ---- ckb-next-0.4.1.orig/src/daemon/CMakeLists.txt -+++ ckb-next-0.4.1/src/daemon/CMakeLists.txt -@@ -294,7 +294,7 @@ elseif (LINUX) +--- ckb-next-0.4.3.orig/src/daemon/CMakeLists.txt ++++ ckb-next-0.4.3/src/daemon/CMakeLists.txt +@@ -302,7 +302,7 @@ elseif (LINUX) endif () # A way to check for systemd @@ -10,8 +10,8 @@ Index: ckb-next-0.4.1/src/daemon/CMakeLists.txt + if (EXISTS "/usr/lib/systemd/system" OR "systemd" IN_LIST FORCE_INIT_SYSTEM) message(STATUS "systemd detected") set(CKB_NEXT_INIT_SYSTEM "systemd" CACHE INTERNAL "") - set(DISALLOW_SYSVINIT TRUE) -@@ -406,7 +406,7 @@ if (MACOS) + set(SYSTEMD_UNIT_INSTALL_DIR "/usr/lib/systemd/system" CACHE STRING "Where to install systemd unit files.") +@@ -415,7 +415,7 @@ if (MACOS) elseif (LINUX) install( TARGETS ckb-next-daemon @@ -20,10 +20,10 @@ Index: ckb-next-0.4.1/src/daemon/CMakeLists.txt endif () # Declare target's auxiliary files installation paths -Index: ckb-next-0.4.1/linux/systemd/ckb-next-daemon.service.in +Index: ckb-next-0.4.3/linux/systemd/ckb-next-daemon.service.in =================================================================== ---- ckb-next-0.4.1.orig/linux/systemd/ckb-next-daemon.service.in -+++ ckb-next-0.4.1/linux/systemd/ckb-next-daemon.service.in +--- ckb-next-0.4.3.orig/linux/systemd/ckb-next-daemon.service.in ++++ ckb-next-0.4.3/linux/systemd/ckb-next-daemon.service.in @@ -5,7 +5,7 @@ Description=Corsair Keyboards and Mice Daemon diff --git a/ckb-next-use-run.patch b/ckb-next-use-run.patch index 3985f05..0208209 100644 --- a/ckb-next-use-run.patch +++ b/ckb-next-use-run.patch @@ -1,14 +1,14 @@ -Index: ckb-next-0.4.1/ckb-next-dev-detect +Index: ckb-next-0.4.3/ckb-next-dev-detect =================================================================== ---- ckb-next-0.4.1.orig/ckb-next-dev-detect -+++ ckb-next-0.4.1/ckb-next-dev-detect +--- ckb-next-0.4.3.orig/ckb-next-dev-detect ++++ ckb-next-0.4.3/ckb-next-dev-detect @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Newline N=$'\n' -@@ -48,7 +48,7 @@ else +@@ -49,7 +49,7 @@ else OUT="${OUT}${N}${N}Daemon on current boot:${N}`journalctl -o short-precise -b 0 --unit=ckb-next-daemon 2>&1`" OUT="${OUT}${N}${N}Daemon on last boot:${N}`journalctl -o short-precise -b -1 --unit=ckb-next-daemon 2>&1`" fi @@ -16,11 +16,11 @@ Index: ckb-next-0.4.1/ckb-next-dev-detect + OUT="${OUT}${N}${N}Dev nodes:${N}`find /run/ckb* -print -type f -exec cat {} \; 2>&1`" OUT="${OUT}${N}${N}Environment:${N}`printenv | grep "QT\|XDG.*DESKTOP\|DISPLAY" 2>&1`" OUT="${OUT}${N}${N}Kernel command line:${N}`cat /proc/cmdline`" - fi -Index: ckb-next-0.4.1/src/daemon/devnode.c + GUIPATH="$(which ckb-next)" +Index: ckb-next-0.4.3/src/daemon/devnode.c =================================================================== ---- ckb-next-0.4.1.orig/src/daemon/devnode.c -+++ ckb-next-0.4.1/src/daemon/devnode.c +--- ckb-next-0.4.3.orig/src/daemon/devnode.c ++++ ckb-next-0.4.3/src/daemon/devnode.c @@ -7,12 +7,7 @@ #include "profile.h" #include @@ -35,12 +35,13 @@ Index: ckb-next-0.4.1/src/daemon/devnode.c long gid = -1; #define S_GID_READ (gid >= 0 ? S_CUSTOM_R : S_READ) -Index: ckb-next-0.4.1/src/gui/kbmanager.cpp +Index: ckb-next-0.4.3/src/gui/kbmanager.cpp =================================================================== ---- ckb-next-0.4.1.orig/src/gui/kbmanager.cpp -+++ ckb-next-0.4.1/src/gui/kbmanager.cpp -@@ -1,10 +1,6 @@ +--- ckb-next-0.4.3.orig/src/gui/kbmanager.cpp ++++ ckb-next-0.4.3/src/gui/kbmanager.cpp +@@ -1,11 +1,7 @@ #include "kbmanager.h" + #include "idletimer.h" -#ifndef Q_OS_MACOS -QString devpath = "/dev/input/ckb%1"; diff --git a/ckb-next.changes b/ckb-next.changes index 428e20b..a006d9b 100644 --- a/ckb-next.changes +++ b/ckb-next.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +Fri Dec 18 07:44:11 UTC 2020 - Luigi Baldoni + +* Update to version 0.4.3 + Support for new devices: + * Scimitar RGB Elite + * Nightsword RGB + Important bugfixes: + * Fixed delay when shutting down with K95 RGB + * Fixed freezing when updating indicator LEDs + * Indicator LEDs are now more responsive when an animation is + playing + * GUI now starts hidden in tray on KDE + * The pipe animation now works consistently between mode + changes + * The pipe animation now handles input commands sent in rapid + succession before the device is updated + * Input works on wayland again after recent updates + * libgdx based games no longer crash on mouse input + * Mouse settings are now correctly restored when resuming from + suspend + * Fixed a bug where some devices would not be initialised on + daemon start and would require a replug + * Fixed layouts for K68, K65, K63, M95 + New features: + * Under X11 only, lights can now automatically turn off after + a user-set time + * Macros now loop when the key is held down + * Macro UI has been redesigned and supports recording from non + ckb-next managed keyboards + * Modes can now be changed automatically based on the current + focused application (X11/XWayland Only) + * Translations are now supported + Notes for packagers: + * The systemd unit directory can be overriden with + -DSYSTEMD_UNIT_INSTALL_DIR + * libappindicator is no longer used + * Minimum Qt version has been bumped up to 5.5.1 (xenial) + * cmake now checks for quazip 1.0 + * The following new dependencies have been introduced: Qt5 + X11Extras, xcb, xcb-screensaver, xcb-ewmh, Qt5 translation + tools, dbusmenu-qt5 +- Refresh ckb-next-use-run.patch, ckb-next-systemd.patch and + 422.patch +- Drop ckb-next-gcc10.patch (merged upstream) + ------------------------------------------------------------------- Sat Aug 29 14:54:55 UTC 2020 - Jannik Seiler diff --git a/ckb-next.spec b/ckb-next.spec index ec764a2..38115cc 100644 --- a/ckb-next.spec +++ b/ckb-next.spec @@ -17,7 +17,7 @@ Name: ckb-next -Version: 0.4.2 +Version: 0.4.3 Release: 0 Summary: RGB driver for Corsair keyboard and mice License: GPL-2.0-only AND BSD-3-Clause @@ -34,8 +34,6 @@ Patch3: ckb-next-no-cmake-modules.patch Patch4: ckb-next-udev.patch # PATCH-FIX-UPSTREAM 422.patch boo#1135528 Patch5: 422.patch -# PATCH-FIX-UPSTREAM ckb-next-gcc10.patch -Patch6: ckb-next-gcc10.patch BuildRequires: ImageMagick BuildRequires: cmake BuildRequires: hicolor-icon-theme @@ -43,12 +41,19 @@ BuildRequires: hicolor-icon-theme BuildRequires: quazip-qt5-devel %endif BuildRequires: update-desktop-files -BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5Widgets) >= 5.2 +BuildRequires: cmake(Qt5DBus) +BuildRequires: cmake(Qt5LinguistTools) +BuildRequires: cmake(Qt5Network) +BuildRequires: cmake(Qt5Widgets) >= 5.2 +BuildRequires: cmake(Qt5X11Extras) +BuildRequires: cmake(dbusmenu-qt5) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse-simple) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(xcb-ewmh) +BuildRequires: pkgconfig(xcb-screensaver) BuildRequires: pkgconfig(zlib) Obsoletes: ckb < %{version} Provides: ckb = %{version} @@ -100,7 +105,7 @@ ln -sf service %{buildroot}%{_sbindir}/rc%{name}-daemon %{_bindir}/%{name} %{_bindir}/%{name}-dev-detect %{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_datadir}/icons/hicolor/*/apps/%{name}*.png %{_sbindir}/rc%{name}-daemon %{_libexecdir}/%{name}-daemon %{_libexecdir}/%{name}-animations