Remove unneeded patches.

Package-Manager: portage-2.1.2-r7

3 files changed, 6 insertions, 78 deletions

diff --git a/kde-base/libkdepim/ChangeLog b/kde-base/libkdepim/ChangeLog
index 015b062de44e..ac76874a487d 100644
--- a/kde-base/libkdepim/ChangeLog
+++ b/kde-base/libkdepim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/libkdepim
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.73 2007/02/04 03:11:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.74 2007/02/05 11:51:30 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/libkdepim-3.5.2-call_qt3_designer.diff,
+  -files/libkdepim-3.5.2-fixes.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -libkdepim-3.5.2-r1.ebuild:
diff --git a/kde-base/libkdepim/files/libkdepim-3.5.2-call_qt3_designer.diff b/kde-base/libkdepim/files/libkdepim-3.5.2-call_qt3_designer.diff
deleted file mode 100644
index f32ebe9c124b..000000000000
--- a/kde-base/libkdepim/files/libkdepim-3.5.2-call_qt3_designer.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- kdepim/libkdepim/kcmdesignerfields.cpp.orig	2006-05-07 04:05:20.000000000 +0200
-+++ kdepim/libkdepim/kcmdesignerfields.cpp	2006-05-07 04:06:33.000000000 +0200
-@@ -264,7 +264,7 @@
-   QVBoxLayout *layout = new QVBoxLayout( this, KDialog::marginHint(),
-                                          KDialog::spacingHint() );
- 
--  bool noDesigner = KStandardDirs::findExe("designer").isEmpty();
-+  bool noDesigner = KStandardDirs::findExe("/usr/qt/3/bin/designer").isEmpty();
- 
-   if ( noDesigner )
-   {
-@@ -407,7 +407,7 @@
- 
- void KCMDesignerFields::startDesigner()
- {
--  QString cmdLine = "designer";
-+  QString cmdLine = "/usr/qt/3/bin/designer";
- 
-   // check if path exists and create one if not.
-   QString cepPath = localUiDir();
diff --git a/kde-base/libkdepim/files/libkdepim-3.5.2-fixes.diff b/kde-base/libkdepim/files/libkdepim-3.5.2-fixes.diff
deleted file mode 100644
index 04fce865d08b..000000000000
--- a/kde-base/libkdepim/files/libkdepim-3.5.2-fixes.diff
+++ /dev/null
@@ -1,57 +0,0 @@
---- kdepim/libkdepim/kcmdesignerfields.cpp	2005/09/08 15:37:56	458580
-+++ kdepim/libkdepim/kcmdesignerfields.cpp	2006/04/15 12:39:26	530112
-@@ -99,8 +99,7 @@
-         }
- 
-         delete list;
--      } else
--        delete wdg;
-+      } 
-     }
- 
-     QString name() const { return mName; }
---- kdepim/libkdepim/kfoldertree.cpp	2005/07/26 18:54:59	438982
-+++ kdepim/libkdepim/kfoldertree.cpp	2006/04/15 12:39:26	530112
-@@ -225,9 +225,9 @@
- 
-     KListViewItem::paintCell( p, cg, column, width, align );
- 
--    int r = lv ? lv->itemMargin() : 1;
-     const QPixmap *icon = pixmap( column );
-     int marg = lv ? lv->itemMargin() : 1;
-+    int r = marg;
- 
-     QString t;
-     QRect br;
-@@ -238,7 +238,7 @@
-       p->setPen( ft->paintInfo().colFore );
- 
-     if ( icon ) {
--      r += icon->width() + lv->itemMargin();
-+      r += icon->width() + marg;
-     }
-     t = text( column );
-     if ( !t.isEmpty() )
---- kdepim/libkdepim/kscoringeditor.cpp	2006/03/24 15:55:54	522155
-+++ kdepim/libkdepim/kscoringeditor.cpp	2006/05/06 09:14:35	537923
-@@ -127,8 +127,8 @@
- 
- void SingleConditionWidget::toggleRegExpButton( int selected )
- {
--  bool isRegExp = KScoringExpression::MATCH == selected &&
--      KScoringExpression::MATCHCS == selected &&
-+  bool isRegExp = (KScoringExpression::MATCH == selected ||
-+      KScoringExpression::MATCHCS == selected) &&
-       !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
-   regExpButton->setEnabled( isRegExp );
- }
-@@ -248,7 +248,8 @@
-           w = new QLabel( stack ); // empty dummy
-           break;
-       }
--      stack->addWidget(w,index++);
-+      if ( w )
-+        stack->addWidget(w,index++);
-     }
-   }
-