diff --git a/.gitignore b/.gitignore index 331f8e0..9177031 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,3 @@ /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 -/ckb-next-0.6.2.tar.gz diff --git a/0001-unbundle-kissfft.patch b/0001-unbundle-kissfft.patch index 9026743..56f0254 100644 --- a/0001-unbundle-kissfft.patch +++ b/0001-unbundle-kissfft.patch @@ -1,12 +1,15 @@ 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 2024-01-23 13:15:01.273772139 +0100 -@@ -65,14 +65,16 @@ ++++ ckb-next-0.6.0--patched/src/animations/mviz/CMakeLists.txt 2023-06-25 22:59:31.481115661 +0200 +@@ -65,14 +65,18 @@ set(AUDIO_LIBRARIES "${PULSEAUDIO_LIBRARIES}") endif () -+find_package(kissfft REQUIRED) ++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") + if (MACOS) target_link_libraries( @@ -14,18 +17,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 +85,9 @@ +@@ -83,9 +87,10 @@ target_link_libraries( mviz PRIVATE m - KissFFT::KissFFT -+ kissfft::kissfft-float ++ kissfft ++ kissfftr ${CMAKE_PROJECT_NAME}::Animation "${AUDIO_LIBRARIES}") else() diff --git a/ckb-next.spec b/ckb-next.spec index aa18c5d..893e31d 100644 --- a/ckb-next.spec +++ b/ckb-next.spec @@ -1,9 +1,14 @@ Name: ckb-next -Version: 0.6.2 -Release: 3%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: Unofficial driver for Corsair RGB keyboards -License: GPL-2.0-only +# 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: GPLv2 and BSD URL: https://github.com/ckb-next/ckb-next Source0: %{URL}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -21,24 +26,26 @@ BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: make BuildRequires: libappstream-glib +BuildRequires: qt5-linguist -BuildRequires: cmake(kissfft) -BuildRequires: cmake(Qt6) -BuildRequires: cmake(Qt6LinguistTools) -BuildRequires: cmake(QuaZip-Qt6) -BuildRequires: cmake(zlib) - +BuildRequires: dbusmenu-qt5-devel +BuildRequires: kiss-fft-devel 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: qt6-qtbase +Requires: qt5-qtbase >= 5.2.0 +Requires: qt5ct # 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. @@ -66,8 +73,6 @@ 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} \ @@ -76,7 +81,6 @@ export CMAKE_POLICY_VERSION_MINIMUM=3.5 -DFORCE_INIT_SYSTEM=systemd \ -DSAFE_INSTALL=OFF \ -DSAFE_UNINSTALL=OFF \ - -DPREFER_QT6=ON \ %cmake_build @@ -136,52 +140,13 @@ 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 - -* 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 - -* 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 - -* 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 - -* 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 - * Sun Jun 25 2023 Artur Frenszek-Iwicki - 0.6.0-1 - Update to v0.6.0 - Drop Patch0 (buffer overflow fix - backported from this release) -* Fri May 05 2023 Nicolas Chauvet - 0.5.0-5 -- Rebuilt for quazip 1.4 - -* Tue May 02 2023 Artur Frenszek-Iwicki - 0.5.0-4 +* Tue May 02 2023 Artur Frenszek-Iwicki - 0.5.0-3 - Add a patch to fix program aborting on launch - Un-bundle kissfft -- Convert License tag to SPDX - -* Wed Jan 18 2023 Fedora Release Engineering - 0.5.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild * Wed Jul 20 2022 Fedora Release Engineering - 0.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index fbcb2dc..9fc37d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ckb-next-0.6.2.tar.gz) = 21eb6fbb295501e1f30ea34e1361b595161db4c498afcc81efaa6ea7593ef4b04d9fb2966913af526e8151173c47b04b4bf199d7a901dcdc17ed6cd2262c5a20 +SHA512 (ckb-next-0.6.0.tar.gz) = 34236199d420b663bb71db9400622bb868a3a0b384b58d5da3f80d2bd7ec9586d4e4ac9caad0b047b8440dc4200e4dd6077f4e0d1edb5a75a1327bf9c9ba9392