[arch-commits] Commit in lightdm/trunk (3 files)

[Maxime Gauduin]

    Date: Saturday, November 15, 2014 @ 22:03:11
  Author: alucryd
Revision: 122622

upgpkg: lightdm 1:1.12.2-1

Modified:
  lightdm/trunk/PKGBUILD
Deleted:
  lightdm/trunk/lightdm-desktop-names.patch
  lightdm/trunk/lightdm-userlist.patch

-----------------------------+
 PKGBUILD                    |    7 ++-----
 lightdm-desktop-names.patch |   34 ----------------------------------
 lightdm-userlist.patch      |   13 -------------
 3 files changed, 2 insertions(+), 52 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-15 18:14:13 UTC (rev 122621)
+++ PKGBUILD	2014-11-15 21:03:11 UTC (rev 122622)
@@ -4,7 +4,7 @@
 
 pkgbase=lightdm
 pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
-pkgver=1.12.1
+pkgver=1.12.2
 pkgrel=1
 epoch=1
 pkgdesc='A lightweight display manager'
@@ -20,9 +20,8 @@
         'lightdm-autologin.pam'
         'lightdm.rules'
         'lightdm-default-config.patch'
-        'lightdm-desktop-names.patch'
         'Xsession')
-sha256sums=('55fc6ed30681d0d4c60ae3d2760c54ed74096632ca777f8cab5c072ef8f35b1b'
+sha256sums=('ce36bacef7a0ac5b720dc0f4aeb1c37aa56e7b72f7390e290a670fb1b8231736'
             '0d2adba25cdbe59e97ffd302083db9d5e23920780f41e04f64512cd6b633289a'
             'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f'
             'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0'
@@ -29,13 +28,11 @@
             '33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a'
             'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
             'ed3dca57ef19d32499b72668bc78eaff0d9e772718b76f3816c5ee5f816b1891'
-            'b750b805e4a87bf3d764255085d49be093c48acb1c5bb2e94b5a1d4c464d99d5'
             '4d5674906742200b3c171f978457e943560f2c10a2b9156fcd44da3796d185a2')
 
 prepare() {
   cd lightdm-${pkgver}
 
-  patch -Np0 -i ../lightdm-desktop-names.patch
   patch -Np1 -i ../lightdm-default-config.patch
 }
 

Deleted: lightdm-desktop-names.patch
===================================================================
--- lightdm-desktop-names.patch	2014-11-15 18:14:13 UTC (rev 122621)
+++ lightdm-desktop-names.patch	2014-11-15 21:03:11 UTC (rev 122622)
@@ -1,34 +0,0 @@
-=== modified file 'src/session-config.c'
---- src/session-config.c	2014-09-11 23:50:44 +0000
-+++ src/session-config.c	2014-10-17 05:54:58 +0000
-@@ -34,6 +34,7 @@
-     GKeyFile *desktop_file;
-     SessionConfig *config;
-     gchar *command;
-+    gchar **desktop_names;
- 
-     desktop_file = g_key_file_new ();
-     if (!g_key_file_load_from_file (desktop_file, filename, G_KEY_FILE_NONE, error))
-@@ -54,7 +55,12 @@
-     if (!config->priv->session_type)
-         config->priv->session_type = g_strdup ("x");
- 
--    config->priv->desktop_name = g_key_file_get_string (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "DesktopNames", NULL);
-+    desktop_names = g_key_file_get_string_list (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "DesktopNames", NULL, NULL);
-+    if (desktop_names != NULL)
-+    {
-+        config->priv->desktop_name = g_strjoinv (":", desktop_names);
-+        g_strfreev (desktop_names);
-+    }
-     if (!config->priv->desktop_name)
-         config->priv->desktop_name = g_key_file_get_string (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "X-LightDM-DesktopName", NULL);
-     config->priv->compositor_command = g_key_file_get_string (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "X-LightDM-System-Compositor-Command", NULL);
-@@ -96,6 +102,7 @@
- session_config_init (SessionConfig *config)
- {
-     config->priv = G_TYPE_INSTANCE_GET_PRIVATE (config, SESSION_CONFIG_TYPE, SessionConfigPrivate);
-+    config->priv->desktop_name = NULL;
- }
- 
- static void
-

Deleted: lightdm-userlist.patch
===================================================================
--- lightdm-userlist.patch	2014-11-15 18:14:13 UTC (rev 122621)
+++ lightdm-userlist.patch	2014-11-15 21:03:11 UTC (rev 122622)
@@ -1,13 +0,0 @@
-=== modified file 'data/users.conf'
---- data/users.conf	2011-10-18 02:41:06 +0000
-+++ data/users.conf	2014-05-19 20:10:41 +0000
-@@ -8,7 +8,7 @@
- # hidden-users = Users that are not shown to the user
- # hidden-shells = Shells that indicate a user cannot login
- #
--[UserAccounts]
-+[UserList]
- minimum-uid=500
- hidden-users=nobody nobody4 noaccess
- hidden-shells=/bin/false /usr/sbin/nologin
-