nspluginviewer-qt31.diff.gz is apllied by default now, this fixes #10062

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 70d546f2fcb754744e86373ffe813f700f4f1e24..8fa99aa320566765c9778e75442ae739285062e7 100644 (file)
--- 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 <hannes@gentoo.org> 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 276792a2b238ec557c8954dd846e4863d4b4af5d..cfe6135d4eeabf3d291c67bb8944102bdd754a97 100644 (file)
--- 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`" ]