rpms/kdebase-runtime/F-12 kdebase-runtime-4.3.4-kde#202744.patch, 1.1, 1.2 kdebase-runtime.spec, 1.157, 1.158

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32464

Modified Files:
	kdebase-runtime-4.3.4-kde#202744.patch kdebase-runtime.spec 
Log Message:
rebase patch, adding #include <QtCore/QWeakPointer>


kdebase-runtime-4.3.4-kde#202744.patch:
 hardwaredatabase.cpp |   51 +++++++++++++++++----------------------------------
 1 file changed, 17 insertions(+), 34 deletions(-)

Index: kdebase-runtime-4.3.4-kde#202744.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-12/kdebase-runtime-4.3.4-kde#202744.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdebase-runtime-4.3.4-kde#202744.patch	21 Jan 2010 15:02:30 -0000	1.1
+++ kdebase-runtime-4.3.4-kde#202744.patch	21 Jan 2010 15:25:48 -0000	1.2
@@ -1,14 +1,16 @@
---- branches/KDE/4.4/kdebase/runtime/phonon/kded-module/hardwaredatabase.cpp	2010/01/06 22:46:33	1070858
-+++ branches/KDE/4.4/kdebase/runtime/phonon/kded-module/hardwaredatabase.cpp	2010/01/16 11:07:03	1075552
-@@ -35,7 +35,6 @@
+diff -up kdebase-runtime-4.3.4/phonon/kded-module/hardwaredatabase.cpp.kde#202744 kdebase-runtime-4.3.4/phonon/kded-module/hardwaredatabase.cpp
+--- kdebase-runtime-4.3.4/phonon/kded-module/hardwaredatabase.cpp.kde#202744	2009-01-01 10:25:19.000000000 -0600
++++ kdebase-runtime-4.3.4/phonon/kded-module/hardwaredatabase.cpp	2010-01-21 09:24:08.586544487 -0600
+@@ -35,7 +35,7 @@
  #include <QtCore/QFileInfo>
  #include <QtCore/QSet>
  #include <QtCore/QString>
 -#include <QtCore/QTimerEvent>
++#include <QtCore/QWeakPointer>
  
  static const char CACHE_MAGIC[] = "PHwdbC";
  static const quint32 CACHE_VERSION = 2;
-@@ -56,19 +55,15 @@
+@@ -56,19 +56,15 @@ class HardwareDatabasePrivate : public Q
  
          QCache<QString, Entry> entryCache;
  
@@ -30,7 +32,7 @@
  {
      const QString dbFileName = KStandardDirs::locate("data", QLatin1String("libphonon/hardwaredatabase"));
      if (dbFileName.isEmpty()) {
-@@ -85,13 +80,12 @@
+@@ -85,13 +81,12 @@ HardwareDatabasePrivate::HardwareDatabas
          createCache(dbFileName, cacheFileName);
      } else {
          m_cacheFile = new QFile(cacheFileName);
@@ -49,7 +51,7 @@
              createCache(dbFileName, cacheFileName);
          }
      }
-@@ -195,18 +189,17 @@
+@@ -195,18 +190,17 @@ Entry *HardwareDatabasePrivate::readEntr
  {
      QDataStream cacheStream;
      if (m_cacheFile) {
@@ -74,7 +76,7 @@
          if (!validCacheHeader(cacheStream)) {
              return 0;
          }
-@@ -215,14 +208,14 @@
+@@ -215,14 +209,14 @@ Entry *HardwareDatabasePrivate::readEntr
      quint32 hashTableBuckets;
      cacheStream >> hashTableOffset >> hashTableBuckets;
      const uint h = qHash(uniqueId);
@@ -91,7 +93,7 @@
      QList<BucketEntry> bucket;
      cacheStream >> bucket;
  
-@@ -234,7 +227,7 @@
+@@ -234,7 +228,7 @@ Entry *HardwareDatabasePrivate::readEntr
  
      foreach (const BucketEntry &entry, bucket) {
          if (entry.hash == h) {
@@ -100,7 +102,7 @@
              cacheStream >> readUdi;
              if (readUdi == uniqueId) {
                  cacheStream >> name >> iconName >> pref >> isAdvanced;
-@@ -248,17 +241,6 @@
+@@ -248,17 +242,6 @@ Entry *HardwareDatabasePrivate::readEntr
      return 0;
  }
  


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-12/kdebase-runtime.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -p -r1.157 -r1.158
--- kdebase-runtime.spec	21 Jan 2010 15:02:30 -0000	1.157
+++ kdebase-runtime.spec	21 Jan 2010 15:25:48 -0000	1.158
@@ -32,7 +32,7 @@ Patch6:        kdebase-runtime-4.3.3-hom
 Patch7:        kdebase-runtime-4.3.1-backend-globalconfig.patch
 
 ## Upstream patches
-## http://bugs.kde.org/202744
+## http://bugs.kde.org/202744, based on:
 ## http://websvn.kde.org/branches/KDE/4.4/kdebase/runtime/phonon/kded-module/hardwaredatabase.cpp?r1=1070858&r2=1075552&pathrev=1075552&view=patch
 Patch100: kdebase-runtime-4.3.4-kde#202744.patch
 
@@ -130,7 +130,7 @@ BuildArch: noarch
 #patch5 -p1 -b .manpath
 %patch6 -p1 -b .home_onlyshowin_kde
 
-%patch100 -p5 -b .kde#202744
+%patch100 -p1 -b .kde#202744
 
 
 %build