From f848d5eacad65f1f52c168d9b0f74dec3e89b203 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 9 Sep 2022 22:41:02 +0100 Subject: gentoo auto-resync : 09:09:2022 - 22:41:02 --- app-misc/ckb/Manifest | 8 +-- app-misc/ckb/ckb-0.4.4-r2.ebuild | 65 ----------------------- app-misc/ckb/ckb-0.5.0.ebuild | 4 +- app-misc/ckb/ckb-9999.ebuild | 2 +- app-misc/ckb/files/ckb-0.4.4-libinput-1.2.0.patch | 29 ---------- app-misc/ckb/files/ckb.initd | 29 ---------- 6 files changed, 5 insertions(+), 132 deletions(-) delete mode 100644 app-misc/ckb/ckb-0.4.4-r2.ebuild delete mode 100644 app-misc/ckb/files/ckb-0.4.4-libinput-1.2.0.patch delete mode 100644 app-misc/ckb/files/ckb.initd (limited to 'app-misc/ckb') diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest index d08499216cc4..58e3f4985b3f 100644 --- a/app-misc/ckb/Manifest +++ b/app-misc/ckb/Manifest @@ -1,8 +1,4 @@ -AUX ckb-0.4.4-libinput-1.2.0.patch 1188 BLAKE2B 36ee73dbd1f8ffa70fae27dd4915837d09eef2226d908aa4cd8e7b5c9bde2a645cb212535d33879efdefee687ac52177979116a0ef81ee921f24fad1654608de SHA512 1d39cfe1bceb8b950f6952e57c7848870a3ffd359adb2245b570dc9fe928480b07cd5332e3cabb9b47090b4b3216474f380c5679db963611c7657bea7d3ac083 -AUX ckb.initd 659 BLAKE2B 1de2e8b9b555f2d083698e8302c972619dc08ca652bb1ef06e3a72ec9fa026f74aadb5e86491b4a95fe1c44699a21802907c75c67e3d09bc12caa2114052eaf8 SHA512 45c98f5b3cf2868fd7a5b0a015222b1dc6608847d380a1a3ccc95fab306bfde642a74e5dafe1545b380516fb4d41e30d76b9c1f826882dae28a0332f6c3b40ad -DIST ckb-0.4.4.tar.gz 1593244 BLAKE2B 99476d3be98b3edac540b67b275a1ebec440f2a55d8bedd9bbdc815abd15bbeb3d035c703faa2dfdf9f4dcb70f49024c82b2990b1151b0ad5b78b741430d80f9 SHA512 b03d301a6b984957b5a3047769f25311c479f7992c59222b0ce9314b3204dac2d937c26997b97ec2ee1fdc79e3208c76a57a5c603dc1cd99ffb39fd426f58385 DIST ckb-0.5.0.tar.gz 1868880 BLAKE2B 867923f4eaf5d0e9d4ec14c5bd5952d88436c12a0d615528e083705cff7346a654dc801e743519e5482e8beb1cd28284710000e69b20032856b0e22d48792ee3 SHA512 d4e46466df4cdac7f4d4be05072592101780c94af261ec1b0bf6ec8bb1f97f892fb5da17dd91cf5f9b45fe128547cc7393c13e29843d6a7ae0de7a4688a5cdb1 -EBUILD ckb-0.4.4-r2.ebuild 1269 BLAKE2B 6f89a70844db99930f3166037efbdcbdb1ae37dd777ac44642c215ad7ccfbbcf2cd4b93cfdff204a2eb165a1469689576d2d469e53493475a103af6e6a2690ef SHA512 8606b55a8889e04b56e1e9b6299235b78781151d3be0bbd852bc6b72a3a8e34993cf5c22a43bf31914e3a807fe58f2d89683327543f38f0622c674dd793cfd97 -EBUILD ckb-0.5.0.ebuild 1383 BLAKE2B 6fac392ed01a5dd15288f02a78c481c4a90e46973bb72f40d251a662bd6d78b9d1fa56def7cb0e68e8147c2afd351986f410e9f398363b5775a1bb2d7dd3677f SHA512 fdbe58405022601d56f8b4e1b97834d02da0fddd21e3545c4f28ffd34b50fe868c42f74e1c1a8dc31d202ba1e89527595db560b55fcfe395a280c66c6f4edd4e -EBUILD ckb-9999.ebuild 1383 BLAKE2B 6fac392ed01a5dd15288f02a78c481c4a90e46973bb72f40d251a662bd6d78b9d1fa56def7cb0e68e8147c2afd351986f410e9f398363b5775a1bb2d7dd3677f SHA512 fdbe58405022601d56f8b4e1b97834d02da0fddd21e3545c4f28ffd34b50fe868c42f74e1c1a8dc31d202ba1e89527595db560b55fcfe395a280c66c6f4edd4e +EBUILD ckb-0.5.0.ebuild 1390 BLAKE2B aa692e11f58277dcf21b0c1585c88612173c78e9d18d2931eef64a9e2c2ba1d7846387a83e13d658f7b02c7fc4566137f92920aeca0265fafdbf86edba912cb5 SHA512 3062729bc4735aa8fac53f7b30ab5559f4afac3c5fcbae6f76f8e4a34589433ce35c1ca5c929b73c79e426f0a9f0087b3554afdd0f17dbc191ef45d8b1f50714 +EBUILD ckb-9999.ebuild 1391 BLAKE2B 7a5fd88fb9bbd46f34348e3f93fa3f388755a53f3f806e80bb678d56e916bcc56ec7929ffa11665139dd0a3c35daef3b2bd7f7d3ef99bf07c8cf6c78f30ee56d SHA512 70f9e226901ae57ab8b3b8e09899ceeb39785a7eb7680dae3e4977829345b63fbd0f21b74f80b44f9075a488412adbf21aaf00af78131127d6551be0d8924830 MISC metadata.xml 330 BLAKE2B 1620c787b0b2ede7874f1b8dba4aa6629f436217278024965a9e5a715cb3196b8630351a1b742f7f05177dc7a22b76caf16cc0ed8fd52dec2e81c54dc1f7f3db SHA512 241b50400569870e01576e52b871aded1ab05853677a05ac42a54eb03295ec9e197a6a592e9182c1169dc9e1f963b9439bce6a2c75eddf5ea7168e07ca362dae diff --git a/app-misc/ckb/ckb-0.4.4-r2.ebuild b/app-misc/ckb/ckb-0.4.4-r2.ebuild deleted file mode 100644 index 23b07d7ed988..000000000000 --- a/app-misc/ckb/ckb-0.4.4-r2.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit xdg cmake - -DESCRIPTION="Corsair K65/K70/K95 Driver" -HOMEPAGE="https://github.com/ckb-next/ckb-next" -SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64" -IUSE="systemd" - -RDEPEND=" - dev-libs/libdbusmenu-qt - dev-libs/quazip:0= - 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-sound/pulseaudio - virtual/libudev:= - x11-libs/libX11 - x11-libs/libxcb:= - x11-libs/xcb-util-wm" -DEPEND="${RDEPEND}" -BDEPEND="dev-qt/linguist-tools:5" - -S="${WORKDIR}/${PN}-next-${PV}" - -PATCHES=( - "${FILESDIR}/${P}-libinput-1.2.0.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 - - newinitd "${FILESDIR}"/ckb.initd ckb-daemon -} - -pkg_postinst() { - 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-service ckb start" - fi - fi -} diff --git a/app-misc/ckb/ckb-0.5.0.ebuild b/app-misc/ckb/ckb-0.5.0.ebuild index 4629a34e2bd8..168115f90d2b 100644 --- a/app-misc/ckb/ckb-0.5.0.ebuild +++ b/app-misc/ckb/ckb-0.5.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then 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" + KEYWORDS="amd64" S="${WORKDIR}/${PN}-next-${PV}" fi @@ -23,7 +23,7 @@ IUSE="systemd" RDEPEND=" dev-libs/libdbusmenu-qt - dev-libs/quazip:0= + dev-libs/quazip:0=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 diff --git a/app-misc/ckb/ckb-9999.ebuild b/app-misc/ckb/ckb-9999.ebuild index 4629a34e2bd8..e967450af9c0 100644 --- a/app-misc/ckb/ckb-9999.ebuild +++ b/app-misc/ckb/ckb-9999.ebuild @@ -23,7 +23,7 @@ IUSE="systemd" RDEPEND=" dev-libs/libdbusmenu-qt - dev-libs/quazip:0= + dev-libs/quazip:0=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 diff --git a/app-misc/ckb/files/ckb-0.4.4-libinput-1.2.0.patch b/app-misc/ckb/files/ckb-0.4.4-libinput-1.2.0.patch deleted file mode 100644 index 211d5e4ea01e..000000000000 --- a/app-misc/ckb/files/ckb-0.4.4-libinput-1.2.0.patch +++ /dev/null @@ -1,29 +0,0 @@ -From dc4dc54c5ebac7e4b455d8df35076fc044a581a7 Mon Sep 17 00:00:00 2001 -From: Tasos Sahanidis -Date: Mon, 20 Sep 2021 14:48:18 +0300 -Subject: [PATCH] Don't enable unneeded axes in mouse device - -Specifically, we used to enable HI_RES wheel events without ever -sending any. This breaks scrolling in latest libinput as it expects -us to actually send HI_RES events. ---- - src/daemon/input_linux.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/daemon/input_linux.c b/src/daemon/input_linux.c -index 68cc0ebb..a9ac8c8e 100644 ---- a/src/daemon/input_linux.c -+++ b/src/daemon/input_linux.c -@@ -25,8 +25,10 @@ int uinputopen(struct uinput_user_dev* indev, int mouse){ - ioctl(fd, UI_SET_KEYBIT, i); - // Enable mouse axes - ioctl(fd, UI_SET_EVBIT, EV_REL); -- for(int i = 0; i < REL_CNT; i++) -- ioctl(fd, UI_SET_RELBIT, i); -+ ioctl(fd, UI_SET_RELBIT, REL_X); -+ ioctl(fd, UI_SET_RELBIT, REL_Y); -+ ioctl(fd, UI_SET_RELBIT, REL_WHEEL); -+ ioctl(fd, UI_SET_RELBIT, REL_HWHEEL); - } else { - // Enable common keyboard keys - for(int i = KEY_ESC; i <= KEY_MEDIA; i++) diff --git a/app-misc/ckb/files/ckb.initd b/app-misc/ckb/files/ckb.initd deleted file mode 100644 index 76af0fd8438b..000000000000 --- a/app-misc/ckb/files/ckb.initd +++ /dev/null @@ -1,29 +0,0 @@ -#!/sbin/openrc-run -## Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_started_commands="reload" -command="/usr/bin/ckb-daemon" -description="Controller for Corsair Keyboard Driver" -pidfile="/run/ckb.pid" -logfile="/var/run/ckb.log" - -start() { - ebegin "Starting Corsair Keyboard Driver" - start-stop-daemon --start --exec "${command}" --pidfile "${pidfile}" --background \ - --stdout "${logfile}" --stderr "${logfile}" - eend $? -} - -stop() { - ebegin "Stopping Corsair Keyboard Driver" - start-stop-daemon --stop --exec "${command}" --pidfile "${pidfile}" - eend $? - -} - -reload() { - stop - sleep 3 - start -} -- cgit v1.2.3