Luigi Baldoni
ea251fe22f
Update to version 0.4.1 OBS-URL: https://build.opensuse.org/request/show/726583 OBS-URL: https://build.opensuse.org/package/show/hardware/ckb-next?expand=0&rev=8
54 lines
1.9 KiB
Diff
54 lines
1.9 KiB
Diff
Index: ckb-next-0.4.1/ckb-next-dev-detect
|
|
===================================================================
|
|
--- ckb-next-0.4.1.orig/ckb-next-dev-detect
|
|
+++ ckb-next-0.4.1/ckb-next-dev-detect
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/env bash
|
|
+#!/bin/bash
|
|
|
|
# Newline
|
|
N=$'\n'
|
|
@@ -48,7 +48,7 @@ else
|
|
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}Environment:${N}`printenv | grep "QT\|XDG.*DESKTOP\|DISPLAY" 2>&1`"
|
|
OUT="${OUT}${N}${N}Kernel command line:${N}`cat /proc/cmdline`"
|
|
fi
|
|
Index: ckb-next-0.4.1/src/daemon/devnode.c
|
|
===================================================================
|
|
--- ckb-next-0.4.1.orig/src/daemon/devnode.c
|
|
+++ ckb-next-0.4.1/src/daemon/devnode.c
|
|
@@ -7,12 +7,7 @@
|
|
#include "profile.h"
|
|
#include <ckbnextconfig.h>
|
|
|
|
-// OSX doesn't like putting FIFOs in /dev for some reason
|
|
-#ifndef OS_MAC
|
|
-const char *const devpath = "/dev/input/ckb";
|
|
-#else
|
|
-const char *const devpath = "/var/run/ckb";
|
|
-#endif
|
|
+const char *const devpath = "/run/ckb";
|
|
|
|
long gid = -1;
|
|
#define S_GID_READ (gid >= 0 ? S_CUSTOM_R : S_READ)
|
|
Index: ckb-next-0.4.1/src/gui/kbmanager.cpp
|
|
===================================================================
|
|
--- ckb-next-0.4.1.orig/src/gui/kbmanager.cpp
|
|
+++ ckb-next-0.4.1/src/gui/kbmanager.cpp
|
|
@@ -1,10 +1,6 @@
|
|
#include "kbmanager.h"
|
|
|
|
-#ifndef Q_OS_MACOS
|
|
-QString devpath = "/dev/input/ckb%1";
|
|
-#else
|
|
-QString devpath = "/var/run/ckb%1";
|
|
-#endif
|
|
+QString devpath = "/run/ckb%1";
|
|
|
|
QString KbManager::_guiVersion, KbManager::_daemonVersion = DAEMON_UNAVAILABLE_STR;
|
|
KbManager* KbManager::_kbManager = 0;
|