From 936790890a795a849de8e76040f0a4b656557cf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matt=C3=A9o=20Delabre?= <spam@delab.re>
Date: Fri, 4 Jun 2021 11:54:16 +0200
Subject: [PATCH] Update rm2fb to v0.0.4

This update includes a change in the server code to set the server
process name to 'rm2fb-server' (instead of the default 'xochitl'). See
also #359 and rmkit-dev/rmkit#127.

Test plan: Started the 'rm2fb' service, retrieved the server PID, and
made sure that both `/proc/PID/cmdline` and `/proc/PID/stat` contained
'rm2fb-server' instead of 'xochitl'.
---
 package/display/overwrite-server-argv0.patch | 15 ---------------
 package/display/package                      | 13 +++----------
 2 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 package/display/overwrite-server-argv0.patch

diff --git a/package/display/overwrite-server-argv0.patch b/package/display/overwrite-server-argv0.patch
deleted file mode 100644
index 79dbf7f7d..000000000
--- a/package/display/overwrite-server-argv0.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/server/main.cpp b/src/server/main.cpp
-index 755be17..4186060 100755
---- a/src/server/main.cpp
-+++ b/src/server/main.cpp
-@@ -173,6 +173,10 @@ int __libc_start_main(int (*_main)(int, char **, char **), int argc,
-   swtfb::SDK_BIN = argv[0];
-   fprintf(stderr, "BIN FILE: %s\n", argv[0]);
- 
-+  size_t argv0_len = strlen(argv[0]);
-+  strncpy(argv[0], "rm2fb-server", argv0_len);
-+  argv[0][argv0_len] = 0;
-+
-   return func_main(server_main, argc, argv, init, fini, rtld_fini, stack_end);
- };
- };
diff --git a/package/display/package b/package/display/package
index 84332216c..787c41f82 100644
--- a/package/display/package
+++ b/package/display/package
@@ -8,30 +8,23 @@ timestamp=2021-02-21T01:41+00:00
 maintainer="raisjn <of.raisjn@gmail.com>"
 license=MIT
 url="https://github.com/ddvk/remarkable2-framebuffer"
-pkgver=1.0.1-3
+pkgver=1.0.1-4
 section="devel"
 
 image=qt:v1.4
 source=(
-    https://github.com/ddvk/remarkable2-framebuffer/archive/aa70ce37c71f84b91434f5c469fa71f4b1bb328c.zip
+    https://github.com/ddvk/remarkable2-framebuffer/archive/v0.0.4.zip
     rm2fb.service
     rm2fb-client
-    overwrite-server-argv0.patch
     rm2fb-preload.conf
 )
 sha256sums=(
-    76f1c0b72260a9743f3e008100ffddf1f89cd44c6f0376d906e98ae66eaea716
-    SKIP
+    945db410c233be0241c7bfa57c10cb5dd9fcddee17962090d8352a5b7b89f94a
     SKIP
     SKIP
     SKIP
 )
 
-prepare() {
-    patch -p1 -d"$srcdir" < "$srcdir"/overwrite-server-argv0.patch
-    rm "$srcdir"/overwrite-server-argv0.patch
-}
-
 build() {
     if [[ $arch = rm1 ]]; then
         # Create an empty client library for rM1