r49407 - in /desktop/unstable/gtk+3.0/debian: changelog patches/0001-Revert-Improve-external-drives-detection.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Thu Aug  4 16:45:00 2016
New Revision: 49407

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49407
Log:
* debian/patches/0001-Revert-Improve-external-drives-detection.patch:
  + Revert upstream change that requires unstable glib 2.49.1.

Added:
    desktop/unstable/gtk+3.0/debian/patches/0001-Revert-Improve-external-drives-detection.patch
Modified:
    desktop/unstable/gtk+3.0/debian/changelog
    desktop/unstable/gtk+3.0/debian/patches/series

Modified: desktop/unstable/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/changelog?rev=49407&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/changelog	[utf-8] Thu Aug  4 16:45:00 2016
@@ -7,6 +7,8 @@
 
   [ Emilio Pozuelo Monfort ]
   * New upstream release.
+  * debian/patches/0001-Revert-Improve-external-drives-detection.patch:
+    + Revert upstream change that requires unstable glib 2.49.1.
 
  -- Laurent Bigonville <bigon at debian.org>  Thu, 14 Jul 2016 02:11:43 +0200
 

Added: desktop/unstable/gtk+3.0/debian/patches/0001-Revert-Improve-external-drives-detection.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/0001-Revert-Improve-external-drives-detection.patch?rev=49407&op=file
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/0001-Revert-Improve-external-drives-detection.patch	(added)
+++ desktop/unstable/gtk+3.0/debian/patches/0001-Revert-Improve-external-drives-detection.patch	[utf-8] Thu Aug  4 16:45:00 2016
@@ -0,0 +1,60 @@
+From 73502146a193c8423148ac2ba21312e7cf7b08b3 Mon Sep 17 00:00:00 2001
+From: Emilio Pozuelo Monfort <pochu27 at gmail.com>
+Date: Thu, 4 Aug 2016 18:06:02 +0200
+Subject: [PATCH] Revert "Improve external drives detection"
+
+This reverts commit a01ee5a7b0a9a7170d4be3c64314ee51dd502cab.
+---
+ configure.ac           | 4 ++--
+ gtk/gtkplacessidebar.c | 4 +++-
+ gtk/gtkplacesview.c    | 4 +++-
+ 3 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 94e7db9..10739f6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -42,8 +42,8 @@ m4_define([gtk_binary_version], [3.0.0])
+ 
+ # required versions of other packages
+ m4_define([glib_required_major], [2])
+-m4_define([glib_required_minor], [49])
+-m4_define([glib_required_micro], [1])
++m4_define([glib_required_minor], [45])
++m4_define([glib_required_micro], [8])
+ m4_define([glib_required_version],
+           [glib_required_major.glib_required_minor.glib_required_micro])
+ m4_define([glib_min_required_minor],
+diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
+index 016d85d..309cc58 100644
+--- a/gtk/gtkplacessidebar.c
++++ b/gtk/gtkplacessidebar.c
+@@ -876,7 +876,9 @@ is_external_volume (GVolume *volume)
+   is_external |= !id;
+ 
+   if (drive)
+-    is_external |= g_drive_is_removable (drive);
++    is_external |= g_drive_can_eject (drive) ||
++                   g_drive_is_media_removable (drive) ||
++                   g_drive_can_stop (drive);
+ 
+   g_clear_object (&drive);
+   g_free (id);
+diff --git a/gtk/gtkplacesview.c b/gtk/gtkplacesview.c
+index 809688c..fffca33 100644
+--- a/gtk/gtkplacesview.c
++++ b/gtk/gtkplacesview.c
+@@ -474,7 +474,9 @@ is_external_volume (GVolume *volume)
+   is_external |= !id;
+ 
+   if (drive)
+-    is_external |= g_drive_is_removable (drive);
++    is_external |= g_drive_can_eject (drive) ||
++                   g_drive_is_media_removable (drive) ||
++                   g_drive_can_stop (drive);
+ 
+   g_clear_object (&drive);
+   g_free (id);
+-- 
+2.8.1
+

Modified: desktop/unstable/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/series?rev=49407&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/series	[utf-8] Thu Aug  4 16:45:00 2016
@@ -9,3 +9,4 @@
 reftest-known-fail.patch
 wayland-add-extended-state-for-tiled.patch
 Don-t-apply-GDK_HINT_RESIZE_INC-to-GDK_WINDOW_STATE_.patch
+0001-Revert-Improve-external-drives-detection.patch