diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2003-09-28 17:46:26 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2003-09-28 17:46:26 +0000 |
| commit | 2a07a045a7884e03f058f363fa3c18ccd9497685 (patch) | |
| tree | e96926623448793aa0fb73cdb36a1b009bd97206 /kde-base/kdebase | |
| parent | amd64 compilation patch (diff) | |
| download | historical-2a07a045a7884e03f058f363fa3c18ccd9497685.tar.gz historical-2a07a045a7884e03f058f363fa3c18ccd9497685.tar.bz2 historical-2a07a045a7884e03f058f363fa3c18ccd9497685.zip | |
patch to fix a crash
Diffstat (limited to 'kde-base/kdebase')
| -rw-r--r-- | kde-base/kdebase/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kdebase/Manifest | 5 | ||||
| -rw-r--r-- | kde-base/kdebase/files/konq-crash-patch.diff | 35 | ||||
| -rw-r--r-- | kde-base/kdebase/kdebase-3.1.4.ebuild | 3 |
4 files changed, 45 insertions, 4 deletions
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index dc6689500c1e..e4c7132d7f5d 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdebase # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.91 2003/09/27 17:36:29 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.92 2003/09/28 17:46:23 caleb Exp $ + + 28 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.1.4.ebuild, + files/konq-crash-patch.diff: + patch from kde bug database to fix a konq crash 27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdebase-2.2.2-r5.ebuild, kdebase-2.2.2-r5.ebuild, kdebase-3.1.1a.ebuild, kdebase-3.1.1a.ebuild, diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest index 47d9327d801c..9403482f9826 100644 --- a/kde-base/kdebase/Manifest +++ b/kde-base/kdebase/Manifest @@ -1,13 +1,14 @@ MD5 84d91eead31fcf756ae37c745232e88d kdebase-3.1.2.ebuild 3791 MD5 46d2f98f4ec0ac0a50357b3ab351b8dc kdebase-3.0.5b.ebuild 7925 -MD5 4a590674ca453c7440a8e6f3a2598eca kdebase-3.1.4.ebuild 3959 +MD5 6a4c4c74ad47f1ef8c68cdff15d3deeb kdebase-3.1.4.ebuild 4001 MD5 4c5f1af579421648a9bc8f7bc0b3e5f8 kdebase-3.0.4-r3.ebuild 4486 MD5 c5e47769d4235122e0d731ae7639cd64 kdebase-3.2.0_alpha2.ebuild 3236 -MD5 1617468be0afb6253915c3101903eafd ChangeLog 16108 +MD5 3c1bd93af441f1c3b14d10bc189cdc2f ChangeLog 16259 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161 MD5 c07ead342cf5e19907a9ba978d713d80 files/digest-kdebase-3.0.5b 69 MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405 MD5 f6156166c554420f1684f00d488f674a files/focus-patch.diff 542 +MD5 a9b5cb78455790de6a267f7d9ec46b63 files/konq-crash-patch.diff 1106 MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/kscreensaver.pam 79 MD5 4b4d530bf8e05f89991d2161242da3f2 files/digest-kdebase-3.0.4-r3 68 MD5 11389fa15ff0492536b0b153a0b11ff1 files/digest-kdebase-3.2.0_alpha2 69 diff --git a/kde-base/kdebase/files/konq-crash-patch.diff b/kde-base/kdebase/files/konq-crash-patch.diff new file mode 100644 index 000000000000..a609fccc2103 --- /dev/null +++ b/kde-base/kdebase/files/konq-crash-patch.diff @@ -0,0 +1,35 @@ +--- konqueror/konq_mainwindow.cc 28 Jul 2003 23:36:04 -0000 1.1083.2.33 ++++ konqueror/konq_mainwindow.cc 8 Aug 2003 20:47:07 -0000 +@@ -419,20 +419,25 @@ + } + + KonqView *view = _view; +- if ( !view && !req.newTab) +- view = m_currentView; /* Note, this can be 0L, e.g. on startup */ +- else if ( !view && req.newTab ) { ++ if ( !view && req.newTab ) { + view = m_pViewManager->addTab(QString::null, + QString::null, + false + ); +- view->frame()->setTitle( _url.host() , 0L); ++ if( view ){ ++ view->frame()->setTitle( _url.host() , 0L); + +- if ( req.newTabInFront ) +- m_pViewManager->showTab( view ); ++ if ( req.newTabInFront ) ++ m_pViewManager->showTab( view ); + +- updateViewActions(); ++ updateViewActions(); ++ }else{//It appears that the view profile does not support tabs. ++ req.newTab=false; ++ } ++ + } ++ if ( !view && !req.newTab) ++ view = m_currentView; /* Note, this can be 0L, e.g. on startup */ + + if ( view ) + { diff --git a/kde-base/kdebase/kdebase-3.1.4.ebuild b/kde-base/kdebase/kdebase-3.1.4.ebuild index edcffff7a6fb..cd238eae90dd 100644 --- a/kde-base/kdebase/kdebase-3.1.4.ebuild +++ b/kde-base/kdebase/kdebase-3.1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 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.4.ebuild,v 1.5 2003/09/26 21:22:55 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1.4.ebuild,v 1.6 2003/09/28 17:46:23 caleb Exp $ inherit kde-dist eutils IUSE="ldap pam motif encode oggvorbis cups ssl opengl samba java" @@ -43,6 +43,7 @@ PATCHES="" src_unpack() { kde_src_unpack epatch ${FILESDIR}/focus-patch.diff + epatch ${FILESDIR}/konq-crash-patch.diff #cd ${S} && aclocal } |