- up to 4.6.4

Changed files:
    kde4-kdelibs-aboutPLD.patch -> 1.21
    kde4-kdelibs-bug-187066.patch -> 1.2
    kde4-kdelibs.spec -> 1.249

diff --git a/kde4-kdelibs-aboutPLD.patch b/kde4-kdelibs-aboutPLD.patch
index 3d1d5713565d2c837a713a84fdb16128bce25b72..1412fcf496042907eef18fb4477e94c30fc0d9c6 100644 (file)
--- a/kde4-kdelibs-aboutPLD.patch
+++ b/kde4-kdelibs-aboutPLD.patch
@@ -4,7 +4,7 @@ diff -Nru kdelibs-4.5.5/CMakeLists.txt kdelibs-4.5.5.new//CMakeLists.txt
 @@ -14,6 +14,7 @@
  set (KDE_VERSION_RELEASE 5)
  set (KDE_VERSION "${KDE_VERSION_MAJOR}.${KDE_VERSION_MINOR}.${KDE_VERSION_RELEASE}" )
- set (KDE_VERSION_STRING "${KDE_VERSION} (4.6.3)")
+ set (KDE_VERSION_STRING "${KDE_VERSION} (4.6.4)")
 +exec_program ("/bin/cat" ARGS "/etc/pld-release" OUTPUT_VARIABLE PLD_VERSION_STRING)
  
  set (KDE_DISTRIBUTION_TEXT "compiled sources" CACHE STRING "Indicate the distribution in bug reports" )

diff --git a/kde4-kdelibs-bug-187066.patch b/kde4-kdelibs-bug-187066.patch
deleted file mode 100644 (file)
index cb7a497..0000000
--- a/kde4-kdelibs-bug-187066.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/kfile/kdiroperator.cpp b/kfile/kdiroperator.cpp
-index 8eb1819..4c93ac9 100644
---- a/kfile/kdiroperator.cpp
-+++ b/kfile/kdiroperator.cpp
-@@ -2526,7 +2526,7 @@ void KDirOperator::Private::_k_slotExpandToUrl(const QModelIndex &index)
-             const KUrl url = *it;
-             if (url.isParentOf(item.url())) {
-                 const KFileItem _item = dirLister->findByUrl(url);
--                if (_item.isDir()) {
-+                if (!_item.isNull() && _item.isDir()) {
-                     const QModelIndex _index = dirModel->indexForItem(_item);
-                     const QModelIndex _proxyIndex = proxyModel->mapFromSource(_index);
-                     treeView->expand(_proxyIndex);
-diff --git a/kfile/tests/kdiroperatortest.cpp b/kfile/tests/kdiroperatortest.cpp
-index 147aaaa..429fc30 100644
---- a/kfile/tests/kdiroperatortest.cpp
-+++ b/kfile/tests/kdiroperatortest.cpp
-@@ -67,6 +67,28 @@ private Q_SLOTS:
-         QVERIFY(qobject_cast<QTreeView*>(dirOp->view()));
-         delete dirOp;
-     }
-+
-+    /**
-+     * testBug187066 does the following:
-+     * 
-+     * 1. Open a KDirOperator in kdelibs/kfile
-+     * 2. Set the current item to "file:///"
-+     * 3. Set the current item to "file:///.../kdelibs/kfile/tests/kdiroperatortest.cpp"
-+     *
-+     * This may result in a crash, see https://bugs.kde.org/show_bug.cgi?id=187066
-+     */
-+    
-+    void testBug187066()
-+    {
-+        const KUrl kFileDirUrl(KUrl(KDESRCDIR).upUrl());
-+
-+        KDirOperator dirOp(kFileDirUrl);
-+        dirOp.setView(KFile::DetailTree);
-+        QTest::kWaitForSignal(dirOp.dirLister(), SIGNAL(completed()));
-+        dirOp.setCurrentItem("file:///");
-+        dirOp.setCurrentItem(KDESRCDIR "kdiroperatortest.cpp");
-+        QTest::kWaitForSignal(dirOp.dirLister(), SIGNAL(completed()));
-+    }
- };
- 
- QTEST_KDEMAIN( KDirOperatorTest, GUI )

diff --git a/kde4-kdelibs.spec b/kde4-kdelibs.spec
index 79c6bc3b01a7124e9de0437b24fe8edcec1e9c5f..37f343d50373c86891f64eb7e42eeb003cb8519f 100644 (file)
--- a/kde4-kdelibs.spec
+++ b/kde4-kdelibs.spec
@@ -16,12 +16,12 @@ Summary(pt_BR.UTF-8):       Bibliotecas de fundação do KDE
 Summary(ru.UTF-8):     K Desktop Environment - Библиотеки
 Summary(uk.UTF-8):     K Desktop Environment - Бібліотеки
 Name:          kde4-kdelibs
-Version:       4.6.3
-Release:       3
+Version:       4.6.4
+Release:       1
 License:       LGPL
 Group:         X11/Libraries
 Source0:       ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5: 923a7e8f89aa504647e14472b24b8c0a
+# Source0-md5: d38a8bf5b2002f9014727cec4395ba2a
 Source1:       %{name}-pld_box.png
 Patch100:      %{name}-branch.diff
 Patch0:                %{name}-branding.patch
@@ -29,7 +29,6 @@ Patch1:               %{name}-cacert.patch
 Patch2:                %{name}-findlzmafix.patch
 Patch3:                %{name}-aboutPLD.patch
 Patch4:                %{name}-trunk.patch
-Patch5:                %{name}-bug-187066.patch
 URL:           http://www.kde.org/
 BuildRequires: OpenEXR-devel >= 1.2.2
 BuildRequires: Qt3Support-devel >= %{qtver}
@@ -237,7 +236,6 @@ KDE.
 %patch2 -p0
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %if "%{pld_release}" == "ti"
 sed -i -e 's#PLDLINUX_VERSION#PLD/Titanium#g' kio/kio/kprotocolmanager.cpp