[Pkg-xfce-commits] r5656 - in desktop/trunk/xfce4-settings/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-04-21 09:23:39 +0000 (Thu, 21 Apr 2011)
New Revision: 5656

Added:
   desktop/trunk/xfce4-settings/debian/patches/02_fix-path_max-undefined-hurd.patch
Modified:
   desktop/trunk/xfce4-settings/debian/changelog
   desktop/trunk/xfce4-settings/debian/patches/series
Log:
* debian/patches:
  - 02_fix-path_max-undefined-hurd added, tentative patch to fix FTBFS on
    GNU/hurd.

Modified: desktop/trunk/xfce4-settings/debian/changelog
===================================================================
--- desktop/trunk/xfce4-settings/debian/changelog	2011-04-20 11:48:35 UTC (rev 5655)
+++ desktop/trunk/xfce4-settings/debian/changelog	2011-04-21 09:23:39 UTC (rev 5656)
@@ -1,3 +1,11 @@
+xfce4-settings (4.8.1-4) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 02_fix-path_max-undefined-hurd added, tentative patch to fix FTBFS on
+      GNU/hurd.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 21 Apr 2011 10:07:46 +0200
+
 xfce4-settings (4.8.1-3) unstable; urgency=low
 
   * Upload to unstable.

Added: desktop/trunk/xfce4-settings/debian/patches/02_fix-path_max-undefined-hurd.patch
===================================================================
--- desktop/trunk/xfce4-settings/debian/patches/02_fix-path_max-undefined-hurd.patch	                        (rev 0)
+++ desktop/trunk/xfce4-settings/debian/patches/02_fix-path_max-undefined-hurd.patch	2011-04-21 09:23:39 UTC (rev 5656)
@@ -0,0 +1,32 @@
+diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c b/xfce4-settings-manager/xfce-settings-manager-dialog.c
+index 90d34c8..12bccfa 100644
+--- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
++++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
+@@ -384,7 +384,7 @@ xfce_settings_manager_dialog_sort_icons(GtkTreeModel *model,
+ static void
+ xfce_settings_manager_dialog_create_liststore(XfceSettingsManagerDialog *dialog)
+ {
+-    gchar **dirs, buf[PATH_MAX];
++    gchar **dirs, *buf;
+     gint i, icon_size;
+     GList *dialog_name_list = NULL;
+ 
+@@ -424,10 +424,16 @@ xfce_settings_manager_dialog_create_liststore(XfceSettingsManagerDialog *dialog)
+             if(!g_str_has_suffix(file, ".desktop"))
+                 continue;
+ 
+-            g_snprintf(buf, sizeof(buf), "%s/%s", dirs[i], file);
++            buf = g_strdup_printf("%s/%s", dirs[i], file);
++            if(!buf)
++                continue;
++
+             rcfile = xfce_rc_simple_open(buf, TRUE);
+-            if(!rcfile)
++            if(!rcfile) {
++                g_free(buf);
+                 continue;
++            }
++            g_free(buf);
+ 
+             if(!xfce_rc_has_group(rcfile, "Desktop Entry")) {
+                 xfce_rc_close(rcfile);

Modified: desktop/trunk/xfce4-settings/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-settings/debian/patches/series	2011-04-20 11:48:35 UTC (rev 5655)
+++ desktop/trunk/xfce4-settings/debian/patches/series	2011-04-21 09:23:39 UTC (rev 5656)
@@ -1 +1,2 @@
 01_fix-sticky-slow-bounce-mouse-keys-expiration.patch
+02_fix-path_max-undefined-hurd.patch