lightdm-pantheon-greeter-git r815.940975c6-1

3 files changed, 40 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b23b7bc9da53..2f3332b3a85e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 # Generated by mksrcinfo v8
-# Tue Aug  8 21:11:09 UTC 2017
+# Wed Dec 27 13:44:36 UTC 2017
 pkgbase = lightdm-pantheon-greeter-git
 	pkgdesc = Pantheon greeter for LightDM
-	pkgver = r807.5cd5756
+	pkgver = r815.940975c
 	pkgrel = 1
 	url = https://github.com/elementary/greeter
 	install = lightdm-pantheon-greeter.install
-	arch = i686
 	arch = x86_64
 	groups = pantheon-unstable
 	license = GPL
@@ -35,7 +34,7 @@ pkgbase = lightdm-pantheon-greeter-git
 	source = lightdm-pantheon-greeter::git+https://github.com/elementary/greeter.git
 	source = lightdm-pantheon-greeter-paths.patch
 	sha256sums = SKIP
-	sha256sums = 64911a77369693a85563459ff372c4f7daba09825e7f66f2b98b60ab2b7ecd76
+	sha256sums = aaf0d9ba865bc5c25e463d2bcd2732fb1fa50e3e40a22021fd370f31e258c185
 
 pkgname = lightdm-pantheon-greeter-git
 
diff --git a/PKGBUILD b/PKGBUILD
index c50c3f22940b..b338ca8c10dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: sh4nks <sh4nks7@gmail.com
 
 pkgname=lightdm-pantheon-greeter-git
-pkgver=r807.5cd5756
+pkgver=r815.940975c
 pkgrel=1
 pkgdesc='Pantheon greeter for LightDM'
 arch=('x86_64')
@@ -20,7 +20,7 @@ install='lightdm-pantheon-greeter.install'
 source=('lightdm-pantheon-greeter::git+https://github.com/elementary/greeter.git'
         'lightdm-pantheon-greeter-paths.patch')
 sha256sums=('SKIP'
-            '64911a77369693a85563459ff372c4f7daba09825e7f66f2b98b60ab2b7ecd76')
+            'aaf0d9ba865bc5c25e463d2bcd2732fb1fa50e3e40a22021fd370f31e258c185')
 
 pkgver() {
   cd lightdm-pantheon-greeter
diff --git a/lightdm-pantheon-greeter-paths.patch b/lightdm-pantheon-greeter-paths.patch
index 1e60d9f15aa1..9c94548bd8f3 100644
--- a/lightdm-pantheon-greeter-paths.patch
+++ b/lightdm-pantheon-greeter-paths.patch
@@ -1,58 +1,60 @@
-From 889bc96e75eb5f2f3d5da9fb110ce092b8e1a395 Mon Sep 17 00:00:00 2001
+From 7daf66866ca2e221a1e180cdbd182a4048fa7711 Mon Sep 17 00:00:00 2001
 From: Solomon Choina <shlomochoina@gmail.com>
-Date: Wed, 28 Jun 2017 10:32:15 -0400
+Date: Tue, 12 Dec 2017 16:15:51 -0500
 Subject: [PATCH] updating the patch
 
 ---
- CMakeLists.txt                                               | 12 ++++++------
- .../{pantheon-greeter.conf => lightdm-pantheon-greeter.conf} |  0
- ...heon-greeter.desktop => lightdm-pantheon-greeter.desktop} |  4 ++--
- src/PantheonGreeter.vala                                     |  2 +-
- src/Widgets/Wallpaper.vala                                   |  2 +-
+ CMakeLists.txt                                             | 14 +++++++-------
+ ...pantheon-greeter.conf => lightdm-pantheon-greeter.conf} |  0
+ ...eter.desktop.in => lightdm-pantheon-greeter.desktop.in} |  2 +-
+ src/PantheonGreeter.vala                                   |  2 +-
+ src/Widgets/Wallpaper.vala                                 |  2 +-
  5 files changed, 10 insertions(+), 10 deletions(-)
  rename data/{pantheon-greeter.conf => lightdm-pantheon-greeter.conf} (100%)
- rename data/{pantheon-greeter.desktop => lightdm-pantheon-greeter.desktop} (64%)
+ rename data/{pantheon-greeter.desktop.in => lightdm-pantheon-greeter.desktop.in} (83%)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bd290ff..83f270b 100644
+index a0b6ca0..9785166 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -8,7 +8,7 @@ list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
- 
+
  set (CONF_DIR "/etc/lightdm")
  set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
 -set (PKGDATADIR "${DATADIR}/pantheon-greeter")
 +set (PKGDATADIR "${DATADIR}/lightdm-pantheon-greeter")
+ set (GETTEXT_PACKAGE ${CMAKE_PROJECT_NAME})
  set (CMAKE_INSTALL_PREFIX /usr)
