Some more upstream patches from Carlo

(Portage version: 2.1_pre10-r5)

5 files changed, 107 insertions, 1 deletions

diff --git a/kde-base/libkdepim/ChangeLog b/kde-base/libkdepim/ChangeLog
index 02363fe05b94..ee58384555c4 100644
--- a/kde-base/libkdepim/ChangeLog
+++ b/kde-base/libkdepim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/libkdepim
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.45 2006/05/05 15:01:41 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.46 2006/05/12 12:18:21 caleb Exp $
+
+  12 May 2006; Caleb Tennis <caleb@gentoo.org>
+  +files/libkdepim-3.5.2-call_qt3_designer.diff,
+  +files/libkdepim-3.5.2-fixes.diff, +libkdepim-3.5.2-r1.ebuild:
+  Some more upstream patches from Carlo
 
   05 May 2006; Carsten Lohrke <carlo@gentoo.org> -libkdepim-3.5.2-r1.ebuild:
   Removing the ebuild again as it creates problems for users. We may add new
diff --git a/kde-base/libkdepim/files/digest-libkdepim-3.5.2-r1 b/kde-base/libkdepim/files/digest-libkdepim-3.5.2-r1
new file mode 100644
index 000000000000..614bd87074cf
--- /dev/null
+++ b/kde-base/libkdepim/files/digest-libkdepim-3.5.2-r1
@@ -0,0 +1,3 @@
+MD5 ac6b3b503e27a65a7b883c1e0a57262e kdepim-3.5.2.tar.bz2 12887336
+RMD160 8e6571d14bbf6b3370c4fdb108a1a79625e87365 kdepim-3.5.2.tar.bz2 12887336
+SHA256 9c038a80912894b3ec132b2c7219ec5549ca80dcdeec88555928d2e038966539 kdepim-3.5.2.tar.bz2 12887336
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
new file mode 100644
index 000000000000..f32ebe9c124b
--- /dev/null
+++ b/kde-base/libkdepim/files/libkdepim-3.5.2-call_qt3_designer.diff
@@ -0,0 +1,20 @@
+--- 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
new file mode 100644
index 000000000000..04fce865d08b
--- /dev/null
+++ b/kde-base/libkdepim/files/libkdepim-3.5.2-fixes.diff
@@ -0,0 +1,57 @@
+--- 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++);
+     }
+   }
+ 
diff --git a/kde-base/libkdepim/libkdepim-3.5.2-r1.ebuild b/kde-base/libkdepim/libkdepim-3.5.2-r1.ebuild
new file mode 100644
index 000000000000..eaf8db0278a0
--- /dev/null
+++ b/kde-base/libkdepim/libkdepim-3.5.2-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-3.5.2-r1.ebuild,v 1.3 2006/05/12 12:18:21 caleb Exp $
+
+KMNAME=kdepim
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="common library for KDE PIM apps"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="
+$(deprange $PV $MAXKDEVER kde-base/libkcal)"
+
+KMCOPYLIB="libkcal libkcal"
+KMEXTRA="libemailfunctions/"
+
+PATCHES="${FILESDIR}/libkdepim-3.5.2-call_qt3_designer.diff
+	${FILESDIR}/libkdepim-3.5.2-fixes.diff"