Merge branch 'f17' into f16
This commit is contained in:
commit
2a663895f5
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,3 +1 @@
|
||||
/kdelibs-4.6.5.tar.bz2
|
||||
/kdelibs-4.8.3.tar.xz
|
||||
/kdelibs-4.8.4.tar.xz
|
||||
/kdelibs-4.8.5.tar.xz
|
||||
|
@ -1,13 +0,0 @@
|
||||
--- a/solid/solid/backends/udisks/udisksstorageaccess.cpp
|
||||
+++ a/solid/solid/backends/udisks/udisksstorageaccess.cpp
|
||||
@@ -172,7 +172,9 @@ void UDisksStorageAccess::slotDBusReply( const QDBusMessage & reply )
|
||||
m_teardownInProgress = false;
|
||||
m_device->broadcastActionDone("teardown");
|
||||
|
||||
- if (m_device->prop("DriveIsMediaEjectable").toBool() && !m_device->prop("DeviceIsOpticalDisc").toBool()) // optical drives have their Eject method
|
||||
+ if (m_device->prop("DriveIsMediaEjectable").toBool() &&
|
||||
+ m_device->prop("DeviceIsMediaAvailable").toBool() &&
|
||||
+ !m_device->prop("DeviceIsOpticalDisc").toBool()) // optical drives have their Eject method
|
||||
{
|
||||
QString devnode = m_device->prop("DeviceFile").toString();
|
||||
|
@ -1,15 +0,0 @@
|
||||
diff -up kdelibs-4.8.4/nepomuk/core/nepomukmainmodel.cpp.me kdelibs-4.8.4/nepomuk/core/nepomukmainmodel.cpp
|
||||
--- kdelibs-4.8.4/nepomuk/core/nepomukmainmodel.cpp.me 2012-06-14 13:10:17.239843879 +0200
|
||||
+++ kdelibs-4.8.4/nepomuk/core/nepomukmainmodel.cpp 2012-06-14 13:11:00.724779658 +0200
|
||||
@@ -94,10 +94,9 @@ public:
|
||||
|
||||
// we may get disconnected from the server but we don't want to try
|
||||
// to connect every time the model is requested
|
||||
- if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) {
|
||||
+ if ( !m_socketConnectFailed && !localSocketClient.isConnected() ) {
|
||||
delete localSocketModel;
|
||||
localSocketModel = 0;
|
||||
- localSocketClient.disconnect();
|
||||
QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" );
|
||||
kDebug() << "Connecting to local socket" << socketName;
|
||||
if ( localSocketClient.connect( socketName ) ) {
|
18
kdelibs.spec
18
kdelibs.spec
@ -24,8 +24,8 @@
|
||||
%global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
|
||||
|
||||
Summary: KDE Libraries
|
||||
Version: 4.8.4
|
||||
Release: 8%{?dist}
|
||||
Version: 4.8.5
|
||||
Release: 1%{?dist}
|
||||
|
||||
Name: kdelibs
|
||||
Epoch: 6
|
||||
@ -145,18 +145,9 @@ Patch53: kdelibs-4.7.2-kjs-s390.patch
|
||||
# return valid locale (RFC 1766)
|
||||
Patch54: kdelibs-4.8.4-kjs-locale.patch
|
||||
|
||||
# CD drive tray goes back in after 'Eject' when dolphin is running
|
||||
# http://bugs.kde.org/296657
|
||||
# http://bugzilla.redhat.com/811609
|
||||
Patch55: kdelibs-4.8-solid_cd_eject.patch
|
||||
|
||||
## upstream
|
||||
# fix kdeclarative install location (by wstephenson as found in kde-packager list)
|
||||
Patch100: kdelibs-4.8.3-kdeclarative-install-location.patch
|
||||
# bz#830178
|
||||
# http://commits.kde.org/kdelibs/76e0376d7582cfe5b898c56bf3779ca2279dace8
|
||||
# http://commits.kde.org/kdelibs/bde5aad1e9f7bfb6f8d5c60197797de4a315158d
|
||||
Patch101: kdelibs-4.8.4-nepomuk-regression.patch
|
||||
|
||||
## security fix
|
||||
# Not Upstreamed? why not ? -- Rex
|
||||
@ -365,11 +356,9 @@ popd
|
||||
%patch52 -p1 -b .SOLID_UPNP
|
||||
%patch53 -p1 -b .kjs-s390
|
||||
%patch54 -p1 -b .kjs-locale
|
||||
%patch55 -p1 -b .solid_cd_eject
|
||||
|
||||
# upstream patches
|
||||
%patch100 -p1 -b .kdeclarative-install-location
|
||||
%patch101 -p1 -b .nepomuk-regression
|
||||
|
||||
# security fixes
|
||||
%patch200 -p1 -b .CVE-2009-2702
|
||||
@ -625,6 +614,9 @@ rm -rf %{buildroot}
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Aug 02 2012 Rex Dieter <rdieter@fedoraproject.org> - 6:4.8.5-1
|
||||
- 4.8.5
|
||||
|
||||
* Fri Jul 13 2012 Rex Dieter <rdieter@fedoraproject.org> - 6:4.8.4-8
|
||||
- CD drive tray goes back in after 'Eject' when dolphin is running (kde#296657, #811609)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user