Hello community,

here is the log from the commit of package solid for openSUSE:Factory checked 
in at 2018-04-11 13:49:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/solid (Old)
 and      /work/SRC/openSUSE:Factory/.solid.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "solid"

Wed Apr 11 13:49:37 2018 rev:55 rq:594855 version:5.44.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/solid/solid.changes      2018-03-20 
21:48:57.118328807 +0100
+++ /work/SRC/openSUSE:Factory/.solid.new/solid.changes 2018-04-11 
13:49:48.353242744 +0200
@@ -1,0 +2,16 @@
+Mon Apr  9 09:28:01 UTC 2018 - wba...@tmo.at
+
+- Add UDisks-Correct-handling-of-removable-file-systems.patch to
+  fix problems with mounting removable devices introduced by the
+  previous fix for Auto-mount (kde#391706, kde#389479)
+
+-------------------------------------------------------------------
+Sat Apr  7 11:36:59 UTC 2018 - fab...@ritter-vogt.de
+
+- Add udisks2 recommends
+- Use %license
+- Remove unnecessary ldconfig calls for -imports
+- Remove unnecessary %requires_ge
+- Clean .spec file
+
+-------------------------------------------------------------------

New:
----
  UDisks-Correct-handling-of-removable-file-systems.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ solid.spec ++++++
--- /var/tmp/diff_new_pack.XagJje/_old  2018-04-11 13:49:50.009182830 +0200
+++ /var/tmp/diff_new_pack.XagJje/_new  2018-04-11 13:49:50.009182830 +0200
@@ -44,7 +44,8 @@
 Url:            http://www.kde.org
 Source:         
http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
 Source1:        baselibs.conf
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+# PATCH-FIX-UPSTREAM
+Patch:          UDisks-Correct-handling-of-removable-file-systems.patch
 
 %description
 Solid is a device integration framework.  It provides a way of querying and
@@ -54,16 +55,11 @@
 Summary:        KDE Desktop hardware abstraction
 Group:          System/GUI/KDE
 Obsoletes:      libKF5Solid4
-%if %{with lang}
 Recommends:     %lname-lang = %{version}
-%endif
 Recommends:     %{name}-tools = %{version}
 Recommends:     %{name}-imports = %{version}
+Recommends:     udisks2
 Recommends:     media-player-info
-%requires_ge libQt5Core5
-%requires_ge libQt5DBus5
-%requires_ge libQt5Widgets5
-%requires_ge libQt5Xml5
 
 %description -n %lname
 Solid is a device integration framework.  It provides a way of querying and
@@ -81,7 +77,6 @@
 %package imports
 Summary:        KDE Desktop hardware abstraction
 Group:          System/GUI/KDE
-%requires_ge libQtQuick5
 
 %description imports
 Solid is a device integration framework.  It provides a way of querying and
@@ -101,8 +96,10 @@
 Development files.
 
 %lang_package -n %lname
+
 %prep
 %setup -q
+%patch -p1
 
 %build
   %cmake_kf5 -d build -- -DWITH_NEW_SOLID_JOB=ON -DWITH_NEW_POWER_ASYNC_API=ON 
-DWITH_NEW_POWER_ASYNC_FREEDESKTOP=ON 
-Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert
@@ -120,32 +117,24 @@
 
 %postun -n %lname -p /sbin/ldconfig
 
-%post imports -p /sbin/ldconfig
-
-%postun imports -p /sbin/ldconfig
-
 %if %{with lang}
 %files -n %lname-lang -f %{name}5.lang
 %endif
 
 %files -n %lname
-%defattr(-,root,root)
-%doc COPYING*
+%license COPYING*
 %{_kf5_libdir}/libKF5Solid.so.*
 
 %files tools
-%defattr(-,root,root)
-%doc COPYING*
+%license COPYING*
 %{_kf5_bindir}/solid-hardware5
 %{_kf5_bindir}/solid-power
 
 %files imports
-%defattr(-,root,root)
-%doc COPYING*
+%license COPYING*
 %{_kf5_qmldir}/
 
 %files devel
-%defattr(-,root,root)
 %{_kf5_libdir}/libKF5Solid.so
 %{_kf5_libdir}/cmake/KF5Solid/
 %{_kf5_includedir}/

++++++ UDisks-Correct-handling-of-removable-file-systems.patch ++++++
>From 122a6cd8989a4bd3096fddea908a1c2b223be62a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de>
Date: Sun, 8 Apr 2018 22:12:10 +0200
Subject: [UDisks] Correct handling of removable file systems

Summary:
Filesystems which have no fstab entry have an empty filepath (aka
mountpoint), but these should be mountable nevertheless.
The StorageAccess.ignored flag should only be used as a hint if a
device (filesystem) should create a device item in e.g Dolphin.

BUG: 391706
CCBUG: 389479

Reviewers: ngraham, broulik

Reviewed By: ngraham

Subscribers: #frameworks

Tags: #frameworks

Differential Revision: https://phabricator.kde.org/D12051
---
 src/solid/devices/backends/udisks2/udisksstorageaccess.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp 
b/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
index dd8f76f..7db2263 100644
--- a/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
+++ b/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
@@ -111,10 +111,10 @@ bool StorageAccess::isIgnored() const
 
     const QString path = filePath();
 
-    return !path.isEmpty()
-               && !path.startsWith(QLatin1String("/media/"))
-               && !path.startsWith(QLatin1String("/run/media/"))
-               && !path.startsWith(QDir::homePath());
+    bool inUserPath = path.startsWith(QLatin1String("/media/")) ||
+                      path.startsWith(QLatin1String("/run/media/")) ||
+                      path.startsWith(QDir::homePath());
+    return !inUserPath;
 }
 
 bool StorageAccess::setup()
-- 
cgit v0.11.2


Reply via email to