[PC-BSD Commits] r7147 - in pcbsd: current/build-files/ports-patches/x11/kdelibs4/files stable/build-files/ports-patches/x11/kdelibs4/files

[svn at pcbsd.org]

Author: kris
Date: 2010-07-09 07:18:46 -0700 (Fri, 09 Jul 2010)
New Revision: 7147

Modified:
   pcbsd/current/build-files/ports-patches/x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp
   pcbsd/stable/build-files/ports-patches/x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp
Log:

Updated kio patches from Tijl Coosemans



Modified: pcbsd/current/build-files/ports-patches/x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp
===================================================================
--- pcbsd/current/build-files/ports-patches/x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp	2010-07-09 14:10:56 UTC (rev 7146)
+++ pcbsd/current/build-files/ports-patches/x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp	2010-07-09 14:18:46 UTC (rev 7147)
@@ -16,7 +16,7 @@
  configure_file(kio/config-kdirwatch.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kio/config-kdirwatch.h )
  configure_file(kio/config-strigi.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kio/config-strigi.h )
 --- kio/kio/kdirwatch.cpp.orig	2010-02-26 19:30:10.000000000 +0100
-+++ kio/kio/kdirwatch.cpp	2010-06-24 14:46:54.000000000 +0200
++++ kio/kio/kdirwatch.cpp	2010-07-08 23:05:23.000000000 +0200
 @@ -91,12 +91,10 @@
    } else if (method == "QFSWatch") {
      return KDirWatchPrivate::QFSWatch;
@@ -33,8 +33,18 @@
  #endif
    }
  }
---- kio/kio/kdirwatch_p.h.orig	2010-06-24 15:21:37.000000000 +0200
-+++ kio/kio/kdirwatch_p.h	2010-06-24 15:21:58.000000000 +0200
+@@ -1595,8 +1593,7 @@
+   EntryMap::Iterator it;
+   it = m_mapEntries.find(path);
+   if(it != m_mapEntries.end()) {
+-    Entry entry = *it;  // deep copy to not point to uninialized data (can happen inside emitEvent() )
+-    Entry *e = &entry;
++    Entry *e = &(*it);
+     e->dirty = true;
+     int ev = scanEntry(e);
+     if (ev != NoChange)
+--- kio/kio/kdirwatch_p.h.orig  2010-06-24 15:21:37.000000000 +0200
++++ kio/kio/kdirwatch_p.h   2010-06-24 15:21:58.000000000 +0200
 @@ -102,7 +102,7 @@
    QHash<QString,QFileSystemWatcher*> m_paths;
  };

Modified: pcbsd/stable/build-files/ports-patches/x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp
===================================================================
--- pcbsd/stable/build-files/ports-patches/x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp	2010-07-09 14:10:56 UTC (rev 7146)
+++ pcbsd/stable/build-files/ports-patches/x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp	2010-07-09 14:18:46 UTC (rev 7147)
@@ -16,7 +16,7 @@
  configure_file(kio/config-kdirwatch.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kio/config-kdirwatch.h )
  configure_file(kio/config-strigi.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kio/config-strigi.h )
 --- kio/kio/kdirwatch.cpp.orig	2010-02-26 19:30:10.000000000 +0100
-+++ kio/kio/kdirwatch.cpp	2010-06-24 14:46:54.000000000 +0200
++++ kio/kio/kdirwatch.cpp	2010-07-08 23:05:23.000000000 +0200
 @@ -91,12 +91,10 @@
    } else if (method == "QFSWatch") {
      return KDirWatchPrivate::QFSWatch;
@@ -33,8 +33,18 @@
  #endif
    }
  }
---- kio/kio/kdirwatch_p.h.orig	2010-06-24 15:21:37.000000000 +0200
-+++ kio/kio/kdirwatch_p.h	2010-06-24 15:21:58.000000000 +0200
+@@ -1595,8 +1593,7 @@
+   EntryMap::Iterator it;
+   it = m_mapEntries.find(path);
+   if(it != m_mapEntries.end()) {
+-    Entry entry = *it;  // deep copy to not point to uninialized data (can happen inside emitEvent() )
+-    Entry *e = &entry;
++    Entry *e = &(*it);
+     e->dirty = true;
+     int ev = scanEntry(e);
+     if (ev != NoChange)
+--- kio/kio/kdirwatch_p.h.orig  2010-06-24 15:21:37.000000000 +0200
++++ kio/kio/kdirwatch_p.h   2010-06-24 15:21:58.000000000 +0200
 @@ -102,7 +102,7 @@
    QHash<QString,QFileSystemWatcher*> m_paths;
  };