diff -Nru gnome-disk-utility-3.26.1/debian/changelog gnome-disk-utility-3.26.1/debian/changelog --- gnome-disk-utility-3.26.1/debian/changelog 2017-10-02 18:27:11.000000000 +0000 +++ gnome-disk-utility-3.26.1/debian/changelog 2018-02-06 12:12:31.000000000 +0000 @@ -1,3 +1,10 @@ +gnome-disk-utility (3.26.1-0ubuntu2) UNRELEASED; urgency=medium + + * debian/patches/hide-if-xgdu-hide.patch: + - Hide file systems mounted with x-gdu.hide userspace mount option + + -- Andrea Azzarone Tue, 06 Feb 2018 12:12:31 +0000 + gnome-disk-utility (3.26.1-0ubuntu1) artful; urgency=medium * New upstream release diff -Nru gnome-disk-utility-3.26.1/debian/control gnome-disk-utility-3.26.1/debian/control --- gnome-disk-utility-3.26.1/debian/control 2017-10-02 18:27:11.000000000 +0000 +++ gnome-disk-utility-3.26.1/debian/control 2018-02-06 11:57:18.000000000 +0000 @@ -20,7 +20,7 @@ libpwquality-dev (>= 1.0.0), libsecret-1-dev (>= 0.7), libsystemd-dev (>= 209), - libudisks2-dev (>= 2.1.1), + libudisks2-dev (>= 2.6.5-2ubuntu3), meson (>= 0.41.0), pkg-config, xsltproc, diff -Nru gnome-disk-utility-3.26.1/debian/patches/hide-if-xgdu-hide.patch gnome-disk-utility-3.26.1/debian/patches/hide-if-xgdu-hide.patch --- gnome-disk-utility-3.26.1/debian/patches/hide-if-xgdu-hide.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-disk-utility-3.26.1/debian/patches/hide-if-xgdu-hide.patch 2018-02-06 12:12:27.000000000 +0000 @@ -0,0 +1,59 @@ +Author: Andrea Azzarone +Origin: upstream, commit:c6eb1882c8ae87168939ece825f83cf9b6b559ae +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=790279 +Bug-Ubuntu: https://launchpad.net/bugs/1637984 +Last-Update: 2018-02-06 +Description: Hide file systems mounted with x-gdu.hide userspace mount option + Check inside should_include_block if a block has been mounted with + the x-gdu.hide option. This allows to hide e.g. snap squashfs from + gnome-disk-utility. + +--- gnome-disk-utility-3.26.1.orig/src/disks/gdudevicetreemodel.c ++++ gnome-disk-utility-3.26.1/src/disks/gdudevicetreemodel.c +@@ -1196,6 +1196,9 @@ should_include_block (UDisksObject *obje + partition = udisks_object_peek_partition (object); + loop = udisks_object_peek_loop (object); + ++ if (gdu_utils_has_option (block, "x-gdu.hide")) ++ goto out; ++ + /* RAM devices are useless */ + device = udisks_block_get_device (block); + if (g_str_has_prefix (device, "/dev/ram")) +--- gnome-disk-utility-3.26.1.orig/src/libgdu/gduutils.c ++++ gnome-disk-utility-3.26.1/src/libgdu/gduutils.c +@@ -63,6 +63,22 @@ gdu_utils_has_configuration (UDisksBlock + return ret; + } + ++gboolean ++gdu_utils_has_option (UDisksBlock *block, ++ const gchar *option) ++{ ++ const gchar *const *options; ++ gboolean ret; ++ ++ ret = FALSE; ++ ++ options = udisks_block_get_userspace_mount_options (block); ++ if (options != NULL) ++ ret = g_strv_contains (options, option); ++ ++ return ret; ++} ++ + void + gdu_utils_configure_file_chooser_for_disk_images (GtkFileChooser *file_chooser, + gboolean set_file_types, +--- gnome-disk-utility-3.26.1.orig/src/libgdu/gduutils.h ++++ gnome-disk-utility-3.26.1/src/libgdu/gduutils.h +@@ -18,6 +18,9 @@ gboolean gdu_utils_has_configuration (UD + const gchar *type, + gboolean *out_has_passphrase); + ++gboolean gdu_utils_has_option (UDisksBlock *block, ++ const gchar *option); ++ + void gdu_utils_configure_file_chooser_for_disk_images (GtkFileChooser *file_chooser, + gboolean set_file_types, + gboolean allow_compressed); diff -Nru gnome-disk-utility-3.26.1/debian/patches/series gnome-disk-utility-3.26.1/debian/patches/series --- gnome-disk-utility-3.26.1/debian/patches/series 2017-10-02 18:27:11.000000000 +0000 +++ gnome-disk-utility-3.26.1/debian/patches/series 2018-02-06 11:58:47.000000000 +0000 @@ -1,3 +1,4 @@ # Debian patches for gnome-disk-utility dont-use-libdvdread.patch +hide-if-xgdu-hide.patch