From 10e297abc7e8dda0db9ae3450139b2b2437c3858 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 3 Feb 2022 01:29:09 +0100
Subject: [PATCH] lightdm-webkit2-greeter: silence error message on some
 systems

the greeter searches for backgrounds in /usr/share/backgrounds,
if the dir doesn't exists it uses a fallback image.
Some change in lightdm ended up printing an error message if the
background dir wasn't existing
---
 .../patches/{conf.patch => 01-conf.patch}      |  0
 .../patches/{musl.patch => 02-musl.patch}      |  0
 .../patches/{void.patch => 03-void.patch}      |  0
 ...rint-any-non-critical-errors-as-erros.patch | 18 ++++++++++++++++++
 srcpkgs/lightdm-webkit2-greeter/template       |  2 +-
 5 files changed, 19 insertions(+), 1 deletion(-)
 rename srcpkgs/lightdm-webkit2-greeter/patches/{conf.patch => 01-conf.patch} (100%)
 rename srcpkgs/lightdm-webkit2-greeter/patches/{musl.patch => 02-musl.patch} (100%)
 rename srcpkgs/lightdm-webkit2-greeter/patches/{void.patch => 03-void.patch} (100%)
 create mode 100644 srcpkgs/lightdm-webkit2-greeter/patches/04-do-not-print-any-non-critical-errors-as-erros.patch

diff --git a/srcpkgs/lightdm-webkit2-greeter/patches/conf.patch b/srcpkgs/lightdm-webkit2-greeter/patches/01-conf.patch
similarity index 100%
rename from srcpkgs/lightdm-webkit2-greeter/patches/conf.patch
rename to srcpkgs/lightdm-webkit2-greeter/patches/01-conf.patch
diff --git a/srcpkgs/lightdm-webkit2-greeter/patches/musl.patch b/srcpkgs/lightdm-webkit2-greeter/patches/02-musl.patch
similarity index 100%
rename from srcpkgs/lightdm-webkit2-greeter/patches/musl.patch
rename to srcpkgs/lightdm-webkit2-greeter/patches/02-musl.patch
diff --git a/srcpkgs/lightdm-webkit2-greeter/patches/void.patch b/srcpkgs/lightdm-webkit2-greeter/patches/03-void.patch
similarity index 100%
rename from srcpkgs/lightdm-webkit2-greeter/patches/void.patch
rename to srcpkgs/lightdm-webkit2-greeter/patches/03-void.patch
diff --git a/srcpkgs/lightdm-webkit2-greeter/patches/04-do-not-print-any-non-critical-errors-as-erros.patch b/srcpkgs/lightdm-webkit2-greeter/patches/04-do-not-print-any-non-critical-errors-as-erros.patch
new file mode 100644
index 0000000000..9d93ccd9e0
--- /dev/null
+++ b/srcpkgs/lightdm-webkit2-greeter/patches/04-do-not-print-any-non-critical-errors-as-erros.patch
@@ -0,0 +1,18 @@
+Lightdm seems to show a error popup once a greeter even prints the word error,
+but does not even print the full log line.
+So just change an ERROR to warn and encude the error message as bas64,
+the default theme handles this kind of error just fine.
+
+---
+--- web-greeter-2.2.5/src/gresource/js/ThemeUtils.js	2017-04-24 21:51:30.000000000 +0200
++++ ThemeUtils.js	2022-02-03 01:21:13.467417715 +0100
+@@ -142,7 +142,8 @@
+ 			return __ThemeUtils.dirlist( path );
+ 
+ 		} catch( err ) {
+-			console.log( `[ERROR] theme_utils.dirlist(): ${err}` );
++			err = btoa(unescape(encodeURIComponent(err)));
++			console.log( `[WARN] theme_utils.dirlist(): ${err} (base64 to not trip lightdm up)` );
+ 			return [];
+ 		}
+ 	}
diff --git a/srcpkgs/lightdm-webkit2-greeter/template b/srcpkgs/lightdm-webkit2-greeter/template
index da5786768d..2ba74b5676 100644
--- a/srcpkgs/lightdm-webkit2-greeter/template
+++ b/srcpkgs/lightdm-webkit2-greeter/template
@@ -1,7 +1,7 @@
 # Template file for 'lightdm-webkit2-greeter'
 pkgname=lightdm-webkit2-greeter
 version=2.2.5
-revision=2
+revision=3
 wrksrc="web-greeter-${version}"
 build_style=meson
 hostmakedepends="pkg-config glib-devel"