From 5fe232da55d469fcf571761304018e0fc177036d Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Mon, 4 Nov 2002 19:21:25 +0000 Subject: [PATCH] nspluginviewer-qt31.diff.gz is apllied by default now, this fixes #10062 --- kde-base/kdebase/ChangeLog | 6 +++++- kde-base/kdebase/kdebase-3.0.4-r2.ebuild | 11 +++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index 70d546f2fcb7..8fa99aa32056 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,10 @@ # 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.28 2002/10/29 20:34:17 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.29 2002/11/04 19:21:25 hannes Exp $ + + 04 Nov 2002; Hannes Mehnert kdebase-3.0.4-r2.ebuild: + uses kdebase-3.0.4-nspluginviewer-qt31.diff.gz by default. This fixes + #10062 *kdebase-3.0.4-r1 (29 Oct 2002) diff --git a/kde-base/kdebase/kdebase-3.0.4-r2.ebuild b/kde-base/kdebase/kdebase-3.0.4-r2.ebuild index 276792a2b238..cfe6135d4eea 100644 --- a/kde-base/kdebase/kdebase-3.0.4-r2.ebuild +++ b/kde-base/kdebase/kdebase-3.0.4-r2.ebuild @@ -1,9 +1,9 @@ # 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.0.4-r2.ebuild,v 1.1 2002/10/31 22:40:27 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.0.4-r2.ebuild,v 1.2 2002/11/04 19:21:25 hannes Exp $ inherit kde-dist -IUSE="ldap pam motif encode oggvorbis cups ssl opengl samba qt31patch" +IUSE="ldap pam motif encode oggvorbis cups ssl opengl samba" DESCRIPTION="KDE $PV - base packages: the desktop, panel, window manager, konqueror..." @@ -61,10 +61,13 @@ src_unpack() { # Also note that kdebase 3.0.3 will compile just fine with all version of QT. # However kdebase 3.0.4 introduced an nspluginviewer fix that necessitates this # additional patch to work with qt 3.1. - if [ -n "`use qt31patch`" ]; then + + # is also needed for qt-3.0.5 (#10062), so i uncommented the use qt31patch. + + #if [ -n "`use qt31patch`" ]; then cd $S /bin/zcat "$FILESDIR/$P-nspluginviewer-qt31.diff.gz" | patch -p0 -- - fi + #fi # Apply this only if we are using a hacked Xft-1.1 Xft.h. if [ -n "`grep "End of Gentoo hack" /usr/X11R6/include/X11/Xft/Xft.h`" ] -- 2.26.2