diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-02-05 12:40:14 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-02-05 12:40:14 +0000 |
| commit | 811a7154483119ea9831d8fdfe78190d5f146f40 (patch) | |
| tree | 1769dd645f3ad12960ee724355664d952ee01460 /kde-base/konqueror | |
| parent | Stable on sparc wrt #165335 (diff) | |
| download | historical-811a7154483119ea9831d8fdfe78190d5f146f40.tar.gz historical-811a7154483119ea9831d8fdfe78190d5f146f40.tar.bz2 historical-811a7154483119ea9831d8fdfe78190d5f146f40.zip | |
Remove unneeded patches.
Package-Manager: portage-2.1.2-r7
Diffstat (limited to 'kde-base/konqueror')
| -rw-r--r-- | kde-base/konqueror/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/konqueror/files/kdebase-3.4.2-konqueror-filter.patch | 19 | ||||
| -rw-r--r-- | kde-base/konqueror/files/konqueror-3.5.4-clear-history.patch | 13 |
3 files changed, 6 insertions, 33 deletions
diff --git a/kde-base/konqueror/ChangeLog b/kde-base/konqueror/ChangeLog index f6355babaf0e..4e02c5ff662f 100644 --- a/kde-base/konqueror/ChangeLog +++ b/kde-base/konqueror/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/konqueror # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.74 2007/02/04 02:43:38 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.75 2007/02/05 12:36:13 flameeyes Exp $ + + 05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> + -files/kdebase-3.4.2-konqueror-filter.patch, + -files/konqueror-3.5.4-clear-history.patch: + Remove unneeded patches. 04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -konqueror-3.5.2.ebuild: diff --git a/kde-base/konqueror/files/kdebase-3.4.2-konqueror-filter.patch b/kde-base/konqueror/files/kdebase-3.4.2-konqueror-filter.patch deleted file mode 100644 index 9222e61f8f86..000000000000 --- a/kde-base/konqueror/files/kdebase-3.4.2-konqueror-filter.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- kdebase-3.4.2/konqueror/konq_mainwindow_old.cc 2005-08-05 17:29:06.000000000 -0400 -+++ kdebase-3.4.2/konqueror/konq_mainwindow.cc 2005-08-05 19:05:53.000000000 -0400 -@@ -39,6 +39,7 @@ - #include <kzip.h> - #include <config.h> - #include <pwd.h> -+#include <kio/netaccess.h> - // we define STRICT_ANSI to get rid of some warnings in glibc - #ifndef __STRICT_ANSI__ - #define __STRICT_ANSI__ -@@ -428,7 +429,7 @@ - QString fileName = path.mid( lastSlash + 1 ); - QString testPath = path.left( lastSlash + 1 ); - if ( ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 ) -- && ( !url.isLocalFile() || QFile::exists( testPath ) ) ) -+ && ( !url.isLocalFile() || QFile::exists( testPath ) ) && !KIO::NetAccess::exists( url, true ) ) - { - nameFilter = fileName; - url.setFileName( QString::null ); diff --git a/kde-base/konqueror/files/konqueror-3.5.4-clear-history.patch b/kde-base/konqueror/files/konqueror-3.5.4-clear-history.patch deleted file mode 100644 index 9e8a9d88b877..000000000000 --- a/kde-base/konqueror/files/konqueror-3.5.4-clear-history.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -U 4 -H -b -w -B -E -d -i -r konqueror-3.5.4-orig/konqueror/konq_combo.cc konqueror-3.5.4/konqueror/konq_combo.cc ---- konqueror-3.5.4-orig/konqueror/konq_combo.cc 2006-09-25 15:00:01.000000000 +0200 -+++ konqueror-3.5.4/konqueror/konq_combo.cc 2006-09-25 15:00:57.000000000 +0200 -@@ -121,8 +121,9 @@ - - // Make the lineedit consume the Key_Enter event... - setTrapReturnKey( true ); - -+ connect( KonqHistoryManager::kself(), SIGNAL(cleared()), SLOT(slotCleared()) ); - connect( this, SIGNAL(cleared() ), SLOT(slotCleared()) ); - connect( this, SIGNAL(highlighted( int )), SLOT(slotSetIcon( int )) ); - connect( this, SIGNAL(activated( const QString& )), - SLOT(slotActivated( const QString& )) ); |