rpms/kdelibs/F-10 kdelibs-4.3.1-copyurls.patch, NONE, 1.1 kdelibs-4.3.1-unmountfix.patch, NONE, 1.1 kdelibs.spec, 1.435, 1.436
Lukas Tinkl
ltinkl at fedoraproject.org
Mon Aug 17 12:18:19 UTC 2009
- Previous message: rpms/python-sippy/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 python-sippy.spec, 1.3, 1.4 sources, 1.2, 1.3
- Next message: rpms/kdelibs/F-11 kdelibs-4.3.1-copyurls.patch, NONE, 1.1 kdelibs-4.3.1-unmountfix.patch, NONE, 1.1 kdelibs.spec, 1.489, 1.490
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ltinkl
Update of /cvs/extras/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29945/F-10
Modified Files:
kdelibs.spec
Added Files:
kdelibs-4.3.1-copyurls.patch kdelibs-4.3.1-unmountfix.patch
Log Message:
backport the recent kdelibs fixes
kdelibs-4.3.1-copyurls.patch:
kurlbutton.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE kdelibs-4.3.1-copyurls.patch ---
Index: kfile/kurlbutton.cpp
===================================================================
--- kfile/kurlbutton.cpp (revision 1006184)
+++ kfile/kurlbutton.cpp (revision 1006185)
@@ -123,7 +123,7 @@
QAction* activatedAction = popup.exec(QCursor::pos());
if (activatedAction == copyAction) {
QMimeData* mimeData = new QMimeData();
- mimeData->setText(m_urlNavigator->url().prettyUrl());
+ mimeData->setText(m_urlNavigator->url().pathOrUrl());
clipboard->setMimeData(mimeData);
} else if (activatedAction == pasteAction) {
m_urlNavigator->setUrl(KUrl(clipboard->text()));
kdelibs-4.3.1-unmountfix.patch:
kio/kio/kautomount.cpp | 2 +-
kioslave/file/file.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE kdelibs-4.3.1-unmountfix.patch ---
Index: kioslave/file/file.cpp
===================================================================
--- kioslave/file/file.cpp (revision 1008903)
+++ kioslave/file/file.cpp (revision 1008904)
@@ -1146,7 +1146,7 @@
error( KIO::ERR_COULD_NOT_UNMOUNT, i18n("Could not find program \"umount\""));
return;
}
- buffer = umountProg + QFile::encodeName(KShell::quoteArg(_point)) + " 2>" + tmpFileName;
+ buffer = umountProg + ' ' + QFile::encodeName(KShell::quoteArg(_point)) + " 2>" + tmpFileName;
system( buffer.constData() );
#endif /* HAVE_VOLMGT */
Index: kio/kio/kautomount.cpp
===================================================================
--- kio/kio/kautomount.cpp (revision 1008897)
+++ kio/kio/kautomount.cpp (revision 1008898)
@@ -108,7 +108,7 @@
};
KAutoUnmount::KAutoUnmount( const QString & _mountpoint, const QString & _desktopFile )
- : d( new KAutoUnmountPrivate(this, _desktopFile, _mountpoint) )
+ : d( new KAutoUnmountPrivate(this, _mountpoint, _desktopFile) )
{
KIO::Job * job = KIO::unmount( d->m_mountpoint );
connect( job, SIGNAL( result( KJob * ) ), this, SLOT( slotResult( KJob * ) ) );
Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.435
retrieving revision 1.436
diff -u -p -r1.435 -r1.436
--- kdelibs.spec 5 Aug 2009 18:36:06 -0000 1.435
+++ kdelibs.spec 17 Aug 2009 12:18:19 -0000 1.436
@@ -4,7 +4,7 @@
Summary: K Desktop Environment 4 - Libraries
Version: 4.3.0
-Release: 2%{?dist}
+Release: 4%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@@ -87,6 +87,9 @@ Patch20: kdelibs-4.1.70-cmake.patch
Patch100: kdelibs-4.3.1-kdebug#202550.patch
# http://bugs.kde.org/199557
Patch101: kdelibs-4.3.1-kdebug#199557.patch
+Patch102: kdelibs-4.3.1-unmountfix.patch
+# http://bugs.kde.org/170608
+Patch103: kdelibs-4.3.1-copyurls.patch
BuildRequires: qt4-devel >= 4.5.0
# qt4%{_?_isa} isn't provided yet -- Rex
@@ -223,7 +226,8 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
# 4.3
%patch100 -p4 -b .kdebug#202550
%patch101 -p4 -b .kdebug#199557
-
+%patch102 -p0 -b .unmountfix
+%patch103 -p0 -b .copyurls
%build
@@ -405,6 +409,13 @@ rm -rf %{buildroot}
%changelog
+* Mon Aug 17 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.0-4
+- fix unmounting devices
+- fix copying URLs to clipboard (kdebug:170608)
+
+* Fri Aug 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-3
+- kde4.(sh|csh): drop KDE_IS_PRELINKED for now (workaround bug #515539)
+
* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
- microblog crashes plasma on show friends toggle (kdebug#202550)
- khtml crasher (kdebug#199557)
- Previous message: rpms/python-sippy/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 python-sippy.spec, 1.3, 1.4 sources, 1.2, 1.3
- Next message: rpms/kdelibs/F-11 kdelibs-4.3.1-copyurls.patch, NONE, 1.1 kdelibs-4.3.1-unmountfix.patch, NONE, 1.1 kdelibs.spec, 1.489, 1.490
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list