[Pkg-xfce-commits] r8345 - in /goodies/branches/experimental/lightdm/debian: changelog patches/02_fix-build-glib-before-2.40.patch patches/series

[Yves-Alexis Perez]

Author: corsac
Date: Wed Mar 12 09:26:04 2014
New Revision: 8345

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8345
Log:
* debian/patches:
  - 02_fix-build-glib-before-2.40 added, fix FTBFS with glib before 2.40.

Added:
    goodies/branches/experimental/lightdm/debian/patches/02_fix-build-glib-before-2.40.patch
Modified:
    goodies/branches/experimental/lightdm/debian/changelog
    goodies/branches/experimental/lightdm/debian/patches/series

Modified: goodies/branches/experimental/lightdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/branches/experimental/lightdm/debian/changelog?rev=8345&op=diff
==============================================================================
--- goodies/branches/experimental/lightdm/debian/changelog	(original)
+++ goodies/branches/experimental/lightdm/debian/changelog	Wed Mar 12 09:26:04 2014
@@ -3,6 +3,8 @@
   * New upstream release.
   * debian/liblightdm-gobject-1-0.symbols, debian/liblightdm-qt-3-0.symbols:
     - add a symbol file to handle library dependencies more carefully.
+  * debian/patches:
+    - 02_fix-build-glib-before-2.40 added, fix FTBFS with glib before 2.40.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Wed, 12 Mar 2014 09:56:47 +0100
 

Added: goodies/branches/experimental/lightdm/debian/patches/02_fix-build-glib-before-2.40.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/branches/experimental/lightdm/debian/patches/02_fix-build-glib-before-2.40.patch?rev=8345&op=file
==============================================================================
--- goodies/branches/experimental/lightdm/debian/patches/02_fix-build-glib-before-2.40.patch	(added)
+++ goodies/branches/experimental/lightdm/debian/patches/02_fix-build-glib-before-2.40.patch	Wed Mar 12 09:26:04 2014
@@ -0,0 +1,29 @@
+=== modified file 'src/process.c'
+--- a/src/process.c	2014-03-06 22:34:35 +0000
++++ b/src/process.c	2014-03-11 20:31:01 +0000
+@@ -177,6 +177,7 @@
+     gchar **argv;
+     gchar **env_keys, **env_values;
+     guint i, env_length;
++    GList *link;
+     pid_t pid;
+     int log_fd = -1;
+     GError *error = NULL;
+@@ -207,10 +208,14 @@
+     }
+ 
+     /* Work out variables to set */
+-    env_keys = (gchar **) g_hash_table_get_keys_as_array (process->priv->env, &env_length);
++    env_length = g_hash_table_size (process->priv->env);
++    env_keys = g_malloc (sizeof (gchar *) * env_length);
+     env_values = g_malloc (sizeof (gchar *) * env_length);
+-    for (i = 0; i < env_length; i++)
++    for (i = 0, link = g_hash_table_get_keys (process->priv->env); i < env_length; i++, link = link->next)
++    {
++        env_keys[i] = link->data;
+         env_values[i] = g_hash_table_lookup (process->priv->env, env_keys[i]);
++    }
+ 
+     pid = fork ();
+     if (pid == 0)
+

Modified: goodies/branches/experimental/lightdm/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/branches/experimental/lightdm/debian/patches/series?rev=8345&op=diff
==============================================================================
--- goodies/branches/experimental/lightdm/debian/patches/series	(original)
+++ goodies/branches/experimental/lightdm/debian/patches/series	Wed Mar 12 09:26:04 2014
@@ -1,3 +1,4 @@
 01_set-default-path.patch
+02_fix-build-glib-before-2.40.patch
 05_debianize-pam-files.patch
 06_allow_libpamsystemd_and_ck_together.patch