diff options
author | Dan Armak <danarmak@gentoo.org> | 2005-02-05 16:41:14 +0000 |
---|---|---|
committer | Dan Armak <danarmak@gentoo.org> | 2005-02-05 16:41:14 +0000 |
commit | 0f74742cd796ae0520604c602c949b628106019d (patch) | |
tree | ad0a501034a897ca5308669b69e0d9c37943b0fe /kde-base/kicker | |
parent | ~alpha keyword, bug 78658. (diff) | |
download | gentoo-2-0f74742cd796ae0520604c602c949b628106019d.tar.gz gentoo-2-0f74742cd796ae0520604c602c949b628106019d.tar.bz2 gentoo-2-0f74742cd796ae0520604c602c949b628106019d.zip |
patch to fix compilation - adds missing KDE_EXPORT markers. submitted upstream as bugs.kde.org 98628.
(Portage version: 2.0.51-r15)
Diffstat (limited to 'kde-base/kicker')
-rw-r--r-- | kde-base/kicker/files/kicker-visibility.diff | 90 | ||||
-rw-r--r-- | kde-base/kicker/kicker-3.4.0_beta2.ebuild | 5 |
2 files changed, 93 insertions, 2 deletions
diff --git a/kde-base/kicker/files/kicker-visibility.diff b/kde-base/kicker/files/kicker-visibility.diff new file mode 100644 index 000000000000..ba25e3470e26 --- /dev/null +++ b/kde-base/kicker/files/kicker-visibility.diff @@ -0,0 +1,90 @@ +--- 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 @@ + 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 @@ + ClassName=KickerSettings + Mutators=true + IncludeFiles=qapplication.h ++Visibility=KDE_EXPORT diff --git a/kde-base/kicker/kicker-3.4.0_beta2.ebuild b/kde-base/kicker/kicker-3.4.0_beta2.ebuild index 6c24f66b865a..9d113b5f2202 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.1 2005/02/05 11:39:18 danarmak Exp $ +# $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 $ KMNAME=kdebase MAXKDEVER=$PV @@ -10,7 +10,8 @@ inherit kde-meta eutils DESCRIPTION="KDE panel housing varous applets" KEYWORDS="~x86" IUSE="" -PATCHES="$FILESDIR/applets-configure.in.in.diff" +PATCHES="$FILESDIR/applets-configure.in.in.diff +$FILESDIR/kicker-visibility.diff" # submitted as bugs.kde.org 98628 OLDDEPEND="~kde-base/libkonq-3.3.1" DEPEND=" $(deprange $PV $MAXKDEVER kde-base/libkonq)" |