commit: 8080c1142003a9ac0172208bb9c9bec67208921b Author: John Helmert III <ajak <AT> gentoo <DOT> org> AuthorDate: Fri Mar 21 04:01:37 2025 +0000 Commit: John Helmert III <ajak <AT> gentoo <DOT> org> CommitDate: Fri Mar 21 04:01:37 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8080c114
app-misc/ckb: drop 0.6.0-r2 Signed-off-by: John Helmert III <ajak <AT> gentoo.org> app-misc/ckb/Manifest | 1 - app-misc/ckb/ckb-0.6.0-r2.ebuild | 77 -------------------------- app-misc/ckb/files/ckb-0.6.0-fix-bashism.patch | 16 ------ app-misc/ckb/files/ckb-0.6.0-odr.patch | 32 ----------- 4 files changed, 126 deletions(-) diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest index 6ad090b51b4c..1fba0b5177a3 100644 --- a/app-misc/ckb/Manifest +++ b/app-misc/ckb/Manifest @@ -1,3 +1,2 @@ -DIST ckb-0.6.0.tar.gz 1835972 BLAKE2B a6d905cf4a62e9395e008628a2b585681f4fa4af52305a11e49d2f00db990a966be79f97e0ae684031a45bf77b372548b64e2b0f87e344eaa0eb67c07117f89c SHA512 34236199d420b663bb71db9400622bb868a3a0b384b58d5da3f80d2bd7ec9586d4e4ac9caad0b047b8440dc4200e4dd6077f4e0d1edb5a75a1327bf9c9ba9392 DIST ckb-0.6.1.tar.gz 1861827 BLAKE2B 1efc2e3db0d5ab81871f36f687db8b91ad0cd5ca400968829fc5cf406ab615d04882772fb25c8e8351ecd87ed32d754190bbdf902552839dfe5540bdb713c541 SHA512 8f7f4eacd1cd3c255f5c57c277f255e30e6ed1ac7635c4aa7d52193bd63f997f6ba9489641c10be8fc8607045537a75816fa9d937585f3c072af6ed0e8240d7f DIST ckb-0.6.2.tar.gz 1864977 BLAKE2B bf419ca453735f9ea83483261f675f20c997cb6def323fcb9157509c6ad518b4d8c73c145509c0de9d2c74df14ed6501bb6a35013c4d4575757ce24394419fad SHA512 21eb6fbb295501e1f30ea34e1361b595161db4c498afcc81efaa6ea7593ef4b04d9fb2966913af526e8151173c47b04b4bf199d7a901dcdc17ed6cd2262c5a20 diff --git a/app-misc/ckb/ckb-0.6.0-r2.ebuild b/app-misc/ckb/ckb-0.6.0-r2.ebuild deleted file mode 100644 index 360dd872a604..000000000000 --- a/app-misc/ckb/ckb-0.6.0-r2.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake udev xdg - -DESCRIPTION="Corsair K65/K70/K95 Driver" -HOMEPAGE="https://github.com/ckb-next/ckb-next"; - -if [[ ${PV} == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ckb-next/ckb-next.git"; -else - SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64" - S="${WORKDIR}/${PN}-next-${PV}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="systemd" - -RDEPEND=" - dev-libs/libdbusmenu-qt - dev-libs/quazip:0=[qt5(+)] - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - || ( - media-libs/libpulse - media-sound/apulse[sdk] - ) - virtual/libudev:= - x11-libs/libxcb:= - x11-libs/xcb-util-wm" -DEPEND="${RDEPEND}" -BDEPEND="dev-qt/linguist-tools:5" - -PATCHES=( - "${FILESDIR}/${P}-fix-bashism.patch" - "${FILESDIR}/${P}-odr.patch" -) - -src_configure() { - local mycmakeargs=( - -DDISABLE_UPDATER=yes - -DFORCE_INIT_SYSTEM=$(usex systemd systemd openrc) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - dodoc CHANGELOG.md -} - -pkg_postinst() { - udev_reload - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "The ckb daemon will have to be started before use:" - elog - if use systemd ; then - elog "# systemctl start ckb-next-daemon" - else - elog "# rc-config start ckb-next-daemon" - fi - fi -} - -pkg_postrm() { - udev_reload -} diff --git a/app-misc/ckb/files/ckb-0.6.0-fix-bashism.patch b/app-misc/ckb/files/ckb-0.6.0-fix-bashism.patch deleted file mode 100644 index 8cdc2aa59a0e..000000000000 --- a/app-misc/ckb/files/ckb-0.6.0-fix-bashism.patch +++ /dev/null @@ -1,16 +0,0 @@ -From https://github.com/ckb-next/ckb-next/commit/76a47f95b442a1ae5a9c7448566eaafd8863ca8d -From: Willow Barraco <cont...@willowbarraco.fr> -Date: Wed, 19 Jul 2023 09:38:09 +0200 -Subject: [PATCH] Fix ckb-next-daemon OpenRC service file - ---- a/linux/openrc/ckb-next-daemon.in -+++ b/linux/openrc/ckb-next-daemon.in -@@ -7,4 +7,4 @@ command="@CMAKE_INSTALL_PREFIX@/bin/ckb-next-daemon" - description="Corsair Keyboards and Mice Daemon" - pidfile="/dev/input/ckb0/pid" - logfile="/var/log/${RC_SVCNAME}.log" --start_stop_daemon_args+="--background --stdout ${logfile} --stderr ${logfile}" -+start_stop_daemon_args="$start_stop_daemon_args --background --stdout ${logfile} --stderr ${logfile}" --- -2.43.0 - diff --git a/app-misc/ckb/files/ckb-0.6.0-odr.patch b/app-misc/ckb/files/ckb-0.6.0-odr.patch deleted file mode 100644 index 9547fe4edaf9..000000000000 --- a/app-misc/ckb/files/ckb-0.6.0-odr.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://bugs.gentoo.org/924410 - -From c5b68a00867b2add28bfd62430c45781ac2e9cb8 Mon Sep 17 00:00:00 2001 -From: John Helmert III <a...@gentoo.org> -Date: Fri, 16 Feb 2024 22:14:24 -0800 -Subject: [PATCH] ckbsettingswriter: mirror QT version guards from ckbsettings - -The differing definitions between ckbsettingswriter.cpp and -ckbsettings.cpp trigger compilation errors with -Werror=odr. - -Signed-off-by: John Helmert III <a...@gentoo.org> ---- a/src/gui/ckbsettingswriter.cpp -+++ b/src/gui/ckbsettingswriter.cpp -@@ -1,9 +1,18 @@ - #include "ckbsettingswriter.h" -+ -+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) -+#include <QRecursiveMutex> -+#else - #include <QMutex> -+#endif - - // Mirror ckbsettings.cpp - extern QAtomicInt cacheWritesInProgress; -+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) -+extern QRecursiveMutex settingsMutex, settingsCacheMutex; -+#else - extern QMutex settingsMutex, settingsCacheMutex; -+#endif - #define lockMutex QMutexLocker locker(backing == _globalSettings ? &mutex : 0) - #define lockMutexStatic QMutexLocker locker(&settingsMutex) - #define lockMutexStatic2 QMutexLocker locker2(&settingsMutex)
