rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

4.3.1

This commit is contained in:
Than Ngo 2009-08-28 14:14:08 +00:00
parent 73b4dbc867
commit c02354a80f
9 changed files with 7 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -1,2 +1,3 @@
kdelibs-4.2.98.tar.bz2
kdelibs-4.3.0.tar.bz2
kdelibs-4.3.1.tar.bz2

69
kdelibs-4.3.1-copyrename.patch
View File

@ -1,69 +0,0 @@
Index: kio/kio/kfileitem.cpp
===================================================================
--- kio/kio/kfileitem.cpp (revision 1012563)
+++ kio/kio/kfileitem.cpp (revision 1012564)
@@ -532,6 +532,9 @@
{
d->m_strName = name;
d->m_strText = KIO::decodeFileName( d->m_strName );
+ if (d->m_entry.contains(KIO::UDSEntry::UDS_NAME))
+ d->m_entry.insert(KIO::UDSEntry::UDS_NAME, d->m_strName); // #195385
+
}
QString KFileItem::linkDest() const
Index: kio/tests/kfileitemtest.cpp
===================================================================
--- kio/tests/kfileitemtest.cpp (revision 1012563)
+++ kio/tests/kfileitemtest.cpp (revision 1012564)
@@ -241,6 +241,21 @@
QVERIFY(fileItem.cmp(fileItem2));
}
+void KFileItemTest::testRename()
+{
+ KIO::UDSEntry entry;
+ const QString origName = QString::fromLatin1("foo");
+ entry.insert(KIO::UDSEntry::UDS_NAME, origName);
+ entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
+ KFileItem fileItem(entry, KUrl("/dir/foo"));
+ QCOMPARE(fileItem.name(), origName);
+ QCOMPARE(fileItem.text(), origName);
+ const QString newName = QString::fromLatin1("FiNeX_rocks");
+ fileItem.setName(newName);
+ QCOMPARE(fileItem.name(), newName);
+ QCOMPARE(fileItem.text(), newName);
+ QCOMPARE(fileItem.entry().stringValue(KIO::UDSEntry::UDS_NAME), newName); // #195385
+}
void KFileItemTest::testDecodeFileName_data()
{
Index: kio/tests/kdirmodeltest.cpp
===================================================================
--- kio/tests/kdirmodeltest.cpp (revision 1012563)
+++ kio/tests/kdirmodeltest.cpp (revision 1012564)
@@ -418,6 +418,12 @@
// check renaming happened
QCOMPARE( m_dirModel->itemForIndex( m_secondFileIndex ).url().url(), newUrl.url() );
+ // check that KDirLister::cachedItemForUrl won't give a bad name if copying that item (#195385)
+ KFileItem cachedItem = KDirLister::cachedItemForUrl(newUrl);
+ Q_ASSERT(!cachedItem.isNull());
+ QCOMPARE(cachedItem.name(), QString("toplevelfile_2_renamed"));
+ QCOMPARE(cachedItem.entry().stringValue(KIO::UDSEntry::UDS_NAME), QString("toplevelfile_2_renamed"));
+
// Put things back to normal
job = KIO::rename(newUrl, url, KIO::HideProgressInfo);
ok = job->exec();
Index: kio/tests/kfileitemtest.h
===================================================================
--- kio/tests/kfileitemtest.h (revision 1012563)
+++ kio/tests/kfileitemtest.h (revision 1012564)
@@ -35,6 +35,7 @@
void testHiddenFile();
void testMimeTypeOnDemand();
void testCmp();
+ void testRename();
void testDecodeFileName_data();
void testDecodeFileName();

13
kdelibs-4.3.1-copyurls.patch
View File

@ -1,13 +0,0 @@
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()));

20
kdelibs-4.3.1-kdebug#199557.patch
View File

@ -1,20 +0,0 @@
--- branches/KDE/4.3/kdelibs/kdecore/localization/kencodingdetector.cpp 2009/07/31 10:31:46 1005095
+++ branches/KDE/4.3/kdelibs/kdecore/localization/kencodingdetector.cpp 2009/07/31 10:33:05 1005096
@@ -889,7 +889,7 @@
const char *autoDetectedEncoding;
if ((c1 == 0xFE && c2 == 0xFF) || (c1 == 0xFF && c2 == 0xFE))
{
- autoDetectedEncoding = "ISO-10646-UCS-2";
+ autoDetectedEncoding = "UTF-16";
}
else if (c1 == 0xEF && c2 == 0xBB && c3 == 0xBF)
{
@@ -908,7 +908,7 @@
int nul_count_even = (c2 != 0) + (c4 != 0) + (c6 != 0) + (c8 != 0) + (c10 != 0);
int nul_count_odd = (c1 != 0) + (c3 != 0) + (c5 != 0) + (c7 != 0) + (c9 != 0);
if ((nul_count_even==0 && nul_count_odd==5) || (nul_count_even==5 && nul_count_odd==0))
- autoDetectedEncoding = "ISO-10646-UCS-2";
+ autoDetectedEncoding = "UTF-16";
else
autoDetectedEncoding = 0;
}

75
kdelibs-4.3.1-kdebug#202550.patch
View File

