From ec03c9882566f41c2f77a88950d4f0a0160361de Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 8 Dec 2017 15:03:05 +0100
Subject: [PATCH] lightdm-webkit-greeter: fix build / fix theme

Closes: #9851 [via git-merge-pr]
---
 .../patches/lightdm-webkit-greeter.patch      | 76 +++++++++++++++++++
 srcpkgs/lightdm-webkit-greeter/template       |  6 +-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/lightdm-webkit-greeter/patches/lightdm-webkit-greeter.patch

diff --git a/srcpkgs/lightdm-webkit-greeter/patches/lightdm-webkit-greeter.patch b/srcpkgs/lightdm-webkit-greeter/patches/lightdm-webkit-greeter.patch
new file mode 100644
index 00000000000..b8c9666ca4f
--- /dev/null
+++ b/srcpkgs/lightdm-webkit-greeter/patches/lightdm-webkit-greeter.patch
@@ -0,0 +1,76 @@
+Adapted from https://bugs.gentoo.org/show_bug.cgi?id=588764
+
+--- src/lightdm-webkit-greeter.c.orig	2016-01-10 20:42:31.000000000 +0100
++++ src/lightdm-webkit-greeter.c	2017-12-08 14:46:55.984757329 +0100
+@@ -532,13 +532,14 @@
+                          JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef * exception)
+ {
+   gchar *name = NULL;
++  GError *error = NULL;
+ 
+   if (argumentCount > 0)
+       name = arg_to_string (context, arguments[0], exception);
+   else
+       name = NULL;
+ 
+-  lightdm_greeter_authenticate (GREETER, name);
++  lightdm_greeter_authenticate (GREETER, name, &error);
+ 
+   g_free (name);
+   return JSValueMakeNull (context);
+@@ -549,7 +550,9 @@
+                          JSObjectRef function,
+                          JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef * exception)
+ {
+-  lightdm_greeter_authenticate_as_guest (GREETER);
++  GError *error = NULL;
++
++  lightdm_greeter_authenticate_as_guest (GREETER, &error);
+   return JSValueMakeNull (context);
+ }
+ 
+@@ -580,6 +583,7 @@
+             JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef * exception)
+ {
+   gchar *response;
++  GError *error = NULL;
+ 
+   if (argumentCount != 1)
+       return mkexception (context, exception, "Response not supplied");
+@@ -588,7 +592,7 @@
+   if (!response)
+     return JSValueMakeNull (context);
+ 
+-  lightdm_greeter_respond (GREETER, response);
++  lightdm_greeter_respond (GREETER, response, &error);
+ 
+   g_free (response);
+   return JSValueMakeNull (context);
+@@ -599,7 +603,9 @@
+                           JSObjectRef function,
+                           JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef * exception)
+ {
+-  lightdm_greeter_cancel_authentication (GREETER);
++  GError *error = NULL;
++
++  lightdm_greeter_cancel_authentication (GREETER, &error);
+   return JSValueMakeNull (context);
+ }
+ 
+@@ -723,6 +729,7 @@
+                  JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef * exception)
+ {
+   gchar *language;
++  GError *error = NULL;
+ 
+   if (argumentCount != 1)
+       return mkexception (context, exception, "Language not supplied");
+@@ -731,7 +738,7 @@
+   if (!language)
+     return JSValueMakeNull (context);
+ 
+-  lightdm_greeter_set_language (GREETER, language);
++  lightdm_greeter_set_language (GREETER, language, &error);
+ 
+   g_free (language);
+   return JSValueMakeNull (context);
diff --git a/srcpkgs/lightdm-webkit-greeter/template b/srcpkgs/lightdm-webkit-greeter/template
index b101d8c2fb9..86562c49ad3 100644
--- a/srcpkgs/lightdm-webkit-greeter/template
+++ b/srcpkgs/lightdm-webkit-greeter/template
@@ -1,7 +1,7 @@
 # Template file for 'lightdm-webkit-greeter'
 pkgname=lightdm-webkit-greeter
 version=2.0.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="lightdm-devel libxklavier-devel dbus-glib-devel webkitgtk-devel"
@@ -12,3 +12,7 @@ license="GPL-3"
 homepage="https://launchpad.net/lightdm-webkit-greeter"
 distfiles="https://launchpad.net/${pkgname}/trunk/${version}/+download/${pkgname}-${version}.tar.gz"
 checksum=985068d2c95556c99c744a0e8a770f123034fe4b23e8469c1a153a1f6e687eab
+
+post_extract() {
+	sed -i -e "s/\(webkit-theme=\)default/\1webkit/" data/lightdm-webkit-greeter.conf
+}