Added a patch to fix compilation with USE=kdeenablefinal, fixes bug 211027.

Package-Manager: portage-2.1.4.4

6 files changed, 127 insertions, 5 deletions

diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index 1d510a820cfb..4a1b6dc869f3 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdepim
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.302 2008/02/21 17:16:10 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.303 2008/02/25 09:43:47 ingmar Exp $
+
+  25 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  +files/korganizer-3.5.9-kdeenablefinal.patch, kdepim-3.5.9.ebuild:
+  Added a patch to fix compilation with USE=kdeenablefinal, fixes bug 211027.
 
   21 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
   +files/certmanager-3.5.9-fix-kdeenablefinal.patch, kdepim-3.5.9.ebuild:
diff --git a/kde-base/kdepim/files/korganizer-3.5.9-kdeenablefinal.patch b/kde-base/kdepim/files/korganizer-3.5.9-kdeenablefinal.patch
new file mode 100644
index 000000000000..6e5c372c4372
--- /dev/null
+++ b/kde-base/kdepim/files/korganizer-3.5.9-kdeenablefinal.patch
@@ -0,0 +1,53 @@
+--- branches/KDE/3.5/kdepim/kdgantt/KDGanttViewTaskItem.h	2008/02/24 13:29:26	778731
++++ branches/KDE/3.5/kdepim/kdgantt/KDGanttViewTaskItem.h	2008/02/24 13:32:04	778732
+@@ -60,8 +60,10 @@
+     void setStartTime( const QDateTime& start );
+     void setEndTime( const QDateTime& end );
+ 
+-private:
++protected:
+     void showItem( bool show = true, int coordY = 0 );
++
++private:
+     void initItem();
+     void hideMe();
+     QBrush myBrush, undefinedBrush;
+--- branches/KDE/3.5/kdepim/korganizer/kodaymatrix.cpp	2008/02/24 14:12:56	778743
++++ branches/KDE/3.5/kdepim/korganizer/kodaymatrix.cpp	2008/02/24 14:14:09	778744
+@@ -54,6 +54,7 @@
+ #include <qcursor.h>
+ #include <kpopupmenu.h>
+ #include <X11/Xlib.h>
++#undef FocusIn
+ #undef KeyPress
+ #undef None
+ #undef Status
+--- branches/KDE/3.5/kdepim/korganizer/timelineitem.cpp	2008/02/23 16:28:17	778447
++++ branches/KDE/3.5/kdepim/korganizer/timelineitem.cpp	2008/02/23 16:32:02	778448
+@@ -119,13 +119,13 @@
+     y = coordY;
+   else
+     y = getCoordY();
+-  int startX = myGanttView->myTimeHeader->getCoordX(myStartTime);
+-  int endX = myGanttView->myTimeHeader->getCoordX(myEndTime);
++  int startX = myGanttView->timeHeaderWidget()->getCoordX(myStartTime);
++  int endX = myGanttView->timeHeaderWidget()->getCoordX(myEndTime);
+ 
+   const int mw = QMAX( 1, QMIN( 4, endX - startX ) );
+   if ( !mLeft || mw != mMarkerWidth ) {
+     if ( !mLeft ) {
+-      mLeft = new KDCanvasPolygon( myGanttView->myTimeTable, this, Type_is_KDGanttViewItem );
++      mLeft = new KDCanvasPolygon( myGanttView->timeTableWidget(), this, Type_is_KDGanttViewItem );
+       mLeft->setBrush( Qt::black );
+     }
+     QPointArray a = QPointArray( 4 );
+@@ -137,7 +137,7 @@
+   }
+   if ( !mRight || mw != mMarkerWidth ) {
+     if ( !mRight ) {
+-      mRight = new KDCanvasPolygon( myGanttView->myTimeTable, this, Type_is_KDGanttViewItem );
++      mRight = new KDCanvasPolygon( myGanttView->timeTableWidget(), this, Type_is_KDGanttViewItem );
+       mRight->setBrush( Qt::black );
+     }
+     QPointArray a = QPointArray( 4 );
+
diff --git a/kde-base/kdepim/kdepim-3.5.9.ebuild b/kde-base/kdepim/kdepim-3.5.9.ebuild
index 7ef222b4c0a5..41c33a3f103a 100644
--- a/kde-base/kdepim/kdepim-3.5.9.ebuild
+++ b/kde-base/kdepim/kdepim-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.9.ebuild,v 1.2 2008/02/21 17:16:10 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.9.ebuild,v 1.3 2008/02/25 09:43:47 ingmar Exp $
 
 EAPI="1"
 inherit kde-dist
@@ -33,7 +33,8 @@ DEPEND="${DEPEND}
 	x11-proto/scrnsaverproto
 	x11-apps/xhost"
 
-PATCHES="${FILESDIR}/certmanager-${PV}-fix-kdeenablefinal.patch"
+PATCHES="${FILESDIR}/certmanager-${PV}-fix-kdeenablefinal.patch
+	${FILESDIR}/korganizer-${PV}-kdeenablefinal.patch"
 
 src_unpack() {
 	kde_src_unpack
diff --git a/kde-base/korganizer/ChangeLog b/kde-base/korganizer/ChangeLog
index a87a9a2f2b34..14beffe1977d 100644
--- a/kde-base/korganizer/ChangeLog
+++ b/kde-base/korganizer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/korganizer
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.89 2008/02/22 13:32:44 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.90 2008/02/25 09:42:02 ingmar Exp $
+
+  25 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  +files/korganizer-3.5.9-kdeenablefinal.patch, korganizer-3.5.9.ebuild:
+  Added a patch to fix compilation with USE=kdeenablefinal, fixes bug 211027.
 
   22 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> korganizer-3.5.8.ebuild,
   korganizer-3.5.9.ebuild:
diff --git a/kde-base/korganizer/files/korganizer-3.5.9-kdeenablefinal.patch b/kde-base/korganizer/files/korganizer-3.5.9-kdeenablefinal.patch
new file mode 100644
index 000000000000..6e5c372c4372
--- /dev/null
+++ b/kde-base/korganizer/files/korganizer-3.5.9-kdeenablefinal.patch
@@ -0,0 +1,53 @@
+--- branches/KDE/3.5/kdepim/kdgantt/KDGanttViewTaskItem.h	2008/02/24 13:29:26	778731
++++ branches/KDE/3.5/kdepim/kdgantt/KDGanttViewTaskItem.h	2008/02/24 13:32:04	778732
+@@ -60,8 +60,10 @@
+     void setStartTime( const QDateTime& start );
+     void setEndTime( const QDateTime& end );
+ 
+-private:
++protected:
+     void showItem( bool show = true, int coordY = 0 );
++
++private:
+     void initItem();
+     void hideMe();
+     QBrush myBrush, undefinedBrush;
+--- branches/KDE/3.5/kdepim/korganizer/kodaymatrix.cpp	2008/02/24 14:12:56	778743
++++ branches/KDE/3.5/kdepim/korganizer/kodaymatrix.cpp	2008/02/24 14:14:09	778744
+@@ -54,6 +54,7 @@
+ #include <qcursor.h>
+ #include <kpopupmenu.h>
+ #include <X11/Xlib.h>
++#undef FocusIn
+ #undef KeyPress
+ #undef None
+ #undef Status
+--- branches/KDE/3.5/kdepim/korganizer/timelineitem.cpp	2008/02/23 16:28:17	778447
++++ branches/KDE/3.5/kdepim/korganizer/timelineitem.cpp	2008/02/23 16:32:02	778448
+@@ -119,13 +119,13 @@
+     y = coordY;
+   else
+     y = getCoordY();
+-  int startX = myGanttView->myTimeHeader->getCoordX(myStartTime);
+-  int endX = myGanttView->myTimeHeader->getCoordX(myEndTime);
++  int startX = myGanttView->timeHeaderWidget()->getCoordX(myStartTime);
++  int endX = myGanttView->timeHeaderWidget()->getCoordX(myEndTime);
+ 
+   const int mw = QMAX( 1, QMIN( 4, endX - startX ) );
+   if ( !mLeft || mw != mMarkerWidth ) {
+     if ( !mLeft ) {
+-      mLeft = new KDCanvasPolygon( myGanttView->myTimeTable, this, Type_is_KDGanttViewItem );
++      mLeft = new KDCanvasPolygon( myGanttView->timeTableWidget(), this, Type_is_KDGanttViewItem );
+       mLeft->setBrush( Qt::black );
+     }
+     QPointArray a = QPointArray( 4 );
+@@ -137,7 +137,7 @@
+   }
+   if ( !mRight || mw != mMarkerWidth ) {
+     if ( !mRight ) {
+-      mRight = new KDCanvasPolygon( myGanttView->myTimeTable, this, Type_is_KDGanttViewItem );
++      mRight = new KDCanvasPolygon( myGanttView->timeTableWidget(), this, Type_is_KDGanttViewItem );
+       mRight->setBrush( Qt::black );
+     }
+     QPointArray a = QPointArray( 4 );
+
diff --git a/kde-base/korganizer/korganizer-3.5.9.ebuild b/kde-base/korganizer/korganizer-3.5.9.ebuild
index bf9a4d18da66..b813caf674ac 100644
--- a/kde-base/korganizer/korganizer-3.5.9.ebuild
+++ b/kde-base/korganizer/korganizer-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-3.5.9.ebuild,v 1.2 2008/02/22 13:32:44 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-3.5.9.ebuild,v 1.3 2008/02/25 09:42:02 ingmar Exp $
 
 KMNAME=kdepim
 EAPI="1"
@@ -55,9 +55,16 @@ KMEXTRA="
 	kdgantt
 	kontact/plugins/korganizer/" # We add here the kontact's plugin instead of compiling it with kontact because it needs a lot of korganizer deps.
 
+PATCHES="${FILESDIR}/${P}-kdeenablefinal.patch"
+
 src_unpack() {
 	kde-meta_src_unpack
 
 	# Broken test
 	sed -e "s:check_PROGRAMS = testalarmdlg:check_PROGRAMS =:" -i korganizer/korgac/Makefile.am || die "sed failed"
 }
+
+src_compile() {
+	filter-flags -fvisibility-inlines-hidden
+	kde_src_compile
+}