From 11172ecf69df960c12c5918a0cbc54099f4a76ed Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 10 2018 05:20:10 +0000 Subject: import kde-runtime-4.10.5-11.el7 --- diff --git a/SOURCES/kde-runtime-solid-device-automounter.patch b/SOURCES/kde-runtime-solid-device-automounter.patch new file mode 100644 index 0000000..8744906 --- /dev/null +++ b/SOURCES/kde-runtime-solid-device-automounter.patch @@ -0,0 +1,47 @@ +diff --git a/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp b/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp +index 42fbfae..80f6d28 100644 +--- a/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp ++++ b/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp +@@ -57,6 +57,7 @@ DeviceAutomounterKCM::DeviceAutomounterKCM(QWidget *parent, const QVariantList & + + m_devices = new DeviceModel(this); + deviceView->setModel(m_devices); ++ deviceView->setEnabled(true); + + connect(automountOnLogin, SIGNAL(stateChanged(int)), this, SLOT(emitChanged())); + connect(automountOnPlugin, SIGNAL(stateChanged(int)), this, SLOT(emitChanged())); +@@ -112,12 +113,10 @@ DeviceAutomounterKCM::enabledChanged() + automountOnLogin->setEnabled(false); + automountOnPlugin->setEnabled(false); + automountUnknownDevices->setEnabled(false); +- deviceView->setEnabled(false); + } else { + automountOnLogin->setEnabled(true); + automountOnPlugin->setEnabled(true); + automountUnknownDevices->setEnabled(true); +- deviceView->setEnabled(true); + } + } + +diff --git a/solid-device-automounter/kcm/DeviceModel.cpp b/solid-device-automounter/kcm/DeviceModel.cpp +index 9469cb6..7ab6eb4 100644 +--- a/solid-device-automounter/kcm/DeviceModel.cpp ++++ b/solid-device-automounter/kcm/DeviceModel.cpp +@@ -60,7 +60,8 @@ void + DeviceModel::deviceAttached(const QString &udi) + { + Solid::Device dev(udi); +- if (dev.is()) { ++ Solid::StorageVolume *volume = dev.as(); ++ if (volume && !volume->isIgnored()) { + if (m_disconnected.contains(udi)) { + emit layoutAboutToBeChanged(); + beginRemoveRows(index(1, 0), m_disconnected.indexOf(udi), m_disconnected.indexOf(udi)); +@@ -81,7 +82,6 @@ DeviceModel::deviceRemoved(const QString &udi) + m_attached.removeOne(udi); + endRemoveRows(); + emit layoutChanged(); +- addNewDevice(udi); + } + } + diff --git a/SPECS/kde-runtime.spec b/SPECS/kde-runtime.spec index c6f5603..66b2afa 100644 --- a/SPECS/kde-runtime.spec +++ b/SPECS/kde-runtime.spec @@ -6,7 +6,7 @@ Name: kde-runtime Summary: KDE Runtime Version: 4.10.5 -Release: 8%{?dist} +Release: 11%{?dist} # http://techbase.kde.org/Policies/Licensing_Policy License: LGPLv2+ and GPLv2+ @@ -49,7 +49,7 @@ Patch11: kde-runtime-4.10.4-trash-readonly.patch # make nepomuk menu items (with oxygen-only icons atm) OnlyShowIn=KDE; Patch50: kde-runtime-4.7.90-nepomuk_onlyshowin_kde.patch -# make installdbgsymbols.sh use pkexec instead of su +# make installdbgsymbols.sh use pkexec instead of su # increase some timeouts in an effort to see (some) errors before close Patch51: kde-runtime-4.9.0-installdbgsymbols.patch @@ -60,6 +60,10 @@ Patch52: kde-runtime-mouseeventlistener.patch # Make kdesu full RELRO Patch53: kde-runtime-4.10.5-kdesu-fullrelro.patch +# Bug 1084191 - In System Settings -> Removable Devices, adding duplicates of USB device +# Bug 1084497 - KDE cannot disable automount for removable media +Patch54: kde-runtime-solid-device-automounter.patch + ## upstream patches # upstreamed patch for RHBZ#1018207 Patch100: kde-runtime-4.10-kglobalaccel-crash.patch @@ -68,6 +72,7 @@ Patch101: kwalletd-new.patch # rhel patches Patch300: kde-runtime-4.9.2-webkit.patch + Obsoletes: kdebase-runtime < 4.7.97-10 Provides: kdebase-runtime = %{version}-%{release} Obsoletes: kdebase4-runtime < %{version}-%{release} @@ -76,7 +81,7 @@ Provides: kdebase4-runtime = %{version}-%{release} Obsoletes: nepomukcontroller < 1:0.2 Provides: nepomukcontroller = 1:0.2-1 -# knotify4 provides dbus service org.freedesktop.Notifications too +# knotify4 provides dbus service org.freedesktop.Notifications too Provides: desktop-notification-daemon %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } @@ -115,7 +120,7 @@ BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(exiv2) BuildRequires: pkgconfig(OpenEXR) BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(polkit-qt-1) +BuildRequires: pkgconfig(polkit-qt-1) BuildRequires: pkgconfig(libattica) BuildRequires: pkgconfig(libcanberra) BuildRequires: pkgconfig(libpulse) @@ -149,7 +154,7 @@ Core runtime for KDE 4. %package devel Summary: Developer files for %{name} Obsoletes: kdebase-runtime-devel < 4.7.97-10 -Provides: kdebase-runtime-devel = %{version}-%{release} +Provides: kdebase-runtime-devel = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description devel %{summary}. @@ -205,6 +210,7 @@ Requires: %{name} = %{version}-%{release} %patch51 -p1 -b .installdgbsymbols %patch52 -p1 -b .mouseeventlistener %patch53 -p1 -b .fullrelro +%patch54 -p1 -b .solid-device-automounter %patch100 -p1 -b .kglobalaccel %patch101 -p0 -b .kwalletd-new @@ -219,7 +225,7 @@ mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake_kde4} \ %{?no_webkit} \ - .. + .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -424,6 +430,20 @@ fi %changelog +* Thu Oct 05 2017 Jan Grulich - 4.10.5-10 +- Avoid duplicates in solid device automounter kcm + Resolves: bz#1084191 +- Enable automount overrides even when automatic mounting is disabled + Resolves: bz#1084497 + +* Wed Sep 06 2017 Jan Grulich - 4.10.5-8 - fix multilib issue @@ -541,7 +561,7 @@ fi - update webkit patch * Tue Oct 02 2012 Rex Dieter 4.9.2-2 -- kde-runtime-4.9.2 is missing kio_smb (#862169) +- kde-runtime-4.9.2 is missing kio_smb (#862169) * Fri Sep 28 2012 Rex Dieter - 4.9.2-1 - 4.9.2 @@ -720,7 +740,7 @@ fi - Nepomuk IndexCleaner throttling (kdebz#276593) * Tue Jun 28 2011 Rex Dieter 4.6.90-2 -- move oxygen-icons-theme dep (back) here from kdelibs +- move oxygen-icons-theme dep (back) here from kdelibs * Mon Jun 27 2011 Than Ngo - 4.6.90-1 - 4.6.90 (rc1) @@ -734,7 +754,7 @@ fi - upstream tarball is now kde-runtime * Thu Apr 28 2011 Rex Dieter - 4.6.3-1 -- 4.6.3 +- 4.6.3 * Wed Apr 06 2011 Than Ngo - 4.6.2-1 - 4.6.2 @@ -835,7 +855,7 @@ fi - 4.5 Beta 2 (4.4.85) - added remote widgets service and policy (from kdelibs) -* Mon May 31 2010 Rex Dieter - 4.4.80-2 +* Mon May 31 2010 Rex Dieter - 4.4.80-2 - rebuild (exiv2) * Fri May 21 2010 Jaroslav Reznik - 4.4.80-1