diff options
Diffstat (limited to 'lightdm-pantheon-greeter-paths.patch')
| -rw-r--r-- | lightdm-pantheon-greeter-paths.patch | 41 |
1 files changed, 12 insertions, 29 deletions
diff --git a/lightdm-pantheon-greeter-paths.patch b/lightdm-pantheon-greeter-paths.patch index 371b5e93bdc6..d5460def9cee 100644 --- a/lightdm-pantheon-greeter-paths.patch +++ b/lightdm-pantheon-greeter-paths.patch @@ -1,7 +1,7 @@ diff -rupN pantheon-greeter-3.0.orig/CMakeLists.txt pantheon-greeter-3.0/CMakeLists.txt ---- pantheon-greeter-3.0.orig/CMakeLists.txt 2016-08-21 10:12:04.432288198 +0200 -+++ pantheon-greeter-3.0/CMakeLists.txt 2016-08-21 10:14:18.407848597 +0200 -@@ -8,12 +8,12 @@ list (APPEND CMAKE_MODULE_PATH ${CMAKE_S +--- pantheon-greeter-3.0.orig/CMakeLists.txt 2016-08-21 11:37:55.995777536 +0200 ++++ pantheon-greeter-3.0/CMakeLists.txt 2016-08-21 11:38:30.831075901 +0200 +@@ -8,7 +8,7 @@ list (APPEND CMAKE_MODULE_PATH ${CMAKE_S set (CONF_DIR "/etc/lightdm") set (DATADIR "${CMAKE_INSTALL_PREFIX}/share") @@ -10,12 +10,6 @@ diff -rupN pantheon-greeter-3.0.orig/CMakeLists.txt pantheon-greeter-3.0/CMakeLi set (CMAKE_INSTALL_PREFIX /usr) set (VERSION "3.0.0") - configure_file (${CMAKE_SOURCE_DIR}/src/config.vala.cmake ${CMAKE_BINARY_DIR}/src/config.vala) --add_definitions (-DGETTEXT_PACKAGE="pantheon-greeter") -+add_definitions (-DGETTEXT_PACKAGE="lightdm-pantheon-greeter") - - # Comment this out to enable C compiler warnings - add_definitions (-w) @@ -61,9 +61,9 @@ add_subdirectory (po) include (GSettings) @@ -33,7 +27,7 @@ diff -rupN pantheon-greeter-3.0.orig/CMakeLists.txt pantheon-greeter-3.0/CMakeLi +install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/lightdm-pantheon-greeter.conf DESTINATION ${CONF_DIR}) diff -rupN pantheon-greeter-3.0.orig/data/lightdm-pantheon-greeter.conf pantheon-greeter-3.0/data/lightdm-pantheon-greeter.conf --- pantheon-greeter-3.0.orig/data/lightdm-pantheon-greeter.conf 1970-01-01 01:00:00.000000000 +0100 -+++ pantheon-greeter-3.0/data/lightdm-pantheon-greeter.conf 2016-08-14 14:03:02.000000000 +0200 ++++ pantheon-greeter-3.0/data/lightdm-pantheon-greeter.conf 2016-08-21 11:38:30.834409115 +0200 @@ -0,0 +1,6 @@ +[greeter] +#activate-numlock=true @@ -43,17 +37,17 @@ diff -rupN pantheon-greeter-3.0.orig/data/lightdm-pantheon-greeter.conf pantheon +#screensaver-timeout=60 diff -rupN pantheon-greeter-3.0.orig/data/lightdm-pantheon-greeter.desktop pantheon-greeter-3.0/data/lightdm-pantheon-greeter.desktop --- pantheon-greeter-3.0.orig/data/lightdm-pantheon-greeter.desktop 1970-01-01 01:00:00.000000000 +0100 -+++ pantheon-greeter-3.0/data/lightdm-pantheon-greeter.desktop 2016-08-14 14:03:02.000000000 +0200 ++++ pantheon-greeter-3.0/data/lightdm-pantheon-greeter.desktop 2016-08-21 11:39:32.895790706 +0200 @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Pantheon Greeter +Comment=Pantheon Greeter -+Exec=pantheon-greeter ++Exec=lightdm-pantheon-greeter +Type=Application +X-Ubuntu-Gettext-Domain=pantheon-greeter +Name[en_US]=pantheon-greeter diff -rupN pantheon-greeter-3.0.orig/data/pantheon-greeter.conf pantheon-greeter-3.0/data/pantheon-greeter.conf ---- pantheon-greeter-3.0.orig/data/pantheon-greeter.conf 2016-08-21 10:12:04.435621456 +0200 +--- pantheon-greeter-3.0.orig/data/pantheon-greeter.conf 2016-08-21 11:37:55.995777536 +0200 +++ pantheon-greeter-3.0/data/pantheon-greeter.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -[greeter] @@ -63,7 +57,7 @@ diff -rupN pantheon-greeter-3.0.orig/data/pantheon-greeter.conf pantheon-greeter -#onscreen-keyboard=false -#screensaver-timeout=60 diff -rupN pantheon-greeter-3.0.orig/data/pantheon-greeter.desktop pantheon-greeter-3.0/data/pantheon-greeter.desktop ---- pantheon-greeter-3.0.orig/data/pantheon-greeter.desktop 2016-08-21 10:12:04.435621456 +0200 +--- pantheon-greeter-3.0.orig/data/pantheon-greeter.desktop 2016-08-21 11:37:55.995777536 +0200 +++ pantheon-greeter-3.0/data/pantheon-greeter.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -[Desktop Entry] @@ -74,8 +68,8 @@ diff -rupN pantheon-greeter-3.0.orig/data/pantheon-greeter.desktop pantheon-gree -X-Ubuntu-Gettext-Domain=pantheon-greeter -Name[en_US]=pantheon-greeter diff -rupN pantheon-greeter-3.0.orig/src/PantheonGreeter.vala pantheon-greeter-3.0/src/PantheonGreeter.vala ---- pantheon-greeter-3.0.orig/src/PantheonGreeter.vala 2016-08-21 10:12:04.435621456 +0200 -+++ pantheon-greeter-3.0/src/PantheonGreeter.vala 2016-08-21 10:18:36.096098419 +0200 +--- pantheon-greeter-3.0.orig/src/PantheonGreeter.vala 2016-08-21 11:37:55.999110726 +0200 ++++ pantheon-greeter-3.0/src/PantheonGreeter.vala 2016-08-21 11:38:30.837742328 +0200 @@ -104,7 +104,7 @@ public class PantheonGreeter : Gtk.Windo settings = new KeyFile (); @@ -94,20 +88,9 @@ diff -rupN pantheon-greeter-3.0.orig/src/PantheonGreeter.vala pantheon-greeter-3 /* Protect memory from being paged to disk, as we deal with passwords */ Posix.mlockall (Posix.MCL_CURRENT | Posix.MCL_FUTURE); -@@ -451,8 +451,8 @@ public static int main (string [] args) - message ("Applying settings..."); - /*some settings*/ - Intl.setlocale (LocaleCategory.ALL, ""); -- Intl.bind_textdomain_codeset ("pantheon-greeter", "UTF-8"); -- Intl.textdomain ("pantheon-greeter"); -+ Intl.bind_textdomain_codeset ("lightdm-pantheon-greeter", "UTF-8"); -+ Intl.textdomain ("lightdm-pantheon-greeter"); - - var cursor = new Gdk.Cursor.for_display (Gdk.Display.get_default (), - Gdk.CursorType.LEFT_PTR); diff -rupN pantheon-greeter-3.0.orig/src/Wallpaper.vala pantheon-greeter-3.0/src/Wallpaper.vala ---- pantheon-greeter-3.0.orig/src/Wallpaper.vala 2016-08-21 10:12:04.435621456 +0200 -+++ pantheon-greeter-3.0/src/Wallpaper.vala 2016-08-21 10:19:48.740571392 +0200 +--- pantheon-greeter-3.0.orig/src/Wallpaper.vala 2016-08-21 11:37:55.999110726 +0200 ++++ pantheon-greeter-3.0/src/Wallpaper.vala 2016-08-21 11:38:30.837742328 +0200 @@ -53,7 +53,7 @@ public class Wallpaper : GtkClutter.Acto var settings = new KeyFile (); string default_wallpaper = "/usr/share/backgrounds/elementaryos-default"; |