diff options
| author |   Hannes Mehnert <hannes@gentoo.org> | 2003-02-06 16:44:44 +0000 |
|---|---|---|
| committer | Hannes Mehnert <hannes@gentoo.org> | 2003-02-06 16:44:44 +0000 |
| commit | 15c54cf61375b01d53bccddf9d4e41b62fe36392 (patch) | |
| tree | b6188bead9ebd3ffb85c95d4c1429764ca1ffc0c /kde-base/kdebase | |
| parent | Added linux-2.4.20.ebuild needed for hppa (diff) | |
| download | gentoo-2-15c54cf61375b01d53bccddf9d4e41b62fe36392.tar.gz gentoo-2-15c54cf61375b01d53bccddf9d4e41b62fe36392.tar.bz2 gentoo-2-15c54cf61375b01d53bccddf9d4e41b62fe36392.zip | |
added upstream fix for bug #15198
Diffstat (limited to 'kde-base/kdebase')
| -rw-r--r-- | kde-base/kdebase/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/kdebase/files/3.1-r1/kdebase-3.1-kpager.diff | 30 | ||||
| -rw-r--r-- | kde-base/kdebase/kdebase-3.1-r1.ebuild | 3 |
3 files changed, 36 insertions, 2 deletions
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index eaca2b0b49bd..7ceb8f761f46 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kdebase # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.57 2003/02/05 21:29:56 hannes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.58 2003/02/06 16:44:44 hannes Exp $ + + 06 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdebase-3.1-r1.ebuild: + added upstream patch for bug #15198 (kpager doesn't compile) 05 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdebase-3.1-r1.ebuild: changed dep on motif to virtual/motif (lesstif also works), changed dep diff --git a/kde-base/kdebase/files/3.1-r1/kdebase-3.1-kpager.diff b/kde-base/kdebase/files/3.1-r1/kdebase-3.1-kpager.diff new file mode 100644 index 000000000000..650d56bf34e2 --- /dev/null +++ b/kde-base/kdebase/files/3.1-r1/kdebase-3.1-kpager.diff @@ -0,0 +1,30 @@ +Index: kpager.cpp +=================================================================== +RCS file: /home/kde/kdebase/kpager/kpager.cpp,v +retrieving revision 1.48 +retrieving revision 1.49 +diff -u -r1.48 -r1.49 +--- kpager/kpager.cpp 21 Oct 2002 16:44:34 -0000 1.48 ++++ kpager/kpager.cpp 30 Jan 2003 04:00:47 -0000 1.49 +@@ -5,7 +5,7 @@ + Matthias Ettrich + Matthias Elter + +- $Id: kdebase-3.1-kpager.diff,v 1.1 2003/02/06 16:44:44 hannes Exp $ ++ $Id: kdebase-3.1-kpager.diff,v 1.1 2003/02/06 16:44:44 hannes Exp $ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -34,11 +34,8 @@ + * 2 = Every window is painted transparent (default) + * + */ +-#ifdef HAVE_CONFIG_H +-#include <config.h> +-#endif +- + ++#include "config.h" + #include "kpager.h" + + #include <qintdict.h> diff --git a/kde-base/kdebase/kdebase-3.1-r1.ebuild b/kde-base/kdebase/kdebase-3.1-r1.ebuild index 3aa0a3d9c773..1f217646e4a5 100644 --- a/kde-base/kdebase/kdebase-3.1-r1.ebuild +++ b/kde-base/kdebase/kdebase-3.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1-r1.ebuild,v 1.3 2003/02/05 21:29:56 hannes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1-r1.ebuild,v 1.4 2003/02/06 16:44:44 hannes Exp $ NEED_KDE_DONT_ADD_KDELIBS_DEP=1 # we're a special case, see below inherit kde-dist @@ -8,6 +8,7 @@ IUSE="ldap pam motif encode oggvorbis cups ssl opengl samba java" DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..." KEYWORDS="~x86 ~ppc" +PATCHES="${FILESDIR}/${PVR}/${P}-kpager.diff" newdepend ">=media-sound/cdparanoia-3.9.8 ldap? ( >=net-nds/openldap-1.2 ) |