1
0
forked from ports/contrib

nao: new port

This commit is contained in:
Bartlomiej Palmowski 2008-05-13 18:32:41 +02:00
parent cb693447fb
commit 05a57643bd
5 changed files with 374 additions and 0 deletions

263
nao/.footprint Normal file
View File

@ -0,0 +1,263 @@
drwxr-xr-x root/root etc/
-rw-r--r-- root/root etc/mime2program.conf
-rw-r--r-- root/root etc/nao.conf
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/nao
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/nao/
-rw-r--r-- root/root usr/lib/nao/libCmdCopy.a
-rwxr-xr-x root/root usr/lib/nao/libCmdCopy.la
lrwxrwxrwx root/root usr/lib/nao/libCmdCopy.so -> libCmdCopy.so.0.0.0
lrwxrwxrwx root/root usr/lib/nao/libCmdCopy.so.0 -> libCmdCopy.so.0.0.0
-rwxr-xr-x root/root usr/lib/nao/libCmdCopy.so.0.0.0
-rw-r--r-- root/root usr/lib/nao/libCmdCreateDir.a
-rwxr-xr-x root/root usr/lib/nao/libCmdCreateDir.la
lrwxrwxrwx root/root usr/lib/nao/libCmdCreateDir.so -> libCmdCreateDir.so.0.0.0
lrwxrwxrwx root/root usr/lib/nao/libCmdCreateDir.so.0 -> libCmdCreateDir.so.0.0.0
-rwxr-xr-x root/root usr/lib/nao/libCmdCreateDir.so.0.0.0
-rw-r--r-- root/root usr/lib/nao/libCmdExternal.a
-rwxr-xr-x root/root usr/lib/nao/libCmdExternal.la
lrwxrwxrwx root/root usr/lib/nao/libCmdExternal.so -> libCmdExternal.so.0.0.0
lrwxrwxrwx root/root usr/lib/nao/libCmdExternal.so.0 -> libCmdExternal.so.0.0.0
-rwxr-xr-x root/root usr/lib/nao/libCmdExternal.so.0.0.0
-rw-r--r-- root/root usr/lib/nao/libCmdPythonPlugin.a
-rwxr-xr-x root/root usr/lib/nao/libCmdPythonPlugin.la
lrwxrwxrwx root/root usr/lib/nao/libCmdPythonPlugin.so -> libCmdPythonPlugin.so.0.0.0
lrwxrwxrwx root/root usr/lib/nao/libCmdPythonPlugin.so.0 -> libCmdPythonPlugin.so.0.0.0
-rwxr-xr-x root/root usr/lib/nao/libCmdPythonPlugin.so.0.0.0
-rw-r--r-- root/root usr/lib/nao/libStandardCommands.a
-rwxr-xr-x root/root usr/lib/nao/libStandardCommands.la
lrwxrwxrwx root/root usr/lib/nao/libStandardCommands.so -> libStandardCommands.so.0.0.0
lrwxrwxrwx root/root usr/lib/nao/libStandardCommands.so.0 -> libStandardCommands.so.0.0.0
-rwxr-xr-x root/root usr/lib/nao/libStandardCommands.so.0.0.0
-rw-r--r-- root/root usr/lib/nao/libVfsArchive.a
-rwxr-xr-x root/root usr/lib/nao/libVfsArchive.la
lrwxrwxrwx root/root usr/lib/nao/libVfsArchive.so -> libVfsArchive.so.0.0.0
lrwxrwxrwx root/root usr/lib/nao/libVfsArchive.so.0 -> libVfsArchive.so.0.0.0
-rwxr-xr-x root/root usr/lib/nao/libVfsArchive.so.0.0.0
-rw-r--r-- root/root usr/lib/nao/libVfsFlatDirectory.a
-rwxr-xr-x root/root usr/lib/nao/libVfsFlatDirectory.la
lrwxrwxrwx root/root usr/lib/nao/libVfsFlatDirectory.so -> libVfsFlatDirectory.so.0.0.0
lrwxrwxrwx root/root usr/lib/nao/libVfsFlatDirectory.so.0 -> libVfsFlatDirectory.so.0.0.0
-rwxr-xr-x root/root usr/lib/nao/libVfsFlatDirectory.so.0.0.0
-rw-r--r-- root/root usr/lib/nao/libVfsFtp.a
-rwxr-xr-x root/root usr/lib/nao/libVfsFtp.la
lrwxrwxrwx root/root usr/lib/nao/libVfsFtp.so -> libVfsFtp.so.0.0.0
lrwxrwxrwx root/root usr/lib/nao/libVfsFtp.so.0 -> libVfsFtp.so.0.0.0
-rwxr-xr-x root/root usr/lib/nao/libVfsFtp.so.0.0.0
-rw-r--r-- root/root usr/lib/nao/libVfsHistory.a
-rwxr-xr-x root/root usr/lib/nao/libVfsHistory.la
lrwxrwxrwx root/root usr/lib/nao/libVfsHistory.so -> libVfsHistory.so.0.0.0
lrwxrwxrwx root/root usr/lib/nao/libVfsHistory.so.0 -> libVfsHistory.so.0.0.0
-rwxr-xr-x root/root usr/lib/nao/libVfsHistory.so.0.0.0
-rw-r--r-- root/root usr/lib/nao/libVfsSearch.a
-rwxr-xr-x root/root usr/lib/nao/libVfsSearch.la
lrwxrwxrwx root/root usr/lib/nao/libVfsSearch.so -> libVfsSearch.so.0.0.0
lrwxrwxrwx root/root usr/lib/nao/libVfsSearch.so.0 -> libVfsSearch.so.0.0.0
-rwxr-xr-x root/root usr/lib/nao/libVfsSearch.so.0.0.0
drwxr-xr-x root/root usr/lib/nao/python_plugins/
-rw-r--r-- root/root usr/lib/nao/python_plugins/Md5Sum.py
-rw-r--r-- root/root usr/lib/nao/python_plugins/MimeFilter.py
-rw-r--r-- root/root usr/lib/nao/python_plugins/Sha1Sum.py
-rw-r--r-- root/root usr/lib/nao/python_plugins/SizeColorize.py
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/applications/
-rw-r--r-- root/root usr/share/applications/nao.desktop
drwxr-xr-x root/root usr/share/nao/
drwxr-xr-x root/root usr/share/nao/icons/
drwxr-xr-x root/root usr/share/nao/icons/default/
-rw-r--r-- root/root usr/share/nao/icons/default/about.png
-rw-r--r-- root/root usr/share/nao/icons/default/archive_small.png
-rw-r--r-- root/root usr/share/nao/icons/default/back.png
-rw-r--r-- root/root usr/share/nao/icons/default/bigicons.png
-rw-r--r-- root/root usr/share/nao/icons/default/blockdevice.png
-rw-r--r-- root/root usr/share/nao/icons/default/cancel.png
-rw-r--r-- root/root usr/share/nao/icons/default/chardevice.png
-rw-r--r-- root/root usr/share/nao/icons/default/charset_settings.png
-rw-r--r-- root/root usr/share/nao/icons/default/close.png
-rw-r--r-- root/root usr/share/nao/icons/default/command_plugins.png
-rw-r--r-- root/root usr/share/nao/icons/default/commands_settings.png
-rw-r--r-- root/root usr/share/nao/icons/default/configure.png
-rw-r--r-- root/root usr/share/nao/icons/default/copy.png
-rw-r--r-- root/root usr/share/nao/icons/default/cut.png
-rw-r--r-- root/root usr/share/nao/icons/default/details.png
-rw-r--r-- root/root usr/share/nao/icons/default/directory.png
-rw-r--r-- root/root usr/share/nao/icons/default/dirup.png
-rw-r--r-- root/root usr/share/nao/icons/default/download.png
-rw-r--r-- root/root usr/share/nao/icons/default/executable.png
-rw-r--r-- root/root usr/share/nao/icons/default/execute.png
-rw-r--r-- root/root usr/share/nao/icons/default/execute1.png
-rw-r--r-- root/root usr/share/nao/icons/default/execute2.png
-rw-r--r-- root/root usr/share/nao/icons/default/file_types_settings.png
-rw-r--r-- root/root usr/share/nao/icons/default/flat.png
-rw-r--r-- root/root usr/share/nao/icons/default/folder.png
-rw-r--r-- root/root usr/share/nao/icons/default/folder_big.png
-rw-r--r-- root/root usr/share/nao/icons/default/folder_small.png
-rw-r--r-- root/root usr/share/nao/icons/default/foxbig.png
-rw-r--r-- root/root usr/share/nao/icons/default/getdir.png
-rw-r--r-- root/root usr/share/nao/icons/default/goto.png
-rw-r--r-- root/root usr/share/nao/icons/default/history.png
-rw-r--r-- root/root usr/share/nao/icons/default/history_big.png
-rw-r--r-- root/root usr/share/nao/icons/default/home.png
-rw-r--r-- root/root usr/share/nao/icons/default/left.png
-rw-r--r-- root/root usr/share/nao/icons/default/logo.png
-rw-r--r-- root/root usr/share/nao/icons/default/look_and_feel.png
-rw-r--r-- root/root usr/share/nao/icons/default/main_settings.png
-rw-r--r-- root/root usr/share/nao/icons/default/menu_and_buttons.png
-rw-r--r-- root/root usr/share/nao/icons/default/messagebox_critical.png
-rw-r--r-- root/root usr/share/nao/icons/default/messagebox_warning.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-application-pdf.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-application-postscript.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-application-vnd.oasis.opendocument.graphics.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-application-vnd.oasis.opendocument.presentation.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-application-vnd.oasis.opendocument.spreadsheet.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-application-vnd.oasis.opendocument.text.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-application-x-cd-image.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-application-x-compressed-tar.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-application-x-object.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-application-x-perl.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-application-x-php.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-application-x-python.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-application-x-rpm.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-application-x-sharedlib.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-application-x-shellscript.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-application-x-tex.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-audio-x-pn-realaudio.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-audio-x-wav.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-audio.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-image-svg+xml.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-image-x-xcf.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-image.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-text-html.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-text-x-c++hdr.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-text-x-c++src.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-text-x-java.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-text-x-patch.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-text.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-video-quicktime.png
-rw-r--r-- root/root usr/share/nao/icons/default/mime-video.png
-rw-r--r-- root/root usr/share/nao/icons/default/min.png
-rw-r--r-- root/root usr/share/nao/icons/default/minus.png
-rw-r--r-- root/root usr/share/nao/icons/default/nao.png
-rw-r--r-- root/root usr/share/nao/icons/default/network.png
-rw-r--r-- root/root usr/share/nao/icons/default/network_small.png
-rw-r--r-- root/root usr/share/nao/icons/default/ok.png
-rw-r--r-- root/root usr/share/nao/icons/default/other.png
-rw-r--r-- root/root usr/share/nao/icons/default/password.png
-rw-r--r-- root/root usr/share/nao/icons/default/paste.png
-rw-r--r-- root/root usr/share/nao/icons/default/pattern.png
-rw-r--r-- root/root usr/share/nao/icons/default/plus.png
-rw-r--r-- root/root usr/share/nao/icons/default/reload.png
-rw-r--r-- root/root usr/share/nao/icons/default/right.png
-rw-r--r-- root/root usr/share/nao/icons/default/run_shell.png
-rw-r--r-- root/root usr/share/nao/icons/default/search.png
-rw-r--r-- root/root usr/share/nao/icons/default/search_small.png
-rw-r--r-- root/root usr/share/nao/icons/default/smallicons.png
-rw-r--r-- root/root usr/share/nao/icons/default/socket.png
-rw-r--r-- root/root usr/share/nao/icons/default/speed_and_delays.png
-rw-r--r-- root/root usr/share/nao/icons/default/symlink.png
-rw-r--r-- root/root usr/share/nao/icons/default/unknown.png
-rw-r--r-- root/root usr/share/nao/icons/default/user.png
-rw-r--r-- root/root usr/share/nao/icons/default/vfs_settings.png
-rw-r--r-- root/root usr/share/nao/icons/default/viewmag+.png
-rw-r--r-- root/root usr/share/nao/icons/default/viewmag-.png
-rw-r--r-- root/root usr/share/nao/icons/default/warning.png
-rw-r--r-- root/root usr/share/nao/icons/default/wizard.png
drwxr-xr-x root/root usr/share/nao/icons/mini/
-rw-r--r-- root/root usr/share/nao/icons/mini/about.png
-rw-r--r-- root/root usr/share/nao/icons/mini/back.png
-rw-r--r-- root/root usr/share/nao/icons/mini/bigicons.png
-rw-r--r-- root/root usr/share/nao/icons/mini/blockdevice.png
-rw-r--r-- root/root usr/share/nao/icons/mini/cancel.png
-rw-r--r-- root/root usr/share/nao/icons/mini/chardevice.png
-rw-r--r-- root/root usr/share/nao/icons/mini/charset_settings.png
-rw-r--r-- root/root usr/share/nao/icons/mini/close.png
-rw-r--r-- root/root usr/share/nao/icons/mini/command_plugins.png
-rw-r--r-- root/root usr/share/nao/icons/mini/commands_settings.png
-rw-r--r-- root/root usr/share/nao/icons/mini/configure.png
-rw-r--r-- root/root usr/share/nao/icons/mini/copy.png
-rw-r--r-- root/root usr/share/nao/icons/mini/cut.png
-rw-r--r-- root/root usr/share/nao/icons/mini/details.png
-rw-r--r-- root/root usr/share/nao/icons/mini/directory.png
-rw-r--r-- root/root usr/share/nao/icons/mini/dirup.png
-rw-r--r-- root/root usr/share/nao/icons/mini/download.png
-rw-r--r-- root/root usr/share/nao/icons/mini/executable.png
-rw-r--r-- root/root usr/share/nao/icons/mini/execute.png
-rw-r--r-- root/root usr/share/nao/icons/mini/execute1.png
-rw-r--r-- root/root usr/share/nao/icons/mini/execute2.png
-rw-r--r-- root/root usr/share/nao/icons/mini/file_types_settings.png
-rw-r--r-- root/root usr/share/nao/icons/mini/flat.png
-rw-r--r-- root/root usr/share/nao/icons/mini/folder.png
-rw-r--r-- root/root usr/share/nao/icons/mini/folder_small.png
-rw-r--r-- root/root usr/share/nao/icons/mini/foxbig.png
-rw-r--r-- root/root usr/share/nao/icons/mini/getdir.png
-rw-r--r-- root/root usr/share/nao/icons/mini/goto.png
-rw-r--r-- root/root usr/share/nao/icons/mini/history.png
-rw-r--r-- root/root usr/share/nao/icons/mini/history_big.png
-rw-r--r-- root/root usr/share/nao/icons/mini/home.png
-rw-r--r-- root/root usr/share/nao/icons/mini/left.png
-rw-r--r-- root/root usr/share/nao/icons/mini/look_and_feel.png
-rw-r--r-- root/root usr/share/nao/icons/mini/main_settings.png
-rw-r--r-- root/root usr/share/nao/icons/mini/menu_and_buttons.png
-rw-r--r-- root/root usr/share/nao/icons/mini/messagebox_critical.png
-rw-r--r-- root/root usr/share/nao/icons/mini/messagebox_warning.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-application-pdf.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-application-postscript.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-application-vnd.oasis.opendocument.graphics.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-application-vnd.oasis.opendocument.presentation.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-application-vnd.oasis.opendocument.spreadsheet.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-application-vnd.oasis.opendocument.text.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-application-x-cd-image.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-application-x-compressed-tar.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-application-x-object.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-application-x-perl.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-application-x-php.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-application-x-python.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-application-x-rpm.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-application-x-sharedlib.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-application-x-shellscript.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-application-x-tex.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-audio-x-pn-realaudio.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-audio-x-wav.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-audio.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-image-svg+xml.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-image-x-xcf.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-image.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-text-html.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-text-x-c++hdr.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-text-x-c++src.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-text-x-java.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-text-x-patch.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-text.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-video-quicktime.png
-rw-r--r-- root/root usr/share/nao/icons/mini/mime-video.png
-rw-r--r-- root/root usr/share/nao/icons/mini/min.png
-rw-r--r-- root/root usr/share/nao/icons/mini/minus.png
-rw-r--r-- root/root usr/share/nao/icons/mini/nao.png
-rw-r--r-- root/root usr/share/nao/icons/mini/network.png
-rw-r--r-- root/root usr/share/nao/icons/mini/network_small.png
-rw-r--r-- root/root usr/share/nao/icons/mini/ok.png
-rw-r--r-- root/root usr/share/nao/icons/mini/other.png
-rw-r--r-- root/root usr/share/nao/icons/mini/password.png
-rw-r--r-- root/root usr/share/nao/icons/mini/paste.png
-rw-r--r-- root/root usr/share/nao/icons/mini/pattern.png
-rw-r--r-- root/root usr/share/nao/icons/mini/plus.png
-rw-r--r-- root/root usr/share/nao/icons/mini/reload.png
-rw-r--r-- root/root usr/share/nao/icons/mini/right.png
-rw-r--r-- root/root usr/share/nao/icons/mini/run_shell.png
-rw-r--r-- root/root usr/share/nao/icons/mini/search.png
-rw-r--r-- root/root usr/share/nao/icons/mini/search_small.png
-rw-r--r-- root/root usr/share/nao/icons/mini/smallicons.png
-rw-r--r-- root/root usr/share/nao/icons/mini/socket.png
-rw-r--r-- root/root usr/share/nao/icons/mini/speed_and_delays.png
-rw-r--r-- root/root usr/share/nao/icons/mini/symlink.png
-rw-r--r-- root/root usr/share/nao/icons/mini/unknown.png
-rw-r--r-- root/root usr/share/nao/icons/mini/user.png
-rw-r--r-- root/root usr/share/nao/icons/mini/vfs_settings.png
-rw-r--r-- root/root usr/share/nao/icons/mini/viewmag+.png
-rw-r--r-- root/root usr/share/nao/icons/mini/viewmag-.png
-rw-r--r-- root/root usr/share/nao/icons/mini/warning.png
-rw-r--r-- root/root usr/share/nao/icons/mini/wizard.png
drwxr-xr-x root/root usr/share/pixmaps/
-rw-r--r-- root/root usr/share/pixmaps/nao.png

2
nao/.md5sum Normal file
View File

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

22
nao/Pkgfile Normal file
View File

@ -0,0 +1,22 @@
# 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
name=nao
version=0.4.1
release=1
source=(http://$name.linux.pl/data/$name-$version.tar.bz2 crux_colon.patch)
build() {
cd $name-$version
# patch -p0 -i ../gcc4.3.patch
patch -p1 -i ../crux_colon.patch
./configure \
--prefix=/usr \
--sysconfdir=/etc \
--disable-nls \
--enable-python
make
make DESTDIR=$PKG install
}

55
nao/crux_colon.patch Normal file
View File

@ -0,0 +1,55 @@
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());
}

32
nao/gcc4.3.patch Normal file
View File

@ -0,0 +1,32 @@
diff -ur src/Iconv.cpp src2/Iconv.cpp
--- src/Iconv.cpp 2007-05-12 12:51:28.000000000 +0200
+++ src2/Iconv.cpp 2008-05-09 14:46:38.000000000 +0200
@@ -26,6 +26,7 @@
#include <libxml/xpath.h>
#include "config.h"
+#include <string.h>
Iconv::Iconv(string toEncoding,string fromEncoding)
{
@@ -181,4 +182,4 @@
return toUTF8(name);
else
return name;
-}
\ Brak znaku nowej linii na koñcu pliku
+}
diff -ur src/libfactory/DynLibManager.hpp src2/libfactory/DynLibManager.hpp
--- src/libfactory/DynLibManager.hpp 2006-10-25 23:58:29.000000000 +0200
+++ src2/libfactory/DynLibManager.hpp 2008-05-09 14:46:23.000000000 +0200
@@ -43,7 +43,8 @@
~DynLibManager ();
void addBaseDirectory(const string& dir);
- bool load (const string& libName, const string& libName);
+ // bool load (const string& libName, const string& libName);
+ bool load (const string& libName, const string& fullLibName);
bool loadFromDirectoryList (const string& fullLibName);
bool unload (const string libName);