From aec25bfcd9d8e0a730044a0d3ca659a7d8babb91 Mon Sep 17 00:00:00 2001
From: Kamack38 <kamack38.biznes@gmail.com>
Date: Sun, 17 Mar 2024 18:41:38 +0000
Subject: [PATCH] Update asus-numberpad-driver-git to r730.2103186

---
 .SRCINFO                          | 20 ++++++++++++++++++++
 PKGBUILD                          | 23 +++++++++++++++++------
 asus-numberpad-driver-git.install |  4 ++++
 service.patch                     | 15 +++++++++++++++
 4 files changed, 56 insertions(+), 6 deletions(-)
 create mode 100644 service.patch

diff --git a/.SRCINFO b/.SRCINFO
index 613e8e1ddb69..bc21d58db4ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -21,40 +21,60 @@ pkgbase = asus-numberpad-driver-git
 	provides = asus-numberpad-driver
 	replaces = asus-touchpad-numpad-driver-git
 	source = git+https://github.com/asus-linux-drivers/asus-numberpad-driver.git
+	source = service.patch
 	sha256sums = SKIP
+	sha256sums = a9322b6176907076bc2ae8d5a79a8ef5745323121e4bea657063bf2dc358acbc
 
 pkgname = asus-numberpad-driver-b7402-git
 
 pkgname = asus-numberpad-driver-b7402-unicode-git
 
+pkgname = asus-numberpad-driver-b7402-non-unicode-git
+
 pkgname = asus-numberpad-driver-e210ma-git
 
 pkgname = asus-numberpad-driver-e210ma-unicode-git
 
+pkgname = asus-numberpad-driver-e210ma-non-unicode-git
+
 pkgname = asus-numberpad-driver-g513-git
 
 pkgname = asus-numberpad-driver-g513-unicode-git
 
+pkgname = asus-numberpad-driver-g513-non-unicode-git
+
 pkgname = asus-numberpad-driver-g533-git
 
 pkgname = asus-numberpad-driver-g533-unicode-git
 
+pkgname = asus-numberpad-driver-g533-non-unicode-git
+
 pkgname = asus-numberpad-driver-gx551-git
 
 pkgname = asus-numberpad-driver-gx551-unicode-git
 
+pkgname = asus-numberpad-driver-gx551-non-unicode-git
+
 pkgname = asus-numberpad-driver-gx701-git
 
 pkgname = asus-numberpad-driver-gx701-unicode-git
 
+pkgname = asus-numberpad-driver-gx701-non-unicode-git
+
 pkgname = asus-numberpad-driver-up5401ea-git
 
 pkgname = asus-numberpad-driver-up5401ea-unicode-git
 
+pkgname = asus-numberpad-driver-up5401ea-non-unicode-git
+
 pkgname = asus-numberpad-driver-ux433fa-git
 
 pkgname = asus-numberpad-driver-ux433fa-unicode-git
 
+pkgname = asus-numberpad-driver-ux433fa-non-unicode-git
+
 pkgname = asus-numberpad-driver-ux581l-git
 
 pkgname = asus-numberpad-driver-ux581l-unicode-git
+
+pkgname = asus-numberpad-driver-ux581l-non-unicode-git
diff --git a/PKGBUILD b/PKGBUILD
index 689a5fc103a4..ec76381cd223 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,22 +5,31 @@ pkgbase="${_pkgbase}-git"
 pkgname=(
     "${_pkgbase}-b7402-git"
     "${_pkgbase}-b7402-unicode-git"
+    "${_pkgbase}-b7402-non-unicode-git"
     "${_pkgbase}-e210ma-git"
     "${_pkgbase}-e210ma-unicode-git"
+    "${_pkgbase}-e210ma-non-unicode-git"
     "${_pkgbase}-g513-git"
     "${_pkgbase}-g513-unicode-git"
+    "${_pkgbase}-g513-non-unicode-git"
     "${_pkgbase}-g533-git"
     "${_pkgbase}-g533-unicode-git"
+    "${_pkgbase}-g533-non-unicode-git"
     "${_pkgbase}-gx551-git"
     "${_pkgbase}-gx551-unicode-git"
+    "${_pkgbase}-gx551-non-unicode-git"
     "${_pkgbase}-gx701-git"
     "${_pkgbase}-gx701-unicode-git"
+    "${_pkgbase}-gx701-non-unicode-git"
     "${_pkgbase}-up5401ea-git"
     "${_pkgbase}-up5401ea-unicode-git"
+    "${_pkgbase}-up5401ea-non-unicode-git"
     "${_pkgbase}-ux433fa-git"
     "${_pkgbase}-ux433fa-unicode-git"
+    "${_pkgbase}-ux433fa-non-unicode-git"
     "${_pkgbase}-ux581l-git"
     "${_pkgbase}-ux581l-unicode-git"
+    "${_pkgbase}-ux581l-non-unicode-git"
 )
 pkgver=r730.2103186
 pkgrel=1
