Skip to content

Commit

Permalink
[glib] Reinstate mtab patch, so tracker can see SD cards again. JB#41420
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew Branson committed Jul 12, 2018
1 parent 9342ad3 commit f0f5203
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 0 deletions.
2 changes: 2 additions & 0 deletions rpm/glib2.spec
Expand Up @@ -14,6 +14,7 @@ Source3: glib2.csh
Source4: %{name}-rpmlintrc
Patch1: 0001-Add-dev-mmcblk-to-the-list-of-devices-to-be-detected.patch
Patch2: glib-replace-some-criticals-with-warnings.patch
Patch3: use-mtab-instead-of-fstab.patch
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
BuildRequires: pkgconfig(libpcre)
Expand Down Expand Up @@ -63,6 +64,7 @@ version 2 of the GLib library.
%patch1 -p1
# glib-replace-some-criticals-with-warnings.patch
%patch2 -p1
%patch3 -p1

%build
#
Expand Down
23 changes: 23 additions & 0 deletions rpm/use-mtab-instead-of-fstab.patch
@@ -0,0 +1,23 @@
From f837c7858b1d354094205b5f1b07e5b9c4a7df3d Thu, 12 Jul 2018 15:51:50 +0200
From: Pekka Vuorela <pekka.vuorela@jollamobile.com>
Date: Thu, 12 Jul 2018 15:51:33 +0200
Subject: [PATCH] use-mtab-instead-of-fstab

This is needed for Tracker to detect removable storage properly. Upstream
by default already moved to libmount, but that seems to have problems with
Tracker. Enabling commit (496cd8aac6402) does state that it returns slightly
different results, namely with bind mounts.

diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
index 0035d57..6c26791 100644
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@ -1049,7 +1049,7 @@
GUnixMountPoint *mount_point;
GList *return_list;

- read_file = get_fstab_file ();
+ read_file = get_mtab_read_file ();

file = setmntent (read_file, "r");
if (file == NULL)

0 comments on commit f0f5203

Please sign in to comment.