diff options
Diffstat (limited to 'app-misc/ckb')
-rw-r--r-- | app-misc/ckb/Manifest | 2 | ||||
-rw-r--r-- | app-misc/ckb/ckb-0.6.0-r1.ebuild (renamed from app-misc/ckb/ckb-0.5.0-r1.ebuild) | 9 | ||||
-rw-r--r-- | app-misc/ckb/ckb-0.6.0-r2.ebuild | 77 | ||||
-rw-r--r-- | app-misc/ckb/ckb-9999.ebuild | 5 | ||||
-rw-r--r-- | app-misc/ckb/files/ckb-0.6.0-fix-bashism.patch | 16 | ||||
-rw-r--r-- | app-misc/ckb/files/ckb-0.6.0-odr.patch | 32 |
6 files changed, 134 insertions, 7 deletions
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest index 4cdf752d6a62..ceef690989a2 100644 --- a/app-misc/ckb/Manifest +++ b/app-misc/ckb/Manifest @@ -1 +1 @@ -DIST ckb-0.5.0.tar.gz 1868880 BLAKE2B 867923f4eaf5d0e9d4ec14c5bd5952d88436c12a0d615528e083705cff7346a654dc801e743519e5482e8beb1cd28284710000e69b20032856b0e22d48792ee3 SHA512 d4e46466df4cdac7f4d4be05072592101780c94af261ec1b0bf6ec8bb1f97f892fb5da17dd91cf5f9b45fe128547cc7393c13e29843d6a7ae0de7a4688a5cdb1 +DIST ckb-0.6.0.tar.gz 1835972 BLAKE2B a6d905cf4a62e9395e008628a2b585681f4fa4af52305a11e49d2f00db990a966be79f97e0ae684031a45bf77b372548b64e2b0f87e344eaa0eb67c07117f89c SHA512 34236199d420b663bb71db9400622bb868a3a0b384b58d5da3f80d2bd7ec9586d4e4ac9caad0b047b8440dc4200e4dd6077f4e0d1edb5a75a1327bf9c9ba9392 diff --git a/app-misc/ckb/ckb-0.5.0-r1.ebuild b/app-misc/ckb/ckb-0.6.0-r1.ebuild index 168115f90d2b..ff1d9c5f596f 100644 --- a/app-misc/ckb/ckb-0.5.0-r1.ebuild +++ b/app-misc/ckb/ckb-0.6.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -31,16 +31,19 @@ RDEPEND=" dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 || ( - media-sound/pulseaudio + media-libs/libpulse media-sound/apulse[sdk] ) virtual/libudev:= - x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-wm" DEPEND="${RDEPEND}" BDEPEND="dev-qt/linguist-tools:5" +PATCHES=( + "${FILESDIR}/${P}-fix-bashism.patch" +) + src_configure() { local mycmakeargs=( -DDISABLE_UPDATER=yes diff --git a/app-misc/ckb/ckb-0.6.0-r2.ebuild b/app-misc/ckb/ckb-0.6.0-r2.ebuild new file mode 100644 index 000000000000..c70828a260ad --- /dev/null +++ b/app-misc/ckb/ckb-0.6.0-r2.ebuild @@ -0,0 +1,77 @@ +# 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/ckb-9999.ebuild b/app-misc/ckb/ckb-9999.ebuild index e967450af9c0..278944d48117 100644 --- a/app-misc/ckb/ckb-9999.ebuild +++ b/app-misc/ckb/ckb-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -31,11 +31,10 @@ RDEPEND=" dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 || ( - media-sound/pulseaudio + media-libs/libpulse media-sound/apulse[sdk] ) virtual/libudev:= - x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-wm" DEPEND="${RDEPEND}" 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 new file mode 100644 index 000000000000..8cdc2aa59a0e --- /dev/null +++ b/app-misc/ckb/files/ckb-0.6.0-fix-bashism.patch @@ -0,0 +1,16 @@ +From https://github.com/ckb-next/ckb-next/commit/76a47f95b442a1ae5a9c7448566eaafd8863ca8d +From: Willow Barraco <contact@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 new file mode 100644 index 000000000000..9547fe4edaf9 --- /dev/null +++ b/app-misc/ckb/files/ckb-0.6.0-odr.patch @@ -0,0 +1,32 @@ +https://bugs.gentoo.org/924410 + +From c5b68a00867b2add28bfd62430c45781ac2e9cb8 Mon Sep 17 00:00:00 2001 +From: John Helmert III <ajak@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 <ajak@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) |