From a0bdf1add7adb3c32ae2e7c558999586baae3416 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 15:29:33 +0000 Subject: [PATCH 01/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ckb-next.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ckb-next.spec b/ckb-next.spec index 61890c7..3c5000f 100644 --- a/ckb-next.spec +++ b/ckb-next.spec @@ -1,6 +1,6 @@ Name: ckb-next Version: 0.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Unofficial driver for Corsair RGB keyboards # ckb-next is GPLv2. @@ -140,6 +140,9 @@ udevadm control --reload-rules 2>&1 > /dev/null || : %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 0.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 0.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From cc3bc0e243055ac17c0776c5e92cc880abd4c715 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 23 Jan 2024 01:40:25 +0000 Subject: [PATCH 02/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ckb-next.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ckb-next.spec b/ckb-next.spec index 3c5000f..7d1e6a0 100644 --- a/ckb-next.spec +++ b/ckb-next.spec @@ -1,6 +1,6 @@ Name: ckb-next Version: 0.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Unofficial driver for Corsair RGB keyboards # ckb-next is GPLv2. @@ -140,6 +140,9 @@ udevadm control --reload-rules 2>&1 > /dev/null || : %changelog +* Tue Jan 23 2024 Fedora Release Engineering - 0.6.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 0.6.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0f47c4f2b786df4057b7af00ccb945a355e249d0 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Tue, 23 Jan 2024 13:20:03 +0100 Subject: [PATCH 03/10] Replace kissfft static linking with dynamic --- 0001-unbundle-kissfft.patch | 11 ++++------- ckb-next.spec | 13 ++++++------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/0001-unbundle-kissfft.patch b/0001-unbundle-kissfft.patch index 56f0254..f561041 100644 --- a/0001-unbundle-kissfft.patch +++ b/0001-unbundle-kissfft.patch @@ -6,10 +6,7 @@ diff -r -U4 ckb-next-0.6.0--orig/src/animations/mviz/CMakeLists.txt ckb-next-0.6 set(AUDIO_LIBRARIES "${PULSEAUDIO_LIBRARIES}") endif () -+add_library(kissfft STATIC IMPORTED) -+set_target_properties(kissfft PROPERTIES IMPORTED_LOCATION "${LIB_INSTALL_DIR}/libkiss_fft_float.a") -+add_library(kissfftr STATIC IMPORTED) -+set_target_properties(kissfftr PROPERTIES IMPORTED_LOCATION "${LIB_INSTALL_DIR}/libkiss_fftr_float.a") ++find_package(kissfft REQUIRED) + if (MACOS) target_link_libraries( @@ -17,18 +14,18 @@ diff -r -U4 ckb-next-0.6.0--orig/src/animations/mviz/CMakeLists.txt ckb-next-0.6 PRIVATE m - KissFFT::KissFFT ++ kissfft::kissfft-float ${CMAKE_PROJECT_NAME}::Animation ${CORESERVICES_LIBRARY} ${COREFOUNDATION_LIBRARY} ${AUDIOUNIT_LIBRARY} -@@ -83,9 +87,10 @@ +@@ -83,9 +85,9 @@ target_link_libraries( mviz PRIVATE m - KissFFT::KissFFT -+ kissfft -+ kissfftr ++ kissfft::kissfft-float ${CMAKE_PROJECT_NAME}::Animation "${AUDIO_LIBRARIES}") else() diff --git a/ckb-next.spec b/ckb-next.spec index 7d1e6a0..94f08e0 100644 --- a/ckb-next.spec +++ b/ckb-next.spec @@ -1,14 +1,9 @@ Name: ckb-next Version: 0.6.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Unofficial driver for Corsair RGB keyboards -# ckb-next is GPLv2. -# -# The kissfft library (src/libs/kissfft) is BSD. -# This library is un-bundled by Patch1, but since it's statically linked, -# its license is still included here. -License: GPL-2.0-only and BSD-3-Clause +License: GPL-2.0-only URL: https://github.com/ckb-next/ckb-next Source0: %{URL}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -140,6 +135,10 @@ udevadm control --reload-rules 2>&1 > /dev/null || : %changelog +* Tue Jan 23 2024 Artur Frenszek-Iwicki - 0.6.0-5 +- Fix FTBFS +- Replace kissfft static linking with dynamic linking + * Tue Jan 23 2024 Fedora Release Engineering - 0.6.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f87cfdefb40a01da003dfefbb78b25c6e26805ff Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Tue, 23 Jan 2024 13:41:24 +0100 Subject: [PATCH 04/10] Fix malformed patch --- 0001-unbundle-kissfft.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/0001-unbundle-kissfft.patch b/0001-unbundle-kissfft.patch index f561041..9026743 100644 --- a/0001-unbundle-kissfft.patch +++ b/0001-unbundle-kissfft.patch @@ -1,7 +1,7 @@ diff -r -U4 ckb-next-0.6.0--orig/src/animations/mviz/CMakeLists.txt ckb-next-0.6.0--patched/src/animations/mviz/CMakeLists.txt --- ckb-next-0.6.0--orig/src/animations/mviz/CMakeLists.txt 2023-06-22 23:07:29.000000000 +0200 -+++ ckb-next-0.6.0--patched/src/animations/mviz/CMakeLists.txt 2023-06-25 22:59:31.481115661 +0200 -@@ -65,14 +65,18 @@ ++++ ckb-next-0.6.0--patched/src/animations/mviz/CMakeLists.txt 2024-01-23 13:15:01.273772139 +0100 +@@ -65,14 +65,16 @@ set(AUDIO_LIBRARIES "${PULSEAUDIO_LIBRARIES}") endif () From 27a53f6dd8a4934fab2a8d8ee3cbf1471a6dd7f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 19:21:26 +0000 Subject: [PATCH 05/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ckb-next.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ckb-next.spec b/ckb-next.spec index 94f08e0..9a3bc27 100644 --- a/ckb-next.spec +++ b/ckb-next.spec @@ -1,6 +1,6 @@ Name: ckb-next Version: 0.6.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Unofficial driver for Corsair RGB keyboards License: GPL-2.0-only @@ -135,6 +135,9 @@ udevadm control --reload-rules 2>&1 > /dev/null || : %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 0.6.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jan 23 2024 Artur Frenszek-Iwicki - 0.6.0-5 - Fix FTBFS - Replace kissfft static linking with dynamic linking From c7b00ea0d4c6cd5689dd87aba51db6b52d50591f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 13:48:04 +0000 Subject: [PATCH 06/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ckb-next.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ckb-next.spec b/ckb-next.spec index 9a3bc27..a0cf1d4 100644 --- a/ckb-next.spec +++ b/ckb-next.spec @@ -1,6 +1,6 @@ Name: ckb-next Version: 0.6.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Unofficial driver for Corsair RGB keyboards License: GPL-2.0-only @@ -135,6 +135,9 @@ udevadm control --reload-rules 2>&1 > /dev/null || : %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 0.6.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 0.6.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From c52e8ad4d5bf283a0bcafa62c35cf04952a9765c Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Sun, 9 Mar 2025 21:52:22 +0100 Subject: [PATCH 07/10] Update to v0.6.1, switch to Qt6 --- .gitignore | 1 + ckb-next.spec | 25 ++++++++++++++----------- sources | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 9177031..0da8a46 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /ckb-next-0.4.4.tar.gz /ckb-next-0.5.0.tar.gz /ckb-next-0.6.0.tar.gz +/ckb-next-0.6.1.tar.gz diff --git a/ckb-next.spec b/ckb-next.spec index a0cf1d4..e73206f 100644 --- a/ckb-next.spec +++ b/ckb-next.spec @@ -1,6 +1,6 @@ Name: ckb-next -Version: 0.6.0 -Release: 7%{?dist} +Version: 0.6.1 +Release: 1%{?dist} Summary: Unofficial driver for Corsair RGB keyboards License: GPL-2.0-only @@ -21,26 +21,24 @@ BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: make BuildRequires: libappstream-glib -BuildRequires: qt5-linguist -BuildRequires: dbusmenu-qt5-devel -BuildRequires: kiss-fft-devel +BuildRequires: cmake(kissfft) +BuildRequires: cmake(Qt6) +BuildRequires: cmake(Qt6LinguistTools) +BuildRequires: cmake(QuaZip-Qt6) +BuildRequires: cmake(zlib) + BuildRequires: libappindicator-devel BuildRequires: libgudev-devel BuildRequires: libxcb-devel BuildRequires: pulseaudio-libs-devel -BuildRequires: qt5-qtbase-devel >= 5.2.0 -BuildRequires: qt5-qtx11extras-devel -BuildRequires: quazip-qt5-devel >= 0.7.3 BuildRequires: xcb-util-devel BuildRequires: xcb-util-wm-devel -BuildRequires: zlib-devel BuildRequires: systemd-devel %{?systemd_requires} -Requires: qt5-qtbase >= 5.2.0 -Requires: qt5ct +Requires: qt6-qtbase # ckb-next, as the name suggests, is a re-activation and continuation of "ckb". # The last released version of the original "ckb" was 0.2.7. @@ -76,6 +74,7 @@ sed -e 's|"/lib/udev/rules.d"|"%{_udevrulesdir}"|g' -i CMakeLists.txt -DFORCE_INIT_SYSTEM=systemd \ -DSAFE_INSTALL=OFF \ -DSAFE_UNINSTALL=OFF \ + -DPREFER_QT6=ON \ %cmake_build @@ -135,6 +134,10 @@ udevadm control --reload-rules 2>&1 > /dev/null || : %changelog +* Sun Mar 09 2025 Artur Frenszek-Iwicki - 0.6.1-1 +- Update to v0.6.1 +- Switch to Qt6 + * Thu Jan 16 2025 Fedora Release Engineering - 0.6.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 9fc37d7..5210aba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ckb-next-0.6.0.tar.gz) = 34236199d420b663bb71db9400622bb868a3a0b384b58d5da3f80d2bd7ec9586d4e4ac9caad0b047b8440dc4200e4dd6077f4e0d1edb5a75a1327bf9c9ba9392 +SHA512 (ckb-next-0.6.1.tar.gz) = 8f7f4eacd1cd3c255f5c57c277f255e30e6ed1ac7635c4aa7d52193bd63f997f6ba9489641c10be8fc8607045537a75816fa9d937585f3c072af6ed0e8240d7f From 0e5e7519115cb697da901f86e7249e3d28798992 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Mon, 17 Mar 2025 21:01:20 +0100 Subject: [PATCH 08/10] Update to v0.6.2 --- .gitignore | 1 + ckb-next.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0da8a46..331f8e0 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /ckb-next-0.5.0.tar.gz /ckb-next-0.6.0.tar.gz /ckb-next-0.6.1.tar.gz +/ckb-next-0.6.2.tar.gz diff --git a/ckb-next.spec b/ckb-next.spec index e73206f..61fa026 100644 --- a/ckb-next.spec +++ b/ckb-next.spec @@ -1,5 +1,5 @@ Name: ckb-next -Version: 0.6.1 +Version: 0.6.2 Release: 1%{?dist} Summary: Unofficial driver for Corsair RGB keyboards @@ -134,6 +134,9 @@ udevadm control --reload-rules 2>&1 > /dev/null || : %changelog +* Mon Mar 17 2025 Artur Frenszek-Iwicki - 0.6.2-1 +- Update to v0.6.2 + * Sun Mar 09 2025 Artur Frenszek-Iwicki - 0.6.1-1 - Update to v0.6.1 - Switch to Qt6 diff --git a/sources b/sources index 5210aba..fbcb2dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ckb-next-0.6.1.tar.gz) = 8f7f4eacd1cd3c255f5c57c277f255e30e6ed1ac7635c4aa7d52193bd63f997f6ba9489641c10be8fc8607045537a75816fa9d937585f3c072af6ed0e8240d7f +SHA512 (ckb-next-0.6.2.tar.gz) = 21eb6fbb295501e1f30ea34e1361b595161db4c498afcc81efaa6ea7593ef4b04d9fb2966913af526e8151173c47b04b4bf199d7a901dcdc17ed6cd2262c5a20 From e3d005efe57b553873864c885f8e4d7b6823e7c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:20:05 +0000 Subject: [PATCH 09/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ckb-next.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ckb-next.spec b/ckb-next.spec index 61fa026..925d845 100644 --- a/ckb-next.spec +++ b/ckb-next.spec @@ -1,6 +1,6 @@ Name: ckb-next Version: 0.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Unofficial driver for Corsair RGB keyboards License: GPL-2.0-only @@ -134,6 +134,9 @@ udevadm control --reload-rules 2>&1 > /dev/null || : %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 0.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Mar 17 2025 Artur Frenszek-Iwicki - 0.6.2-1 - Update to v0.6.2 From 230a524a99abe5ca2da2d4efab1f0ff7175a7fee Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Mon, 10 Nov 2025 17:46:48 +0100 Subject: [PATCH 10/10] Allow to build with CMake 4.0 (rhbz#2380492) --- ckb-next.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ckb-next.spec b/ckb-next.spec index 925d845..aa18c5d 100644 --- a/ckb-next.spec +++ b/ckb-next.spec @@ -1,6 +1,6 @@ Name: ckb-next Version: 0.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Unofficial driver for Corsair RGB keyboards License: GPL-2.0-only @@ -66,6 +66,8 @@ sed -e 's|"/lib/udev/rules.d"|"%{_udevrulesdir}"|g' -i CMakeLists.txt %build +# TODO: Please submit an issue to upstream (rhbz#2380492) +export CMAKE_POLICY_VERSION_MINIMUM=3.5 %cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ @@ -134,6 +136,9 @@ udevadm control --reload-rules 2>&1 > /dev/null || : %changelog +* Mon Nov 10 2025 Cristian Le - 0.6.2-3 +- Allow to build with CMake 4.0 (rhbz#2380492) + * Wed Jul 23 2025 Fedora Release Engineering - 0.6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild