tek/contrib-tek
1
0
Fork 0
forked from ports/contrib
Code Pull Requests Activity

nao: Something, Something, Something, Dark Side

Browse Source
This commit is contained in:
Bartlomiej Palmowski 2008-10-09 21:42:22 +02:00
parent d8e4c32bea
commit 8bd9e14dcd
5 changed files with 128 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nao/.md5sum
View File

@ -1,2 +1,2 @@
60b55c7cd7ca03379970f89f42b6e795 crux_colon.patch
b113c79af37fae2f6a7b12496900952e nao-0.4.1.tar.bz2
c38f2f1be920d7055f25e262d21e2bc6 nao-0.4.1_ambiguous_reference.patch

8
nao/Pkgfile
View File

@ -1,17 +1,17 @@
# Description: powerful, flexible, and utterly configurable file manager for UNIX systems
# URL: http://nao.linux.pl/
# Maintainer: Bartlomiej Palmowski, maks1k at wp dot pl
# Depends on: boost fox python libxml2
# Depends on: boost fox python
name=nao
version=0.4.1
release=1
source=(http://$name.linux.pl/data/$name-$version.tar.bz2 crux_colon.patch)
source=(http://$name.linux.pl/data/$name-$version.tar.bz2
$name-${version}_ambiguous_reference.patch)
build() {
cd $name-$version
# patch -p0 -i ../gcc4.3.patch
patch -p1 -i ../crux_colon.patch
patch -p1 -i ../$name-${version}_ambiguous_reference.patch
./configure \
--prefix=/usr \
--sysconfdir=/etc \

55
nao/crux_colon.patch
View File

@ -1,55 +0,0 @@
Only in nao-0.4.1/: nao-0.4.1.old
diff -urp nao-0.4.1.old/src/commands/CmdExternal.cpp nao-0.4.1/src/commands/CmdExternal.cpp
--- nao-0.4.1.old/src/commands/CmdExternal.cpp 2007-05-01 17:13:15.000000000 +0200
+++ nao-0.4.1/src/commands/CmdExternal.cpp 2008-05-11 01:25:06.000000000 +0200
@@ -157,7 +157,7 @@ void CmdExternal::runExec(string cmd)
cout<<"command="<<cmd<<endl;
#endif
- if(system(cmd.c_str())!=0)
+ if(::system(cmd.c_str())!=0)
{
//cout<<"EXCEPTION"<<endl;
throw ExceptionExecutingCommand(cmd);
diff -urp nao-0.4.1.old/src/commands/StandardCommands.cpp nao-0.4.1/src/commands/StandardCommands.cpp
--- nao-0.4.1.old/src/commands/StandardCommands.cpp 2007-05-12 13:08:18.000000000 +0200
+++ nao-0.4.1/src/commands/StandardCommands.cpp 2008-05-11 01:26:35.000000000 +0200
@@ -1027,7 +1027,7 @@ void CmdRunCommand::execute()
if(state=="execute")
{
string data=fileList->getTextFieldData()+" &";
- system(data.c_str());
+ ::system(data.c_str());
}
else if(state=="switch")
@@ -1209,7 +1209,7 @@ void CmdAddDirToShortcuts::execute()
void CmdUmount::execute()
{
- if(system(string("umount " +fileList->getCurrentFileIcon().getFile().getPath().string()).c_str())!=0)
+ if(::system(string("umount " +fileList->getCurrentFileIcon().getFile().getPath().string()).c_str())!=0)
throw ExceptionFileSystem();
}
@@ -1231,7 +1231,7 @@ void CmdCreateEmptyFile::execute()
string cmd="cd "+fileList->getCurrentDirectory().string()+" && touch "+fileName;
- if(system(cmd.c_str())==0)
+ if(::system(cmd.c_str())==0)
{
path newPath=fileList->getCurrentDirectory()/path(fileName);
fileList->addFile(newPath.string());
diff -urp nao-0.4.1.old/src/FilesEngine.cpp nao-0.4.1/src/FilesEngine.cpp
--- nao-0.4.1.old/src/FilesEngine.cpp 2007-05-09 14:00:23.000000000 +0200
+++ nao-0.4.1/src/FilesEngine.cpp 2008-05-11 01:27:17.000000000 +0200
@@ -121,7 +121,7 @@ return groups;
void FilesEngine::runFile( path file )
{
string cmd=string("\"")+file.string()+string("\"")+"&";
- system(cmd.c_str());
+ ::system(cmd.c_str());
}

123
nao/nao-0.4.1_ambiguous_reference.patch Normal file
View File

@ -0,0 +1,123 @@
diff -pruN nao-0.4.1.old/src/AutoConfigurator.cpp nao-0.4.1/src/AutoConfigurator.cpp
--- nao-0.4.1.old/src/AutoConfigurator.cpp 2008-10-09 19:48:40.000000000 +0200
+++ nao-0.4.1/src/AutoConfigurator.cpp 2008-10-09 19:49:47.000000000 +0200
@@ -189,7 +189,7 @@ void AutoConfigurator::assignProgramsToM
}
}
- catch(exception e)
+ catch(std::exception e)
{
}
diff -pruN nao-0.4.1.old/src/Command.cpp nao-0.4.1/src/Command.cpp
--- nao-0.4.1.old/src/Command.cpp 2008-10-09 19:48:40.000000000 +0200
+++ nao-0.4.1/src/Command.cpp 2008-10-09 19:49:51.000000000 +0200
@@ -59,7 +59,7 @@ void CommandOpposite::init(FileList * _f
fileListOpposite=_filelist->getOpposite();
if(!fileListOpposite)
- throw exception();
+ throw std::exception();
fileListOpposite->acquire();
}
diff -pruN nao-0.4.1.old/src/commands/CmdCopy.cpp nao-0.4.1/src/commands/CmdCopy.cpp
--- nao-0.4.1.old/src/commands/CmdCopy.cpp 2008-10-09 19:48:40.000000000 +0200
+++ nao-0.4.1/src/commands/CmdCopy.cpp 2008-10-09 19:49:43.000000000 +0200
@@ -185,7 +185,7 @@ void CmdCopy::copy(FileList *fileList1,
}
catch(ExceptionFileIconNotFound &e){}
}
- catch(exception &e)
+ catch(std::exception &e)
{
if(!totalSizeCounted)
setTotalSize(fileList1->getVfs(),files,status);
diff -pruN nao-0.4.1.old/src/commands/CmdExternal.cpp nao-0.4.1/src/commands/CmdExternal.cpp
--- nao-0.4.1.old/src/commands/CmdExternal.cpp 2008-10-09 19:48:40.000000000 +0200
+++ nao-0.4.1/src/commands/CmdExternal.cpp 2008-10-09 19:49:00.000000000 +0200
@@ -157,7 +157,7 @@ void CmdExternal::runExec(string cmd)
cout<<"command="<<cmd<<endl;
#endif
- if(system(cmd.c_str())!=0)
+ if(::system(cmd.c_str())!=0)
{
//cout<<"EXCEPTION"<<endl;
throw ExceptionExecutingCommand(cmd);
diff -pruN nao-0.4.1.old/src/commands/StandardCommands.cpp nao-0.4.1/src/commands/StandardCommands.cpp
--- nao-0.4.1.old/src/commands/StandardCommands.cpp 2008-10-09 19:48:40.000000000 +0200
+++ nao-0.4.1/src/commands/StandardCommands.cpp 2008-10-09 19:49:00.000000000 +0200
@@ -1027,7 +1027,7 @@ void CmdRunCommand::execute()
if(state=="execute")
{
string data=fileList->getTextFieldData()+" &";
- system(data.c_str());
+ ::system(data.c_str());
}
else if(state=="switch")
@@ -1209,7 +1209,7 @@ void CmdAddDirToShortcuts::execute()
void CmdUmount::execute()
{
- if(system(string("umount " +fileList->getCurrentFileIcon().getFile().getPath().string()).c_str())!=0)
+ if(::system(string("umount " +fileList->getCurrentFileIcon().getFile().getPath().string()).c_str())!=0)
throw ExceptionFileSystem();
}
@@ -1231,7 +1231,7 @@ void CmdCreateEmptyFile::execute()
string cmd="cd "+fileList->getCurrentDirectory().string()+" && touch "+fileName;
- if(system(cmd.c_str())==0)
+ if(::system(cmd.c_str())==0)
{
path newPath=fileList->getCurrentDirectory()/path(fileName);
fileList->addFile(newPath.string());
diff -pruN nao-0.4.1.old/src/FilesEngine.cpp nao-0.4.1/src/FilesEngine.cpp
--- nao-0.4.1.old/src/FilesEngine.cpp 2008-10-09 19:48:40.000000000 +0200
+++ nao-0.4.1/src/FilesEngine.cpp 2008-10-09 19:49:00.000000000 +0200
@@ -121,7 +121,7 @@ return groups;
void FilesEngine::runFile( path file )
{
string cmd=string("\"")+file.string()+string("\"")+"&";
- system(cmd.c_str());
+ ::system(cmd.c_str());
}
diff -pruN nao-0.4.1.old/src/fox/FoxFileList.cpp nao-0.4.1/src/fox/FoxFileList.cpp
--- nao-0.4.1.old/src/fox/FoxFileList.cpp 2008-10-09 19:48:40.000000000 +0200
+++ nao-0.4.1/src/fox/FoxFileList.cpp 2008-10-09 19:49:36.000000000 +0200
@@ -1560,7 +1560,7 @@ FileIcon FoxFileList::getFileIconSync(in
return listItem->getFileIcon();
}
else
- throw exception();
+ throw(std::exception());
}
int FoxFileList::loadPreviewIcon(string file, int size)
@@ -1742,7 +1742,7 @@ FileIcon FoxFileList::getCurrentFileIcon
return listItem->getFileIcon();
}
else
- throw exception();
+ throw(std::exception());
}
long FoxFileList::onRightButtonPress(FXObject *, FXSelector , void *ptr)
diff -pruN nao-0.4.1.old/src/VfsBase.hpp nao-0.4.1/src/VfsBase.hpp
--- nao-0.4.1.old/src/VfsBase.hpp 2008-10-09 19:48:40.000000000 +0200
+++ nao-0.4.1/src/VfsBase.hpp 2008-10-09 19:49:47.000000000 +0200
@@ -123,7 +123,7 @@ protected:
goRecursive(nextFile,operation,visitChildrenFirst,cancelable);
}
}
- catch(exception e)
+ catch(std::exception e)
{
}

0
nao/gcc4.3.patch → nao/nao-0.4.1_gcc43.patch
View File