[neon/plasma/plasma-bigscreen/Neon/unstable] debian/patches: refresh patch

[Carlos De Maine]

Git commit d732a15711c91172dd7ec1b5fafdf674e2eed372 by Carlos De Maine.
Committed on 14/07/2026 at 11:44.
Pushed by carlosdem into branch 'Neon/unstable'.

refresh patch

M  +28   -10   debian/patches/patch_out_file_conflict.diff

https://invent.kde.org/neon/plasma/plasma-bigscreen/-/commit/d732a15711c91172dd7ec1b5fafdf674e2eed372

diff --git a/debian/patches/patch_out_file_conflict.diff b/debian/patches/patch_out_file_conflict.diff
index 4b12966..8fc608b 100644
--- a/debian/patches/patch_out_file_conflict.diff
+++ b/debian/patches/patch_out_file_conflict.diff
@@ -1,14 +1,32 @@
-diff --git a/inputhandler/40-uinput.rules b/inputhandler/40-plasma-bigscreen-uinput.rules
-similarity index 100%
-rename from inputhandler/40-uinput.rules
-rename to inputhandler/40-plasma-bigscreen-uinput.rules
+diff --git a/inputhandler/40-uinput-plasma-bigscreen-input-group.rules b/inputhandler/40-uinput-plasma-bigscreen-input-group.rules
+new file mode 100644
+index 00000000..1b53d3d8
+--- /dev/null
++++ b/inputhandler/40-uinput-plasma-bigscreen-input-group.rules
+@@ -0,0 +1,3 @@
++# SPDX-FileCopyrightText: 2026 Bart Ribbers <bribbers at disroot.org>
++# SPDX-License-Identifier: CC0-1.0
++SUBSYSTEM=="misc", KERNEL=="uinput", MODE="0660", GROUP="input"
+diff --git a/inputhandler/40-uinput-plasma-bigscreen-uaccess.rules b/inputhandler/40-uinput-plasma-bigscreen-uaccess.rules
+new file mode 100644
+index 00000000..e380df7f
+--- /dev/null
++++ b/inputhandler/40-uinput-plasma-bigscreen-uaccess.rules
+@@ -0,0 +1,3 @@
++# SPDX-FileCopyrightText: 2025 Martin Sh <hemisputnik at proton.me>
++# SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
++SUBSYSTEM=="misc", KERNEL=="uinput", TAG+="uaccess", OPTIONS+="static_node=uinput"
 diff --git a/inputhandler/CMakeLists.txt b/inputhandler/CMakeLists.txt
-index 93f3262a..94987c25 100644
+index e573d11e..43ad6b63 100644
 --- a/inputhandler/CMakeLists.txt
 +++ b/inputhandler/CMakeLists.txt
-@@ -48,4 +48,4 @@ install(TARGETS plasma-bigscreen-inputhandler DESTINATION ${KDE_INSTALL_TARGETS_
- 
- configure_file(org.kde.plasma.bigscreen.inputhandler.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasma.bigscreen.inputhandler.desktop @ONLY)
+@@ -64,7 +64,7 @@ configure_file(org.kde.plasma.bigscreen.inputhandler.desktop.cmake ${CMAKE_CURRE
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasma.bigscreen.inputhandler.desktop DESTINATION ${KDE_INSTALL_APPDIR})
--install(FILES 40-uinput.rules DESTINATION ${KDE_INSTALL_LIBDIR}/udev/rules.d)
-+install(FILES 40-plasma-bigscreen-uinput.rules DESTINATION ${KDE_INSTALL_LIBDIR}/udev/rules.d)
+ 
+ if (SYSTEMD_FOUND)
+-    install(FILES 40-uinput-uaccess.rules DESTINATION ${KDE_INSTALL_LIBDIR}/udev/rules.d RENAME 40-uinput.rules)
++    install(FILES 40-uinput-plasma-bigscreen-uaccess.rules DESTINATION ${KDE_INSTALL_LIBDIR}/udev/rules.d RENAME 40-uinput-plasma-bigscreen.rules)
+ else()
+-    install(FILES 40-uinput-input-group.rules DESTINATION ${KDE_INSTALL_LIBDIR}/udev/rules.d RENAME 40-uinput.rules)
++    install(FILES 40-uinput-plasma-bigscreen-input-group.rules DESTINATION ${KDE_INSTALL_LIBDIR}/udev/rules.d RENAME 40-uinput-plasma-bigscreen.rules)
+ endif()