r53167 - in /desktop/unstable/gvfs/debian: changelog patches/04_hurd_path_max.patch

jbicha at users.alioth.debian.org jbicha at users.alioth.debian.org
Wed Aug 30 20:33:05 UTC 2017


Author: jbicha
Date: Wed Aug 30 20:33:04 2017
New Revision: 53167

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53167
Log:
Refresh 04_hurd_path_max.patch

Modified:
    desktop/unstable/gvfs/debian/changelog
    desktop/unstable/gvfs/debian/patches/04_hurd_path_max.patch

Modified: desktop/unstable/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/changelog?rev=53167&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gvfs/debian/changelog	[utf-8] Wed Aug 30 20:33:04 2017
@@ -1,6 +1,7 @@
 gvfs (1.33.91-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Refresh 04_hurd_path_max.patch
 
  -- Jeremy Bicha <jbicha at debian.org>  Wed, 30 Aug 2017 16:17:11 -0400
 

Modified: desktop/unstable/gvfs/debian/patches/04_hurd_path_max.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/04_hurd_path_max.patch?rev=53167&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/04_hurd_path_max.patch	[utf-8] (original)
+++ desktop/unstable/gvfs/debian/patches/04_hurd_path_max.patch	[utf-8] Wed Aug 30 20:33:04 2017
@@ -17,8 +17,7 @@
 Bug-Debian: http://bugs.debian.org/555055
 ---
  monitor/gdu/ggduvolumemonitor.c |   33 +++++++++++++++++++++++++++++++--
- monitor/hal/ghalvolumemonitor.c |   18 +++++++++++++++++-
- 2 files changed, 48 insertions(+), 3 deletions(-)
+ 1 files changed, 34 insertions(+), 1 deletion(-)
 
 diff --git a/monitor/gdu/ggduvolumemonitor.c b/monitor/gdu/ggduvolumemonitor.c
 index 4021eab..aecfa34 100644
@@ -88,39 +87,3 @@
            if (device != NULL)
              {
                g_object_unref (device);
-diff --git a/monitor/hal/ghalvolumemonitor.c b/monitor/hal/ghalvolumemonitor.c
-index 5082fc8..7bbd5a3 100644
---- a/monitor/hal/ghalvolumemonitor.c
-+++ b/monitor/hal/ghalvolumemonitor.c
-@@ -739,11 +739,27 @@ get_mount_point_for_device (HalDevice *d, GList *fstab_mount_points)
-         }
-       else
-         {
--          char resolved_device_path[PATH_MAX];
-           /* handle symlinks such as /dev/disk/by-uuid/47C2-1994 */
-+#ifdef __GLIBC__
-+          char *resolved_device_path;
-+
-+          resolved_device_path = realpath (device_path, NULL);
-+
-+          if (resolved_device_path != NULL &&
-+              strcmp (resolved_device_path, device_file) == 0)
-+            {
-+              free (resolved_device_path);
-+              return mount_point;
-+            }
-+
-+          free (resolved_device_path);
-+#else
-+          char resolved_device_path[PATH_MAX];
-+
-           if (realpath (device_path, resolved_device_path) != NULL &&
-               strcmp (resolved_device_path, device_file) == 0)
-             return mount_point;
-+#endif
-         }
-     }
- 
--- 
-1.7.10.4
-




More information about the pkg-gnome-commits mailing list