lightdm-pantheon-greeter 2.0.2-2

Fix patch

3 files changed, 28 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7e23c6ee3ca5..dc02a8cd19ba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Fri May  6 09:01:30 UTC 2016
 pkgbase = lightdm-pantheon-greeter
 	pkgdesc = Pantheon greeter for LightDM
 	pkgver = 2.0.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://launchpad.net/pantheon-greeter
 	install = lightdm-pantheon-greeter.install
 	arch = i686
@@ -28,7 +30,7 @@ pkgbase = lightdm-pantheon-greeter
 	source = lightdm-pantheon-greeter-2.0.2.tgz::https://launchpad.net/pantheon-greeter/freya/2.0.2/+download/pantheon-greeter-2.0.2.tar.xz
 	source = lightdm-pantheon-greeter-paths.patch
 	sha256sums = 41c51a424828ad2d454e6def8259c42f62f868a7b55302fc585c5ce6f5fc70cd
-	sha256sums = 164d93b3dd75a5dfa2ecb4095bbf0f366e778544b4769b4a5c47be1cef952d1b
+	sha256sums = 8246073b9a242d8b2a097845af8aa8b33f8c0ba4c6815342b51a1f9c13b1afa8
 
 pkgname = lightdm-pantheon-greeter
 
diff --git a/PKGBUILD b/PKGBUILD
index ecbf76f7da01..459d18fc1ba0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=lightdm-pantheon-greeter
 pkgver=2.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Pantheon greeter for LightDM'
 arch=('i686' 'x86_64')
 url='https://launchpad.net/pantheon-greeter'
@@ -16,7 +16,7 @@ install='lightdm-pantheon-greeter.install'
 source=("lightdm-pantheon-greeter-${pkgver}.tgz::https://launchpad.net/pantheon-greeter/freya/${pkgver}/+download/pantheon-greeter-${pkgver}.tar.xz"
         'lightdm-pantheon-greeter-paths.patch')
 sha256sums=('41c51a424828ad2d454e6def8259c42f62f868a7b55302fc585c5ce6f5fc70cd'
-            '164d93b3dd75a5dfa2ecb4095bbf0f366e778544b4769b4a5c47be1cef952d1b')
+            '8246073b9a242d8b2a097845af8aa8b33f8c0ba4c6815342b51a1f9c13b1afa8')
 
 prepare() {
   cd pantheon-greeter-${pkgver}
diff --git a/lightdm-pantheon-greeter-paths.patch b/lightdm-pantheon-greeter-paths.patch
index af6a9b5e878f..1532e1d7e5be 100644
--- a/lightdm-pantheon-greeter-paths.patch
+++ b/lightdm-pantheon-greeter-paths.patch
@@ -1,6 +1,6 @@
-diff -rupN pantheon-greeter-2.0.0.orig/CMakeLists.txt pantheon-greeter-2.0.0/CMakeLists.txt
---- pantheon-greeter-2.0.0.orig/CMakeLists.txt	2015-04-06 23:37:23.000000000 +0200
-+++ pantheon-greeter-2.0.0/CMakeLists.txt	2015-04-14 12:43:10.943603059 +0200
+diff -rupN lightdm-pantheon-greeter.orig/CMakeLists.txt lightdm-pantheon-greeter/CMakeLists.txt
+--- lightdm-pantheon-greeter.orig/CMakeLists.txt	2016-05-06 10:51:40.257595927 +0200
++++ lightdm-pantheon-greeter/CMakeLists.txt	2016-05-06 10:51:47.284064288 +0200
 @@ -8,7 +8,7 @@ list (APPEND CMAKE_MODULE_PATH ${CMAKE_S
  
  set (CONF_DIR "/etc/lightdm")
@@ -8,9 +8,9 @@ diff -rupN pantheon-greeter-2.0.0.orig/CMakeLists.txt pantheon-greeter-2.0.0/CMa
 -set (PKGDATADIR "${DATADIR}/pantheon-greeter")
 +set (PKGDATADIR "${DATADIR}/lightdm-pantheon-greeter")
  set (CMAKE_INSTALL_PREFIX /usr)
- set (VERSION "2.0.0")
+ set (VERSION "2.0.2")
  
-@@ -62,9 +62,9 @@ add_subdirectory (po)
+@@ -61,9 +61,9 @@ add_subdirectory (po)
  
  include (GSettings)
  
@@ -67,11 +67,11 @@ diff -rupN pantheon-greeter-2.0.0.orig/data/pantheon-greeter.desktop pantheon-gr
 -Type=Application
 -X-Ubuntu-Gettext-Domain=pantheon-greeter
 -Name[en_US]=pantheon-greeter
-diff -rupN pantheon-greeter-2.0.0.orig/src/PantheonGreeter.vala pantheon-greeter-2.0.0/src/PantheonGreeter.vala
---- pantheon-greeter-2.0.0.orig/src/PantheonGreeter.vala	2015-04-06 23:37:23.000000000 +0200
-+++ pantheon-greeter-2.0.0/src/PantheonGreeter.vala	2015-04-20 11:57:44.000000000 +0000
-@@ -81,7 +81,7 @@ public class PantheonGreeter : Gtk.Windo
- 
+diff -rupN lightdm-pantheon-greeter.orig/src/PantheonGreeter.vala lightdm-pantheon-greeter/src/PantheonGreeter.vala
+--- lightdm-pantheon-greeter.orig/src/PantheonGreeter.vala	2016-05-06 10:51:40.264262406 +0200
++++ lightdm-pantheon-greeter/src/PantheonGreeter.vala	2016-05-06 10:51:47.284064288 +0200
+@@ -100,7 +100,7 @@ public class PantheonGreeter : Gtk.Windo
+         
          settings = new KeyFile ();
          try {
 -            settings.load_from_file (Constants.CONF_DIR+"/pantheon-greeter.conf",
@@ -79,3 +79,15 @@ diff -rupN pantheon-greeter-2.0.0.orig/src/PantheonGreeter.vala pantheon-greeter
                      KeyFileFlags.KEEP_COMMENTS);
          } catch (Error e) {
              warning (e.message);
+diff -rupN lightdm-pantheon-greeter.orig/src/Wallpaper.vala lightdm-pantheon-greeter/src/Wallpaper.vala
+--- lightdm-pantheon-greeter.orig/src/Wallpaper.vala	2016-05-06 10:51:40.264262406 +0200
++++ lightdm-pantheon-greeter/src/Wallpaper.vala	2016-05-06 10:54:05.226841092 +0200
+@@ -58,7 +58,7 @@ public class Wallpaper : Clutter.Group {
+         var settings = new KeyFile();
+         string default_wallpaper = "/usr/share/backgrounds/elementaryos-default";
+         try{
+-            settings.load_from_file(Constants.CONF_DIR+"/pantheon-greeter.conf",
++            settings.load_from_file(Constants.CONF_DIR+"/lightdm-pantheon-greeter.conf",
+                     KeyFileFlags.KEEP_COMMENTS);
+             default_wallpaper = settings.get_string ("greeter", "default-wallpaper");
+         } catch (Error e) {