* Thu Mar 25 2010 Rex Dieter <rdieter@fedoraproject.org> 6:4.4.1-9

- refresh kdelibs-4.4.2-kpixmapcache.patch

* Wed Mar 24 2010 Rex Dieter <rdieter@fedoraproject.org> 6:4.4.1-8
- Obsoletes: webkitkde (#576634)

kdelibs-4.4.2-kpixmapcache.patch

@@ -1,5 +1,5 @@
---- kdelibs/kdeui/util/kpixmapcache.cpp	2010/03/17 02:34:11	1104230
+--- branches/KDE/4.4/kdelibs/kdeui/util/kpixmapcache.cpp	2010/01/24 02:37:20	1079318
-+++ kdelibs/kdeui/util/kpixmapcache.cpp	2010/03/17 02:38:08	1104231
++++ branches/KDE/4.4/kdelibs/kdeui/util/kpixmapcache.cpp	2010/03/25 02:24:54	1107210
 @@ -40,6 +40,7 @@
  #include <kstandarddirs.h>
  #include <kdebug.h>
@@ -19,7 +19,7 @@
      if (key < fkey) {
          if (leftchild) {
              return binarySearchKey(stream, key, leftchild);
-@@ -660,12 +665,21 @@
+@@ -660,12 +665,23 @@
      //  exist yet and there are no entries. Otherwise, do a binary search
      //  starting from the root node.
      if (!stream.atEnd()) {
@@ -39,11 +39,12 @@
          // Load the found entry and check if it's the one we're looking for.
          device->seek(nodeoffset);
 -        QString fkey;
--        stream >> fkey;
+         stream >> fkey;
++
          if (fkey == key) {
              // Read offset and statistics
              qint32 foffset;
-@@ -814,7 +828,9 @@
+@@ -814,7 +830,9 @@
          QString fkey;
          stream.device()->seek(parentoffset);
          stream >> fkey;
@@ -54,7 +55,7 @@
              // We're overwriting an existing entry
              offset = parentoffset;
          }
-@@ -1195,16 +1211,14 @@
+@@ -1195,16 +1213,14 @@
          return false;
      }
  
@@ -75,7 +76,7 @@
      if (!indexfile.open(QIODevice::WriteOnly)) {
          kError() << "Couldn't create index file" << d->mIndexFile;
          return false;
-@@ -1212,7 +1226,7 @@
+@@ -1212,7 +1228,7 @@
  
      d->mCacheId = ::time(0);
      d->mTimestamp = ::time(0);
@@ -84,7 +85,7 @@
      // We can't know the full size until custom headers written.
      // mmapFiles() will take care of correcting the size.
      KPixmapCacheIndexHeader indexHeader = { {0}, KPIXMAPCACHE_VERSION, 0, d->mCacheId, d->mTimestamp };
-@@ -1221,7 +1235,7 @@
+@@ -1221,7 +1237,7 @@
      indexfile.write(reinterpret_cast<char*>(&indexHeader), sizeof indexHeader);
  
      // Create data file
@@ -93,7 +94,7 @@
      if (!datafile.open(QIODevice::WriteOnly)) {
          kError() << "Couldn't create data file" << d->mDataFile;
          return false;
-@@ -1243,40 +1257,54 @@
+@@ -1243,40 +1259,54 @@
      // Close the files and mmap them (if mmapping is used)
      indexfile.close();
      datafile.close();

kdelibs.spec

@@ -8,7 +8,7 @@
 
 Summary: KDE Libraries
 Version: 4.4.1
-Release: 7%{?dist}
+Release: 9%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -159,6 +159,10 @@ Provides: kross(qtscript) = %{version}-%{release}
 Provides: kdelibs-experimental = %{version}-%{release} 
 Obsoletes: kdelibs-experimental < 4.3.75 
 
+%if 0%{?fedora} && 0%{?fedora} < 13
+Obsoletes: webkitkde < 0.0.3
+%endif
+
 %description
 Libraries for KDE 4.
 
@@ -183,9 +187,11 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: kdelibs4-devel < %{version}-%{release}
 Provides:  kdelibs4-devel = %{version}-%{release}
 %{?_isa:Provides: kdelibs4-devel%{?_isa} = %{version}-%{release}}
-Obsoletes: kdelibs-experimental-devel < 4.3.75 
 Provides:  kdelibs-experimental-devel = %{version}-%{release}
+%if 0%{?fedora} && 0%{?fedora} < 13
+Obsoletes: kdelibs-experimental-devel < 4.3.75
 Obsoletes: webkitkde-devel < 0.0.3
+%endif
 Requires: attica-devel >= %{attica_ver} 
 Requires: automoc4 >= 0.9.88
 Requires: cmake >= 2.6.2-3
@@ -200,9 +206,6 @@ Requires: strigi-devel
 Requires: bzip2-devel gamin-devel libacl-devel
 %{?x_deps:Requires: %{x_deps}}
 
-Provides: kdelibs-experimental-devel = %{version}-%{release}
-Obsoletes: kdelibs-experimental-devel < %{version}-%{release}
-
 %description devel
 This package includes the header files you will need to compile
 applications for KDE 4.
@@ -238,7 +241,7 @@ format for easy browsing.
 %patch24 -p1 -b .drkonq
 %endif
 %patch27 -p1 -b .no_rpath
-%patch28 -p1 -b .kpixmapcache
+%patch28 -p4 -b .kpixmapcache
 
 # upstreamable patches
 
@@ -436,6 +439,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Mar 25 2010 Rex Dieter <rdieter@fedoraproject.org> 6:4.4.1-9
+- refresh kdelibs-4.4.2-kpixmapcache.patch
+
+* Wed Mar 24 2010 Rex Dieter <rdieter@fedoraproject.org> 6:4.4.1-8
+- Obsoletes: webkitkde (#576634)
+
 * Sat Mar 20 2010 Rex Dieter <rdieter@fedoraproject.org> 6:4.4.1-7
 - KDE default in noisy debug mode to stdout/stderr (kde#227089)
 - backport trunk/ fix building against qt-4.7