File ckb-next-use-run.patch of Package ckb-next

Overview Repositories Revisions Requests Users Attributes Meta

File ckb-next-use-run.patch of Package ckb-next

diff -Naur ckb-next-0.6.0.orig/ckb-next-dev-detect ckb-next-0.6.0/ckb-next-dev-detect
--- ckb-next-0.6.0.orig/ckb-next-dev-detect	2023-06-22 23:07:29.000000000 +0200
+++ ckb-next-0.6.0/ckb-next-dev-detect	2023-06-25 10:58:28.109452264 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 # Newline
 N=$'\n'
@@ -69,7 +69,7 @@
             OUT="${OUT}${N}${N}Daemon on current boot:${N}`journalctl -o short-precise -b 0 --unit=ckb-next-daemon 2>&1`"
             OUT="${OUT}${N}${N}Daemon on last boot:${N}`journalctl -o short-precise -b -1 --unit=ckb-next-daemon 2>&1`"
         fi
-        OUT="${OUT}${N}${N}Dev nodes:${N}`find /dev/input/ckb* -print -type f -exec cat {} \; 2>&1`"
+        OUT="${OUT}${N}${N}Dev nodes:${N}`find /run/ckb* -print -type f -exec cat {} \; 2>&1`"
         OUT="${OUT}${N}${N}Kernel command line:${N}`cat /proc/cmdline`"
         GUIPATH="$(which ckb-next)"
         OUT="${OUT}${N}${N}GUI ldd:${N}`ldd ${GUIPATH}`"
diff -Naur ckb-next-0.6.0.orig/src/daemon/devnode.c ckb-next-0.6.0/src/daemon/devnode.c
--- ckb-next-0.6.0.orig/src/daemon/devnode.c	2023-06-22 23:07:29.000000000 +0200
+++ ckb-next-0.6.0/src/daemon/devnode.c	2023-06-25 11:00:12.833333006 +0200
@@ -7,13 +7,7 @@
 #include "profile.h"
 #include <ckbnextconfig.h>
 
-// OSX doesn't like putting FIFOs in /dev for some reason
-// Don't make these pointers, as doing so will result in sizeof() not producing the correct result.
-#ifndef OS_MAC
-#define DEVPATH "/dev/input/ckb"
-#else
-#define DEVPATH "/var/run/ckb"
-#endif
+#define DEVPATH "/run/ckb"
 
 const char devpath[] = DEVPATH;
 #define DEVPATH_LEN (sizeof(devpath) - 1)
diff -Naur ckb-next-0.6.0.orig/src/gui/kbmanager.cpp ckb-next-0.6.0/src/gui/kbmanager.cpp
--- ckb-next-0.6.0.orig/src/gui/kbmanager.cpp	2023-06-22 23:07:29.000000000 +0200
+++ ckb-next-0.6.0/src/gui/kbmanager.cpp	2023-06-25 11:01:01.785277266 +0200
@@ -2,11 +2,7 @@
 #include "idletimer.h"
 #include <limits>
 
-#ifndef Q_OS_MACOS
-QString devpath = "/dev/input/ckb%1";
-#else
-QString devpath = "/var/run/ckb%1";
-#endif
+QString devpath = "/run/ckb%1";
 
 #ifdef DEBUG_IDLE_TIMER
 #define IDLE_TIMER_DURATION 5000

Places

File ckb-next-use-run.patch of Package ckb-next

Places