diff options
author | joerg <joerg@pkgsrc.org> | 2012-12-22 02:31:33 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2012-12-22 02:31:33 +0000 |
commit | 6c1387f4c8f26ba371269563959f4da2619c079c (patch) | |
tree | 43ffd28d26da8235dde5cd9fc835e7ccf1c0d5d0 /sysutils | |
parent | 97555ab0833fb87e9ca91db3178f06cf7cf443bf (diff) | |
download | pkgsrc-6c1387f4c8f26ba371269563959f4da2619c079c.tar.gz |
Fix template look up. Fix function pointer declaration. Don't compare
enums and strings. Bump revision.
Diffstat (limited to 'sysutils')
8 files changed, 114 insertions, 3 deletions
diff --git a/sysutils/krusader/Makefile b/sysutils/krusader/Makefile index 1e56d14c755..2a576662b91 100644 --- a/sysutils/krusader/Makefile +++ b/sysutils/krusader/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.43 2012/12/16 01:52:35 obache Exp $ +# $NetBSD: Makefile,v 1.44 2012/12/22 02:31:33 joerg Exp $ # DISTNAME= krusader-1.90.0 -PKGREVISION= 18 +PKGREVISION= 19 CATEGORIES= kde sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=krusader/} diff --git a/sysutils/krusader/distinfo b/sysutils/krusader/distinfo index c334d35fbdb..0277d799b36 100644 --- a/sysutils/krusader/distinfo +++ b/sysutils/krusader/distinfo @@ -1,5 +1,11 @@ -$NetBSD: distinfo,v 1.8 2008/10/15 08:21:23 markd Exp $ +$NetBSD: distinfo,v 1.9 2012/12/22 02:31:33 joerg Exp $ SHA1 (krusader-1.90.0.tar.gz) = 96b490d27a55e9502a427764284f56135c5ae617 RMD160 (krusader-1.90.0.tar.gz) = 9e6b089f2baf02be1108f07bfa85c214c175419a Size (krusader-1.90.0.tar.gz) = 4784153 bytes +SHA1 (patch-krusader_Dialogs_checksumdlg.cpp) = d4c5bbdbfb3b1a43f048ee965e5056a08645a632 +SHA1 (patch-krusader_Konfigurator_kgstartup.cpp) = f7fec960e9c21744c0eb34efba5aa49fb5aab6ca +SHA1 (patch-krusader_Panel_krview.h) = 0425ea8c9b17e718f9a7885d84a59afe066a42ab +SHA1 (patch-krusader_UserAction_tstring.h) = 17bd2a46ba04db42c119ac766422e35971d9f9de +SHA1 (patch-krusader_VFS_temp__vfs.cpp) = 7bbec468aa064b609be324361b3e8cf1e88cb090 +SHA1 (patch-krusader_VFS_temp__vfs.h) = d9b2fbf8797cbbc8f9b42d7d0438030f5c86f6d8 diff --git a/sysutils/krusader/patches/patch-krusader_Dialogs_checksumdlg.cpp b/sysutils/krusader/patches/patch-krusader_Dialogs_checksumdlg.cpp new file mode 100644 index 00000000000..c53519a7b7a --- /dev/null +++ b/sysutils/krusader/patches/patch-krusader_Dialogs_checksumdlg.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-krusader_Dialogs_checksumdlg.cpp,v 1.1 2012/12/22 02:31:33 joerg Exp $ + +--- krusader/Dialogs/checksumdlg.cpp.orig 2012-12-22 01:03:14.000000000 +0000 ++++ krusader/Dialogs/checksumdlg.cpp +@@ -26,7 +26,7 @@ + class CS_Tool; // forward + typedef void PREPARE_PROC_FUNC(KProcess& proc, CS_Tool *self, const QStringList& files, + const QString checksumFile, bool recursive, const QString& stdoutFileName, +- const QString& stderrFileName, const QString& type=QString::null); ++ const QString& stderrFileName, const QString& type); + typedef QStringList GET_FAILED_FUNC(const QStringList& stdOut, const QStringList& stdErr); + + class CS_Tool { diff --git a/sysutils/krusader/patches/patch-krusader_Konfigurator_kgstartup.cpp b/sysutils/krusader/patches/patch-krusader_Konfigurator_kgstartup.cpp new file mode 100644 index 00000000000..10d66fba374 --- /dev/null +++ b/sysutils/krusader/patches/patch-krusader_Konfigurator_kgstartup.cpp @@ -0,0 +1,20 @@ +$NetBSD: patch-krusader_Konfigurator_kgstartup.cpp,v 1.1 2012/12/22 02:31:33 joerg Exp $ + +--- krusader/Konfigurator/kgstartup.cpp.orig 2012-12-22 01:06:09.000000000 +0000 ++++ krusader/Konfigurator/kgstartup.cpp +@@ -55,12 +55,14 @@ KgStartup::KgStartup( bool first, QWidge + QStringList profileList = ProfileManager::availableProfiles( "Panel" ); + profileList.push_front( "<" + i18n( "Last session" ) + ">" ); + +- KONFIGURATOR_NAME_VALUE_PAIR comboItems[ profileList.count() ]; ++ KONFIGURATOR_NAME_VALUE_PAIR *comboItems = new KONFIGURATOR_NAME_VALUE_PAIR[ profileList.count() ]; + for(unsigned int i=0; i != profileList.count(); i++ ) + comboItems[ i ].text = comboItems[ i ].value = profileList [ i ]; + comboItems[ 0 ].value = ""; + + profileCombo = createComboBox( "Startup", "Starter Profile Name", comboItems[ 0 ].value, comboItems, profileList.count(), panelsGrp, false, false ); ++ delete[] comboItems; ++ + profileCombo->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed); + panelsGrid->addWidget( profileCombo, 0, 1 ); + diff --git a/sysutils/krusader/patches/patch-krusader_Panel_krview.h b/sysutils/krusader/patches/patch-krusader_Panel_krview.h new file mode 100644 index 00000000000..a8aff0805af --- /dev/null +++ b/sysutils/krusader/patches/patch-krusader_Panel_krview.h @@ -0,0 +1,13 @@ +$NetBSD: patch-krusader_Panel_krview.h,v 1.1 2012/12/22 02:31:33 joerg Exp $ + +--- krusader/Panel/krview.h.orig 2012-12-22 01:12:56.000000000 +0000 ++++ krusader/Panel/krview.h +@@ -133,6 +133,8 @@ protected: + */ + class KrView { + friend class KrViewItem; ++friend class KrDetailedViewItem; ++friend class KrBriefViewItem; + public: + // instantiating a new view + // 1. new KrView diff --git a/sysutils/krusader/patches/patch-krusader_UserAction_tstring.h b/sysutils/krusader/patches/patch-krusader_UserAction_tstring.h new file mode 100644 index 00000000000..2f186743564 --- /dev/null +++ b/sysutils/krusader/patches/patch-krusader_UserAction_tstring.h @@ -0,0 +1,22 @@ +$NetBSD: patch-krusader_UserAction_tstring.h,v 1.1 2012/12/22 02:31:33 joerg Exp $ + +--- krusader/UserAction/tstring.h.orig 2012-12-22 01:27:56.000000000 +0000 ++++ krusader/UserAction/tstring.h +@@ -98,7 +98,7 @@ TagString_t<T>& TagString_t<T>::operator + str+=s.str; + const unsigned disp=length(); + for(typename taglist::const_iterator it=s.tags.begin(),end=s.tags.end();it!=end;++it) { +- tags.push_back(make_pair((*it).first+disp,(*it).second)); ++ tags.push_back(std::make_pair((*it).first+disp,(*it).second)); + } + return *this; + } +@@ -107,7 +107,7 @@ template <class T> + void TagString_t<T>::insertTag(uint pos,const T& t) + { + assert(pos<=length()); +- tags.push_back(make_pair(pos,t)); ++ tags.push_back(std::make_pair(pos,t)); + } + + #endif diff --git a/sysutils/krusader/patches/patch-krusader_VFS_temp__vfs.cpp b/sysutils/krusader/patches/patch-krusader_VFS_temp__vfs.cpp new file mode 100644 index 00000000000..a6cb3f45cd9 --- /dev/null +++ b/sysutils/krusader/patches/patch-krusader_VFS_temp__vfs.cpp @@ -0,0 +1,24 @@ +$NetBSD: patch-krusader_VFS_temp__vfs.cpp,v 1.1 2012/12/22 02:31:33 joerg Exp $ + +--- krusader/VFS/temp_vfs.cpp.orig 2012-12-22 01:32:42.000000000 +0000 ++++ krusader/VFS/temp_vfs.cpp +@@ -40,8 +40,8 @@ + #include "../resources.h" + #include "../krservices.h" + +-temp_vfs::temp_vfs( QString origin, QString type, QWidget* panel, bool ): +- normal_vfs(panel){ ++temp_vfs::temp_vfs( QString origin, QString type_, QWidget* panel, bool ): ++ normal_vfs(panel), type(type_){ + vfs_type=TEMP; + // first we need to create a temp diretory + tmpDir = krApp->getTempDir(); +@@ -56,7 +56,7 @@ temp_vfs::temp_vfs( QString origin, QStr + } + + temp_vfs::~temp_vfs(){ +- if( vfs_type == "-iso" ){ ++ if( type == "-iso" ){ + // unmount the ISO image + KShellProcess umount; + umount << "umount -f" << tmpDir; diff --git a/sysutils/krusader/patches/patch-krusader_VFS_temp__vfs.h b/sysutils/krusader/patches/patch-krusader_VFS_temp__vfs.h new file mode 100644 index 00000000000..9f858243af1 --- /dev/null +++ b/sysutils/krusader/patches/patch-krusader_VFS_temp__vfs.h @@ -0,0 +1,13 @@ +$NetBSD: patch-krusader_VFS_temp__vfs.h,v 1.1 2012/12/22 02:31:33 joerg Exp $ + +--- krusader/VFS/temp_vfs.h.orig 2012-12-22 01:45:21.000000000 +0000 ++++ krusader/VFS/temp_vfs.h +@@ -52,6 +52,8 @@ protected: + void handleIso(QString origin); + QString tmpDir; + ++private: ++ QString type; + }; + + #endif |