@@ -44,8 +53,9 @@ depends=(
 makedepends=('git')
 provides=("${_pkgbase}")
 replaces=('asus-touchpad-numpad-driver-git')
-source=("git+${url}.git")
-sha256sums=('SKIP')
+source=("git+${url}.git" "service.patch")
+sha256sums=('SKIP'
+            'a9322b6176907076bc2ae8d5a79a8ef5745323121e4bea657063bf2dc358acbc')
 install="$pkgbase.install"
 
 pkgver() {
@@ -53,6 +63,11 @@ pkgver() {
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+    patch "${srcdir}/${_pkgbase}/asus_numberpad_driver.service" service.patch
+    patch "${srcdir}/${_pkgbase}/asus_numberpad_driver.x11.service" service.patch
+}
+
 _package() {
     _config_dir="/usr/share/${_pkgbase}"
     _log_dir="/var/log/asus-numberpad-driver"
@@ -63,10 +78,6 @@ _package() {
     install -Dm644 "asus_numberpad_driver.x11.service" "${pkgdir}/usr/lib/systemd/system/asus_numberpad_driver.x11.service"
     sed -i "s#\$LAYOUT_NAME#${model}#" "${pkgdir}/usr/lib/systemd/system/asus_numberpad_driver.service"
     sed -i "s#\$LAYOUT_NAME#${model}#" "${pkgdir}/usr/lib/systemd/system/asus_numberpad_driver.x11.service"
-    sed -i "s#\$CONFIG_FILE_DIR_PATH#${_config_dir}#" "${pkgdir}/usr/lib/systemd/system/asus_numberpad_driver.service"
-    sed -i "s#\$CONFIG_FILE_DIR_PATH#${_config_dir}#" "${pkgdir}/usr/lib/systemd/system/asus_numberpad_driver.x11.service"
-    sed -i "s#\$ERROR_LOG_FILE_PATH#${_log_dir}/error.log#" "${pkgdir}/usr/lib/systemd/system/asus_numberpad_driver.service"
-    sed -i "s#\$ERROR_LOG_FILE_PATH#${_log_dir}/error.log#" "${pkgdir}/usr/lib/systemd/system/asus_numberpad_driver.x11.service"
     install -Dm 644 -t "${pkgdir}/${_config_dir}/layouts" layouts/*.py
     install -Dm 644 "LICENSE.md" "${pkgdir}/usr/share/licenses/${_pkgbase}/LICENSE.md"
 }
diff --git a/asus-numberpad-driver-git.install b/asus-numberpad-driver-git.install
index a9cbf68908c5..ef8bf75d6f88 100644
--- a/asus-numberpad-driver-git.install
+++ b/asus-numberpad-driver-git.install
@@ -1,4 +1,8 @@
 post_install() {
 	modprobe i2c-dev
 	echo "i2c-dev" | tee /etc/modules-load.d/i2c-dev.conf >/dev/null
+
+	echo "To enable the asus numberpad driver run:"
+	echo "# systemctl enable asus_numberpad_driver.service"
+  echo " "
 }
diff --git a/service.patch b/service.patch
new file mode 100644
index 000000000000..2337df7bc95f
--- /dev/null
+++ b/service.patch
@@ -0,0 +1,15 @@
+--- asus_numberpad_driver.service	2024-03-16 21:09:42.901692226 +0100
++++ cos.service	2024-03-16 21:09:34.521623561 +0100
+@@ -3,9 +3,9 @@
+ 
+ [Service]
+ Type=simple
+-ExecStart=/usr/share/asus-numberpad-driver/.env/bin/python3 /usr/share/asus-numberpad-driver/numberpad.py $LAYOUT_NAME $CONFIG_FILE_DIR_PATH
+-StandardOutput=append:$ERROR_LOG_FILE_PATH
+-StandardError=append:$ERROR_LOG_FILE_PATH
++ExecStart=python3 /usr/share/asus-numberpad-driver/numberpad.py $LAYOUT_NAME /usr/share/asus-numberpad-driver
++StandardOutput=append:/var/log/asus-numberpad-driver
++StandardError=append:/var/log/asus-numberpad-driver
+ TimeoutSec=5
+ Restart=on-failure
+ Environment="DISPLAY=$DISPLAY"