diff options
| -rw-r--r-- | ftp/kbear/Makefile | 5 | ||||
| -rw-r--r-- | ftp/kbear/distinfo | 2 | ||||
| -rw-r--r-- | ftp/kbear/files/patch-kbeardirlister.cpp | 90 | ||||
| -rw-r--r-- | ftp/kbear/files/patch-kbearsitemanager.cpp | 10 | ||||
| -rw-r--r-- | ftp/kbear/pkg-plist | 21 |
5 files changed, 24 insertions, 104 deletions
diff --git a/ftp/kbear/Makefile b/ftp/kbear/Makefile index b42b847d4b1b..f64a47881aeb 100644 --- a/ftp/kbear/Makefile +++ b/ftp/kbear/Makefile @@ -5,12 +5,11 @@ # $FreeBSD$ PORTNAME= kbear -PORTVERSION= 2.0.b.1 -PORTREVISION= 1 +PORTVERSION= 2.0.b.2 CATEGORIES= ftp kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -DISTNAME= ${PORTNAME}-2.0beta1.src +DISTNAME= ${PORTNAME}-2.0beta2.src MAINTAINER= freebsdports@arved.de diff --git a/ftp/kbear/distinfo b/ftp/kbear/distinfo index 2b74cedad79e..61e96aa12340 100644 --- a/ftp/kbear/distinfo +++ b/ftp/kbear/distinfo @@ -1 +1 @@ -MD5 (kbear-2.0beta1.src.tar.bz2) = e0f5e1ca17c10a95f7f9dd8dfca87cf9 +MD5 (kbear-2.0beta2.src.tar.bz2) = 8131badd6f38d131a1d5b6fd271822f8 diff --git a/ftp/kbear/files/patch-kbeardirlister.cpp b/ftp/kbear/files/patch-kbeardirlister.cpp deleted file mode 100644 index 121bc3c45bf5..000000000000 --- a/ftp/kbear/files/patch-kbeardirlister.cpp +++ /dev/null @@ -1,90 +0,0 @@ ---- kbear/parts/filesyspart/kbeardirlister.cpp Thu Jun 20 18:51:32 2002 -+++ kbear/parts/filesyspart/kbeardirlister.cpp Wed Jul 17 10:18:18 2002 -@@ -30,16 +30,17 @@ - #include <kdirlister.h> - #include <kapplication.h> - #include <kdirwatch.h> - #include <kconfig.h> - #include <kio/slave.h> - #include <kio/scheduler.h> - #include <kparts/part.h> - #include <kparts/componentfactory.h> -+#include <ktrader.h> - #include <kdebug.h> - ////////////////////////////////////////////////////////////////////// - // Application specific include files - #include "kbeardirlister.h" - #include "../../base/kbearlistjob.h" - #include "../../base/kbeardeletejob.h" - #include "../../base/kbearconnectionmanager.h" - -@@ -98,34 +99,40 @@ - } - //----------------------------------------------- - KParts::ReadOnlyPart* KBearDirLister::getPreviewPartInternal( const QString& mime ) { - kdDebug()<<"KBearDirLister::getPreviewPartInternal() mime in="<<mime<<endl; - // first we need to find out if user want ReadOnly, ReadWrite or want to be asked - QString oldGroup = kapp->config()->group(); - kapp->config()->setGroup("General"); - unsigned int viewMode = kapp->config()->readUnsignedNumEntry( "Preview Mode", 0 ); -+ - if( viewMode == 2 ) { // Ask - int ret = KMessageBox::questionYesNoCancel( 0L, i18n( "Do you want to open the file in read only mode or in read/write mode ?"), - i18n("Select view mode..."), KGuiItem(i18n("Read only")), KGuiItem(i18n("Read/write")) ); - if( ret == KMessageBox::Cancel ) - m_partViewer = (KParts::ReadOnlyPart*)1; - else if( ret == KMessageBox::No ) - viewMode = 1; // ReadWrite - } -+ -+ QObject* obj = 0L; - if( viewMode == 1 ) { // ReadWrite -- m_partViewer = KParts::ComponentFactory:: -- createPartInstanceFromQuery<KParts::ReadWritePart> -- ( mime, QString::null, m_partViewerWidget, "PreviewWidget", m_partViewerWidget, "PreviewPart" ); -- } -- if( ! m_partViewer ) { // ReadOnly -- m_partViewer = KParts::ComponentFactory:: -- createPartInstanceFromQuery<KParts::ReadOnlyPart> -- ( mime, QString::null, m_partViewerWidget, "PreviewWidget", m_partViewerWidget, "PreviewPart" ); -+ obj = KParts::ComponentFactory:: -+ createInstanceFromQuery<KParts::ReadWritePart> -+ ( mime, QString::null, m_partViewerWidget, "PreviewPart" ); -+ } -+ if( ! obj ) { // ReadOnly -+ obj = KParts::ComponentFactory:: -+ createInstanceFromQuery<KParts::ReadOnlyPart> -+ ( mime, QString::null, m_partViewerWidget, "PreviewPart" ); - } -+ if( obj ) -+ m_partViewer = dynamic_cast<KParts::ReadOnlyPart*>( obj ); -+ - kapp->config()->setGroup( oldGroup ); - return m_partViewer; - } - //----------------------------------------------- - KParts::ReadOnlyPart* KBearDirLister::getPreviewPart( const KURL& url, QWidget* parent ) { - kdDebug()<<"KBearDirLister::getPreviewPart url="<<url.prettyURL()<<endl; - m_previewURL = url; - m_mime = QString::null; -@@ -173,18 +180,18 @@ - KMessageBox::detailedError( 0L, list[1], list[2], list[0] ); - } - m_mime = "error"; - } - //----------------------------------------------- - void KBearDirLister::slotMimeType( KIO::Job*, const QString& mime ) { - kdDebug()<<"KBearDirLister::slotMimeType() mime="<<mime<<endl; - m_partViewer = getPreviewPartInternal( mime ); -- if( (int)m_partViewer > 1 ) { -- connectionManager->putOnHold( (unsigned long)this ); -+ if( m_partViewer && (int)m_partViewer > 1 ) { -+ connectionManager->putOnHold( (unsigned long)this ); - connect( m_slave, SIGNAL( infoMessage( const QString& ) ), - this, SIGNAL( infoMessage( const QString& ) ) ); - } - m_mime = mime; - } - //----------------------------------------------- - void KBearDirLister::slotDisconnectSlaveInfo() { - disconnect( m_slave, SIGNAL( infoMessage( const QString& ) ), diff --git a/ftp/kbear/files/patch-kbearsitemanager.cpp b/ftp/kbear/files/patch-kbearsitemanager.cpp deleted file mode 100644 index 39e991237251..000000000000 --- a/ftp/kbear/files/patch-kbearsitemanager.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- kbear/plugins/sitemanager/kbearsitemanager.cpp.orig Wed May 29 21:02:54 2002 -+++ kbear/plugins/sitemanager/kbearsitemanager.cpp Wed May 29 21:02:57 2002 -@@ -46,6 +46,7 @@ - #include "../../base/group.h" - #include "../../base/siteimportfilterpluginiface.h" - #include <netdb.h> -+#include <sys/param.h> - #include <netinet/in.h> - #include <string.h> - diff --git a/ftp/kbear/pkg-plist b/ftp/kbear/pkg-plist index 34a7de84b56e..82a5b77ef0eb 100644 --- a/ftp/kbear/pkg-plist +++ b/ftp/kbear/pkg-plist @@ -8,6 +8,7 @@ lib/kde3/kio_kbearftp.la lib/kde3/libkbeargftpimportfilter.la lib/kde3/libkbearncftpimportfilter.la lib/kde3/libkbearimportfilter.la +lib/kde3/libkbearkrusaderimportfilter.la lib/kde3/libkbearwsftpimportfilter.la lib/kde3/libkbearwincommanderimportfilter.la lib/kde3/libkbearsitemanager.la @@ -16,6 +17,7 @@ lib/kde3/kio_kbearftp.so lib/kde3/libkbeargftpimportfilter.so lib/kde3/libkbearncftpimportfilter.so lib/kde3/libkbearimportfilter.so +lib/kde3/libkbearkrusaderimportfilter.so lib/kde3/libkbearwsftpimportfilter.so lib/kde3/libkbearwincommanderimportfilter.so lib/kde3/libkbearsitemanager.so @@ -49,16 +51,33 @@ share/applnk/Internet/kbear.desktop share/doc/HTML/en/kbear/index.docbook share/doc/HTML/en/kbear/index.cache.bz2 share/doc/HTML/en/kbear/common +share/doc/HTML/en/kbear/index_en.pot +share/doc/HTML/en/kbear/index-shifted.docbook + +share/doc/HTML/es/kbear/index_es.po +share/doc/HTML/es/kbear/index.docbook +share/doc/HTML/es/kbear/index.cache.bz2 +share/doc/HTML/es/kbear/common +share/doc/HTML/fr/kbear/index.docbook +share/doc/HTML/fr/kbear/index_fr.po +share/doc/HTML/fr/kbear/index.cache.bz2 +share/doc/HTML/fr/kbear/common share/doc/HTML/sv/kbear/index.docbook share/doc/HTML/sv/kbear/index.cache.bz2 +share/doc/HTML/sv/kbear/index_sv.po share/doc/HTML/sv/kbear/common share/locale/sv/LC_MESSAGES/kbear.mo +share/locale/pt/LC_MESSAGES/kbear.mo +share/locale/fr/LC_MESSAGES/kbear.mo +share/locale/nl/LC_MESSAGES/kbear.mo +share/locale/cs/LC_MESSAGES/kbear.mo share/services/kbearftp.protocol share/apps/kbearsitemanager/kpartplugins/gftpimportfilterui.rc share/apps/kbearsitemanager/kpartplugins/ncftpimportfilterui.rc share/apps/kbearsitemanager/kpartplugins/kbearimportfilterui.rc share/apps/kbearsitemanager/kpartplugins/ws_ftpimportfilterui.rc share/apps/kbearsitemanager/kpartplugins/wincommanderimportfilterui.rc +share/apps/kbearsitemanager/kpartplugins/krusaderimportfilterui.rc share/apps/konqiconview/kpartplugins/kbearsitemanagerui.rc share/apps/konqlistview/kpartplugins/kbearsitemanagerui.rc @dirrm include/kbear @@ -73,4 +92,6 @@ share/apps/konqlistview/kpartplugins/kbearsitemanagerui.rc @dirrm share/apps/kbear/icons @dirrm share/apps/kbear @dirrm share/doc/HTML/en/kbear +@dirrm share/doc/HTML/es/kbear +@dirrm share/doc/HTML/fr/kbear @dirrm share/doc/HTML/sv/kbear |