@ -1,75 +0,0 @@
--- branches/KDE/4.3/kdelibs/plasma/private/service_p.h 2009/08/02 18:26:50 1005966
+++ branches/KDE/4.3/kdelibs/plasma/private/service_p.h 2009/08/02 18:27:44 1005967
@@ -73,6 +73,7 @@
ServicePrivate(Service *service)
: q(service),
config(0),
+ dummyConfig(0),
tempFile(0)
{
}
@@ -80,6 +81,7 @@
~ServicePrivate()
{
delete config;
+ delete dummyConfig;
delete tempFile;
}
@@ -98,10 +100,25 @@
associatedGraphicsWidgets.remove(static_cast<QGraphicsWidget*>(obj));
}
+ KConfigGroup dummyGroup()
+ {
+ if (!dummyConfig) {
+ if (!tempFile) {
+ tempFile = new KTemporaryFile;
+ tempFile->open();
+ }
+
+ dummyConfig = new KConfig(tempFile->fileName());
+ }
+
+ return KConfigGroup(dummyConfig, "DummyGroup");
+ }
+
Service *q;
QString destination;
QString name;
ConfigLoader *config;
+ KConfig *dummyConfig;
KTemporaryFile *tempFile;
QMultiHash<QWidget *, QString> associatedWidgets;
QMultiHash<QGraphicsWidget *, QString> associatedGraphicsWidgets;
--- branches/KDE/4.3/kdelibs/plasma/service.cpp 2009/08/02 18:26:50 1005966
+++ branches/KDE/4.3/kdelibs/plasma/service.cpp 2009/08/02 18:27:44 1005967
@@ -116,7 +116,7 @@
{
if (!d->config) {
kDebug() << "No valid operations scheme has been registered";
- return KConfigGroup();
+ return d->dummyGroup();
}
d->config->writeConfig();
@@ -212,6 +212,9 @@
delete d->tempFile;
d->tempFile = 0;
+ delete d->dummyConfig;
+ d->dummyConfig = 0;
+
registerOperationsScheme();
}
@@ -258,6 +261,9 @@
delete d->config;
delete d->tempFile;
+ delete d->dummyConfig;
+ d->dummyConfig = 0;
+
//FIXME: make KSharedConfig and KConfigSkeleton not braindamaged in 4.2 and then get rid of the
// temp file object here
d->tempFile = new KTemporaryFile;

26
kdelibs-4.3.1-toolbarEditCrash.patch
View File

@ -1,26 +0,0 @@
Index: kdeui/actions/kstandardaction.cpp
===================================================================
--- kdeui/actions/kstandardaction.cpp (revision 1013099)
+++ kdeui/actions/kstandardaction.cpp (revision 1013100)
@@ -198,12 +198,15 @@
}
if (recvr && slot) {
- if (id != OpenRecent)
- QObject::connect(pAction, SIGNAL(triggered(bool)), recvr, slot);
- else
- // FIXME KAction port: probably a good idea to find a cleaner way to do this
- // Open Recent is a special case - provide the selected URL
- QObject::connect(pAction, SIGNAL(urlSelected(const KUrl &)), recvr, slot);
+ if (id == OpenRecent) {
+ // FIXME KAction port: probably a good idea to find a cleaner way to do this
+ // Open Recent is a special case - provide the selected URL
+ QObject::connect(pAction, SIGNAL(urlSelected(const KUrl &)), recvr, slot);
+ } else if (id == ConfigureToolbars) { // #200815
+ QObject::connect(pAction, SIGNAL(triggered(bool)), recvr, slot, Qt::QueuedConnection);
+ } else {
+ QObject::connect(pAction, SIGNAL(triggered(bool)), recvr, slot);
+ }
}
KActionCollection *collection = qobject_cast<KActionCollection *>(parent);

26
kdelibs-4.3.1-unmountfix.patch
View File

@ -1,26 +0,0 @@
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 * ) ) );

24
kdelibs.spec
View File

@ -3,8 +3,8 @@
%define strigi_ver 0.7
Summary: K Desktop Environment 4 - Libraries
Version: 4.3.0
Release: 8%{?dist}
Version: 4.3.1
Release: 1%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@ -83,17 +83,6 @@ Patch20: kdelibs-4.1.70-cmake.patch
# upstream
# 4.3 branch
# http://bugs.kde.org/202550
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
# http://bugs.kde.org/195385
Patch104: kdelibs-4.3.1-copyrename.patch
# http://bugs.kde.org/200815
Patch105: kdelibs-4.3.1-toolbarEditCrash.patch
Patch106: kdelibs-4.3.1-buildsys_phonon.patch
BuildRequires: qt4-devel >= 4.5.0
@ -230,12 +219,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
# upstream patches
# 4.3
%patch100 -p4 -b .kdebug#202550
%patch101 -p4 -b .kdebug#199557
%patch102 -p0 -b .unmountfix
%patch103 -p0 -b .copyurls
%patch104 -p0 -b .copyrename
%patch105 -p0 -b .toolbarEditCrash
%patch106 -p1 -b .buildsys_phonon
@ -419,6 +402,9 @@ rm -rf %{buildroot}
%changelog
* Fri Aug 28 2009 Than Ngo <than@redhat.com> - 4.3.1-1
- 4.3.1
* Wed Aug 26 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.0-8
- BR: xz-devel

2
sources
View File

@ -1 +1 @@
ea54f71bcbb0cf96bb6d94c019de8bb5 kdelibs-4.3.0.tar.bz2
df6b6d261d46508c7b0abcdd983ffae2 kdelibs-4.3.1.tar.bz2