Remove unused patches.

(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

5 files changed, 8 insertions, 121 deletions

diff --git a/kde-base/nepomuk-core/ChangeLog b/kde-base/nepomuk-core/ChangeLog
index 7f1b73bec388..652f49ea93b8 100644
--- a/kde-base/nepomuk-core/ChangeLog
+++ b/kde-base/nepomuk-core/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/nepomuk-core
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk-core/ChangeLog,v 1.21 2013/01/05 20:19:11 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk-core/ChangeLog,v 1.22 2013/01/08 12:48:05 kensington Exp $
+
+  08 Jan 2013; Michael Palimaka <kensington@gentoo.org>
+  -files/nepomuk-core-4.9.1-gcc44.patch,
+  -files/nepomuk-core-4.9.2-build-fix-dirwatch-not-exists.patch,
+  -files/nepomuk-core-4.9.2-dirwatch-null.patch,
+  -files/nepomuk-core-4.9.2-kinotify-delete.patch:
+  Remove unused patches.
 
 *nepomuk-core-4.9.5 (05 Jan 2013)
 
diff --git a/kde-base/nepomuk-core/files/nepomuk-core-4.9.1-gcc44.patch b/kde-base/nepomuk-core/files/nepomuk-core-4.9.1-gcc44.patch
deleted file mode 100644
index faec792d1d35..000000000000
--- a/kde-base/nepomuk-core/files/nepomuk-core-4.9.1-gcc44.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit c910021ee37ff0356eddbc3df725f8f3f598d019
-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date:   Mon Sep 3 18:23:59 2012 -0300
-
-    Fix the build with gcc 4.2 and clang.
-    
-    The Nepomuk2 and Nepomuk2::Query namespaces are included, which causes some
-    ambiguity in the `query' argument of intiWatcherForQuery(), which can be
-    expanded as both Nepomuk2::Query::Query (from libnepomukcore/query/query.h)
-    or Nepomuk2::Query (from libnepomukcore/query/negationterm.h).
-    
-    Meanwhile, this was fixed in master by someone else who didn't fix the
-    KDE/4.9 branch (see eaeae8d).
-    
-    CCMAIL: nepomuk@kde.org
-
-diff --git a/services/queryservice/folder.cpp b/services/queryservice/folder.cpp
-index b7125cb..b4ab5c6 100644
---- a/services/queryservice/folder.cpp
-+++ b/services/queryservice/folder.cpp
-@@ -101,7 +101,7 @@ namespace {
-         }
-     }
- 
--    void intiWatcherForQuery(ResourceWatcher* watcher, const Query::Query& query) {
-+    void intiWatcherForQuery(ResourceWatcher* watcher, const Nepomuk2::Query::Query& query) {
-         // The empty property is for comparison terms which do not have a property
-         // in that case we want to monitor all properties
-         bool emptyProperty = false;
diff --git a/kde-base/nepomuk-core/files/nepomuk-core-4.9.2-build-fix-dirwatch-not-exists.patch b/kde-base/nepomuk-core/files/nepomuk-core-4.9.2-build-fix-dirwatch-not-exists.patch
deleted file mode 100644
index e9a2cbe82567..000000000000
--- a/kde-base/nepomuk-core/files/nepomuk-core-4.9.2-build-fix-dirwatch-not-exists.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit e462f9667a6e28de948d0341768167c5d96c0f7e
-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date:   Sun Oct 7 17:37:54 2012 +0300
-
-    Fix the build without KInotify again.
-    
-    CCMAIL: dvratil@redhat.com
-
-diff --git a/services/filewatch/nepomukfilewatch.cpp b/services/filewatch/nepomukfilewatch.cpp
-index 83045da..9ccf7b0 100644
---- a/services/filewatch/nepomukfilewatch.cpp
-+++ b/services/filewatch/nepomukfilewatch.cpp
-@@ -114,7 +114,9 @@ namespace {
- 
- Nepomuk2::FileWatch::FileWatch( QObject* parent, const QList<QVariant>& )
-     : Service( parent )
-+#ifdef BUILD_KINOTIFY
-     , m_dirWatch( 0 )
-+#endif
- {
-     // Create the configuration instance singleton (for thread-safety)
-     // ==============================================================
diff --git a/kde-base/nepomuk-core/files/nepomuk-core-4.9.2-dirwatch-null.patch b/kde-base/nepomuk-core/files/nepomuk-core-4.9.2-dirwatch-null.patch
deleted file mode 100644
index fb08140536bf..000000000000
--- a/kde-base/nepomuk-core/files/nepomuk-core-4.9.2-dirwatch-null.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-commit 32b44881dda4f243932c59c11bf39c91f30c224b
-Author: Dan Vrátil <dvratil@redhat.com>
-Date:   Wed Oct 3 13:27:22 2012 +0200
-
-    Add null-crash guards for m_dirWatch to FileWatch
-    
-    BUG: 307388
-
-diff --git a/services/filewatch/nepomukfilewatch.cpp b/services/filewatch/nepomukfilewatch.cpp
-index 94db504..83045da 100644
---- a/services/filewatch/nepomukfilewatch.cpp
-+++ b/services/filewatch/nepomukfilewatch.cpp
-@@ -114,6 +114,7 @@ namespace {
- 
- Nepomuk2::FileWatch::FileWatch( QObject* parent, const QList<QVariant>& )
-     : Service( parent )
-+    , m_dirWatch( 0 )
- {
-     // Create the configuration instance singleton (for thread-safety)
-     // ==============================================================
-@@ -324,8 +325,10 @@ void Nepomuk2::FileWatch::slotInotifyWatchUserLimitReached()
- {
-     // we do it the brutal way for now hoping with new kernels and defaults this will never happen
-     // Delete the KInotify and switch to KDirNotify dbus signals
--    m_dirWatch->deleteLater();
--    m_dirWatch = 0;
-+    if( m_dirWatch ) {
-+        m_dirWatch->deleteLater();
-+        m_dirWatch = 0;
-+    }
-     connectToKDirWatch();
- }
- #endif
-@@ -413,7 +416,9 @@ void Nepomuk2::FileWatch::slotDeviceMounted(const Nepomuk2::RemovableMediaCache:
- void Nepomuk2::FileWatch::slotDeviceTeardownRequested(const Nepomuk2::RemovableMediaCache::Entry* entry )
- {
- #ifdef BUILD_KINOTIFY
--    m_dirWatch->removeWatch( entry->mountPath() );
-+    if( m_dirWatch ) {
-+        m_dirWatch->removeWatch( entry->mountPath() );
-+    }
- #endif
- }
- 
diff --git a/kde-base/nepomuk-core/files/nepomuk-core-4.9.2-kinotify-delete.patch b/kde-base/nepomuk-core/files/nepomuk-core-4.9.2-kinotify-delete.patch
deleted file mode 100644
index a683c133b336..000000000000
--- a/kde-base/nepomuk-core/files/nepomuk-core-4.9.2-kinotify-delete.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 804e54f83ade8a377d392d350981ead07f60a9d3
-Author: David Faure <faure@kde.org>
-Date:   Tue Oct 2 20:27:03 2012 +0200
-
-    Fix crash when watchUserLimitReached() leads to deleting the KInotify instance
-    
-    ... which emitted the signal. So don't use a direct delete.
-    
-    BUG: 307388
-    FIXED-IN: 4.9.3
-
-diff --git a/services/filewatch/nepomukfilewatch.cpp b/services/filewatch/nepomukfilewatch.cpp
-index 9fd5d9c..94db504 100644
---- a/services/filewatch/nepomukfilewatch.cpp
-+++ b/services/filewatch/nepomukfilewatch.cpp
-@@ -323,7 +323,8 @@ void Nepomuk2::FileWatch::connectToKDirWatch()
- void Nepomuk2::FileWatch::slotInotifyWatchUserLimitReached()
- {
-     // we do it the brutal way for now hoping with new kernels and defaults this will never happen
--    delete m_dirWatch;
-+    // Delete the KInotify and switch to KDirNotify dbus signals
-+    m_dirWatch->deleteLater();
-     m_dirWatch = 0;
-     connectToKDirWatch();
- }