- set (VERSION "3.1.1")
- 
-@@ -93,10 +93,10 @@ include (GSettings)
+ set (VERSION "3.2.0")
+@@ -85,11 +85,11 @@ include (GSettings)
  include (GResource)
  glib_compile_resources (GLIB_RESOURCES_CSS SOURCE data/css.gresource.xml)
- 
+
 -add_executable (pantheon-greeter ${VALA_C} ${GLIB_RESOURCES_CSS})
 -target_link_libraries(pantheon-greeter m)
 +add_executable (lightdm-pantheon-greeter ${VALA_C} ${GLIB_RESOURCES_CSS})
 +target_link_libraries(lightdm-pantheon-greeter m)
- 
+
 -install (TARGETS pantheon-greeter RUNTIME DESTINATION sbin)
--install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-greeter.desktop DESTINATION share/xgreeters)
+-configure_file (${CMAKE_SOURCE_DIR}/data/pantheon-greeter.desktop.in ${CMAKE_BINARY_DIR}/data/pantheon-greeter.desktop)
+-install (FILES ${CMAKE_BINARY_DIR}/data/pantheon-greeter.desktop DESTINATION share/xgreeters)
 -install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-greeter.conf DESTINATION ${CONF_DIR})
 +install (TARGETS lightdm-pantheon-greeter RUNTIME DESTINATION bin)
-+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/lightdm-pantheon-greeter.desktop DESTINATION share/xgreeters)
++configure_file (${CMAKE_SOURCE_DIR}/data/lightdm-pantheon-greeter.desktop.in ${CMAKE_BINARY_DIR}/data/lightdm-pantheon-greeter.desktop)
++install (FILES ${CMAKE_BINARY_DIR}/data/lightdm-pantheon-greeter.desktop DESTINATION share/xgreeters)
 +install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/lightdm-pantheon-greeter.conf DESTINATION ${CONF_DIR})
  install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/fingerprint.svg DESTINATION ${PKGDATADIR})
 diff --git a/data/pantheon-greeter.conf b/data/lightdm-pantheon-greeter.conf
 similarity index 100%
 rename from data/pantheon-greeter.conf
 rename to data/lightdm-pantheon-greeter.conf
-diff --git a/data/pantheon-greeter.desktop b/data/lightdm-pantheon-greeter.desktop
-similarity index 64%
-rename from data/pantheon-greeter.desktop
-rename to data/lightdm-pantheon-greeter.desktop
-index 225cd40..3e40fc7 100644
---- a/data/pantheon-greeter.desktop
-+++ b/data/lightdm-pantheon-greeter.desktop
+diff --git a/data/pantheon-greeter.desktop.in b/data/lightdm-pantheon-greeter.desktop.in
+similarity index 83%
+rename from data/pantheon-greeter.desktop.in
+rename to data/lightdm-pantheon-greeter.desktop.in
+index d8de6eb..9d7882a 100644
+--- a/data/pantheon-greeter.desktop.in
++++ b/data/lightdm-pantheon-greeter.desktop.in
 @@ -1,7 +1,7 @@
  [Desktop Entry]
  Name=Pantheon Greeter
@@ -60,15 +62,14 @@ index 225cd40..3e40fc7 100644
 -Exec=pantheon-greeter
 +Exec=lightdm-pantheon-greeter
  Type=Application
- X-Ubuntu-Gettext-Domain=pantheon-greeter
--Name[en_US]=pantheon-greeter
-+Name[en_US]=lightdm-pantheon-greeter
+ X-Ubuntu-Gettext-Domain=@GETTEXT_PACKAGE@
+ Name[en_US]=pantheon-greeter
 diff --git a/src/PantheonGreeter.vala b/src/PantheonGreeter.vala
-index d984635..194a259 100644
+index 40fa94e..51454ac 100644
 --- a/src/PantheonGreeter.vala
 +++ b/src/PantheonGreeter.vala
 @@ -104,7 +104,7 @@ public class PantheonGreeter : Gtk.Window {
-         
+
          settings = new KeyFile ();
          try {
 -            settings.load_from_file (Path.build_filename (Constants.CONF_DIR, "pantheon-greeter.conf"), KeyFileFlags.KEEP_COMMENTS);
@@ -77,7 +78,7 @@ index d984635..194a259 100644
              warning (e.message);
          }
 diff --git a/src/Widgets/Wallpaper.vala b/src/Widgets/Wallpaper.vala
-index 9b6cde1..dcecd1f 100644
+index 00025b9..9e98c9c 100644
 --- a/src/Widgets/Wallpaper.vala
 +++ b/src/Widgets/Wallpaper.vala
 @@ -49,7 +49,7 @@ public class Wallpaper : Gtk.Stack {
@@ -89,3 +90,7 @@ index 9b6cde1..dcecd1f 100644
              default_wallpaper = settings.get_string ("greeter", "default-wallpaper");
          } catch (Error e) {
              warning (e.message);
+--
+2.15.1
+
+