patch accepted by upstream; change it to the form they used

(Portage version: 2.0.51-r15)

2 files changed, 54 insertions, 86 deletions

diff --git a/kde-base/kicker/files/kicker-visibility.diff b/kde-base/kicker/files/kicker-visibility.diff
index ba25e3470e26..8f295409f19d 100644
--- a/kde-base/kicker/files/kicker-visibility.diff
+++ b/kde-base/kicker/files/kicker-visibility.diff
@@ -1,90 +1,58 @@
---- kicker/share/global.cpp.orig	2005-02-03 11:13:29.000000000 +0200
-+++ kicker/share/global.cpp	2005-02-05 18:33:56.110425712 +0200
-@@ -36,7 +36,7 @@
+Index: global.h
+===================================================================
+RCS file: /home/kde/kdebase/kicker/share/global.h,v
+retrieving revision 1.29
+retrieving revision 1.30
+diff -u -p -r1.29 -r1.30
+--- kicker/share/global.h	4 Feb 2005 14:56:46 -0000	1.29
++++ kicker/share/global.h	4 Feb 2005 15:23:59 -0000	1.30
+@@ -33,26 +33,26 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
  namespace KickerLib
  {
  
--KPanelExtension::Position directionToPosition(KPanelApplet::Direction d )
-+KDE_EXPORT KPanelExtension::Position directionToPosition(KPanelApplet::Direction d )
- {
-     switch (d)
-     {
-@@ -59,7 +59,7 @@
-     }
- }
- 
--KPanelExtension::Position directionToPopupPosition(KPanelApplet::Direction d)
-+KDE_EXPORT KPanelExtension::Position directionToPopupPosition(KPanelApplet::Direction d)
- {
-     switch (d)
-     {
-@@ -82,7 +82,7 @@
-     }
- }
- 
--KPanelApplet::Direction positionToDirection(KPanelExtension::Position p)
-+KDE_EXPORT KPanelApplet::Direction positionToDirection(KPanelExtension::Position p)
- {
-     switch (p)
-     {
-@@ -105,7 +105,7 @@
-     }
- }
- 
--int sizeValue(KPanelExtension::Size s)
-+KDE_EXPORT int sizeValue(KPanelExtension::Size s)
- {
-     switch (s)
-     {
-@@ -128,7 +128,7 @@
-     }
- }
- 
--QString newDesktopFile(const KURL& url)
-+KDE_EXPORT QString newDesktopFile(const KURL& url)
- {
-    QString base = url.fileName();
-    if (base.endsWith(".desktop"))
-@@ -151,7 +151,7 @@
-    return file;
- }
- 
--QString copyDesktopFile(const KURL& url)
-+KDE_EXPORT QString copyDesktopFile(const KURL& url)
- {
-    QString file = newDesktopFile(url);
-    KURL dest;
-@@ -160,7 +160,7 @@
-    return file;
- }
- 
--QPoint popupPosition(KPanelApplet::Direction d, const QWidget* popup, const QWidget* source)
-+KDE_EXPORT QPoint popupPosition(KPanelApplet::Direction d, const QWidget* popup, const QWidget* source)
- {
- 	if( !QApplication::reverseLayout() || d == KPanelApplet::Left || d == KPanelApplet::Right ) {
- 		return popupPosition( d, popup, source, QPoint( 0, 0 ) );
-@@ -169,7 +169,7 @@
- 	}
- }
- 
--QPoint popupPosition(KPanelApplet::Direction d, const QWidget* popup, const QWidget* source, const QPoint& p)
-+KDE_EXPORT QPoint popupPosition(KPanelApplet::Direction d, const QWidget* popup, const QWidget* source, const QPoint& p)
- {
- //	kdDebug(1210) << "popupPosition():" << endl;
- //	kdDebug(1210) << m->width() << ", " << m->height() << endl;
-@@ -210,7 +210,7 @@
- 	}
- }
- 
--void colorize(QImage& image)
-+KDE_EXPORT void colorize(QImage& image)
- {
-     // mercilessly ripped from the k menu side image colorizing
-     KConfig *config = KGlobal::config();
---- kicker/share/kickerSettings.kcfgc.orig	2005-02-05 18:33:19.000000000 +0200
-+++ kicker/share/kickerSettings.kcfgc	2005-02-05 18:33:28.352645536 +0200
-@@ -3,3 +3,4 @@
+-KPanelExtension::Position directionToPosition(KPanelApplet::Direction d);
+-KPanelExtension::Position directionToPopupPosition(KPanelApplet::Direction d);
+-KPanelApplet::Direction positionToDirection(KPanelExtension::Position p);
+-int sizeValue(KPanelExtension::Size s);
+-QString copyDesktopFile(const KURL&url);
+-QString newDesktopFile(const KURL&url);
++KDE_EXPORT KPanelExtension::Position directionToPosition(KPanelApplet::Direction d);
++KDE_EXPORT KPanelExtension::Position directionToPopupPosition(KPanelApplet::Direction d);
++KDE_EXPORT KPanelApplet::Direction positionToDirection(KPanelExtension::Position p);
++KDE_EXPORT int sizeValue(KPanelExtension::Size s);
++KDE_EXPORT QString copyDesktopFile(const KURL&url);
++KDE_EXPORT QString newDesktopFile(const KURL&url);
+ 
+ /**
+  * Calculate the appropriate position for a popup menu based on the
+  * direction, the size of the menu, the widget geometry, and a optional
+  * point in the local coordinates of the widget.
+  */
+-QPoint popupPosition(KPanelApplet::Direction d,
++KDE_EXPORT QPoint popupPosition(KPanelApplet::Direction d,
+                      const QWidget* popup,
+                      const QWidget* source);
+-QPoint popupPosition(KPanelApplet::Direction d,
++KDE_EXPORT QPoint popupPosition(KPanelApplet::Direction d,
+                      const QWidget* popup,
+                      const QWidget* source,
+                      const QPoint& p);
+-void colorize(QImage& image);
++KDE_EXPORT void colorize(QImage& image);
+ 
+ }
+ 
+Index: kickerSettings.kcfgc
+===================================================================
+RCS file: /home/kde/kdebase/kicker/share/kickerSettings.kcfgc,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -p -r1.2 -r1.3
+--- kicker/share/kickerSettings.kcfgc	3 Feb 2005 09:22:01 -0000	1.2
++++ kicker/share/kickerSettings.kcfgc	4 Feb 2005 15:23:59 -0000	1.3
+@@ -2,4 +2,5 @@ File=kickerSettings.kcfg
+ Singleton=true
  ClassName=KickerSettings
  Mutators=true
- IncludeFiles=qapplication.h
 +Visibility=KDE_EXPORT
+ IncludeFiles=qapplication.h
diff --git a/kde-base/kicker/kicker-3.4.0_beta2.ebuild b/kde-base/kicker/kicker-3.4.0_beta2.ebuild
index 9d113b5f2202..30f3bc4ef409 100644
--- a/kde-base/kicker/kicker-3.4.0_beta2.ebuild
+++ b/kde-base/kicker/kicker-3.4.0_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.4.0_beta2.ebuild,v 1.2 2005/02/05 16:41:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.4.0_beta2.ebuild,v 1.3 2005/02/06 05:33:10 danarmak Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -11,7 +11,7 @@ DESCRIPTION="KDE panel housing varous applets"
 KEYWORDS="~x86"
 IUSE=""
 PATCHES="$FILESDIR/applets-configure.in.in.diff
-$FILESDIR/kicker-visibility.diff" # submitted as bugs.kde.org 98628
+$FILESDIR/kicker-visibility.diff" # in upstream cvs, remove after beta2
 OLDDEPEND="~kde-base/libkonq-3.3.1"
 DEPEND="
 $(deprange $PV $MAXKDEVER kde-base/libkonq)"