Upgrade to 1.60.0 Fix: see attached diff Please delete the files directory! Heiner --Boundary-00=_6jvWC4YAsXuKFal Content-Type: text/x-diff; charset="iso-8859-1"; name="diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="diff" --Boundary-00=_6jvWC4YAsXuKFal----jUzUGiQgfK8JO1S0uvWwDixoGupQcDRawhszQfuik2Xu1CSL Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" diff -urN ../../x11-fm/krusader/Makefile ./Makefile --- ../../x11-fm/krusader/Makefile Mon Apr 11 21:26:54 2005 +++ ./Makefile Mon Apr 11 22:03:40 2005 @@ -6,8 +6,7 @@ # PORTNAME= krusader -PORTVERSION= 1.51 -PORTREVISION= 1 +PORTVERSION= 1.60.0 CATEGORIES= x11-fm kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=krusader diff -urN ../../x11-fm/krusader/distinfo ./distinfo --- ../../x11-fm/krusader/distinfo Tue Dec 28 14:51:04 2004 +++ ./distinfo Sun Apr 10 08:53:26 2005 @@ -1,2 +1,2 @@ -MD5 (krusader-1.51.tar.gz) = 3b31a49db60b9e7f0884d78ed1ee3eb6 -SIZE (krusader-1.51.tar.gz) = 2898752 +MD5 (krusader-1.60.0.tar.gz) = 95f7900799bbd2810e6ac06fbf628536 +SIZE (krusader-1.60.0.tar.gz) = 3216697 diff -urN ../../x11-fm/krusader/files/patch-krusader_DiskUsage_filelightParts_fileTree.h ./files/patch-krusader_DiskUsage_filelightParts_fileTree.h --- ../../x11-fm/krusader/files/patch-krusader_DiskUsage_filelightParts_fileTree.h Tue Dec 21 08:43:32 2004 +++ ./files/patch-krusader_DiskUsage_filelightParts_fileTree.h Thu Jan 1 00:00:00 1970 @@ -1,10 +0,0 @@ ---- krusader/DiskUsage/filelightParts/fileTree.h.orig Tue Nov 23 07:52:07 2004 -+++ krusader/DiskUsage/filelightParts/fileTree.h Thu Dec 16 18:35:46 2004 -@@ -5,6 +5,7 @@ - #define FILETREE_H - - #include <stdlib.h> -+#include <sys/types.h> - #include <kio/global.h> - - //TODO these are pointlessly general purpose now, make them incredibly specific diff -urN ../../x11-fm/krusader/files/patch-krusader_DiskUsage_radialMap_map.cpp ./files/patch-krusader_DiskUsage_radialMap_map.cpp --- ../../x11-fm/krusader/files/patch-krusader_DiskUsage_radialMap_map.cpp Tue Dec 21 08:43:32 2004 +++ ./files/patch-krusader_DiskUsage_radialMap_map.cpp Thu Jan 1 00:00:00 1970 @@ -1,17 +0,0 @@ ---- krusader/DiskUsage/radialMap/map.cpp.orig Tue Nov 23 00:45:27 2004 -+++ krusader/DiskUsage/radialMap/map.cpp Thu Dec 16 19:30:23 2004 -@@ -392,3 +392,14 @@ - - paint.end(); - } -+ -+#if __GLIBC__ < 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ < 1 -+ -+ void -+ sincos( double angleRadians, double *Sin, double *Cos ) -+ { -+ *Sin = sin( angleRadians ); -+ *Cos = cos( angleRadians ); -+ } -+ -+#endif diff -urN ../../x11-fm/krusader/files/patch-krusader_DiskUsage_radialMap_sincos.h ./files/patch-krusader_DiskUsage_radialMap_sincos.h --- ../../x11-fm/krusader/files/patch-krusader_DiskUsage_radialMap_sincos.h Tue Dec 21 08:43:32 2004 +++ ./files/patch-krusader_DiskUsage_radialMap_sincos.h Thu Jan 1 00:00:00 1970 @@ -1,18 +0,0 @@ ---- krusader/DiskUsage/radialMap/sincos.h.orig Mon Nov 22 23:55:25 2004 -+++ krusader/DiskUsage/radialMap/sincos.h Thu Dec 16 19:30:32 2004 -@@ -7,13 +7,9 @@ - #include <math.h> - - #if __GLIBC__ < 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ < 1 -- -+ - void -- sincos( int angleRadians, int *Sin, int *Cos ) -- { -- *Sin = sin( angleRadians ); -- *Cos = cos( angleRadians ); -- } -+ sincos( double angleRadians, double *Sin, double *Cos ); - - #endif - diff -urN ../../x11-fm/krusader/pkg-descr ./pkg-descr --- ../../x11-fm/krusader/pkg-descr Tue Dec 28 14:51:04 2004 +++ ./pkg-descr Sun Apr 10 09:21:50 2005 @@ -11,14 +11,5 @@ (almost) completely customizable, very user friendly, fast and looks great on your desktop! :-) -Many things changed since 1.40, so here's some hightlights: -* New user-action system, which allows you to define your own - personal krusader-actions. - Please take a look at the tutorial that comes in the doc\ section -* 3rd Panel: new popup-panel that can display quick view, tree etc. Just click - the little arrow button on the bottom of each panel. -* ISO protocol now allows you to step into .iso files -* Cut, Copy and Paste: ctrl-v, ctrl-c and ctrl-x is working - WWW: http://krusader.sourceforge.net Heiner (h.eichmann@gmx.de) diff -urN ../../x11-fm/krusader/pkg-plist ./pkg-plist --- ../../x11-fm/krusader/pkg-plist Tue Dec 28 14:51:04 2004 +++ ./pkg-plist Sun Apr 10 09:23:21 2005 @@ -4,6 +4,7 @@ lib/kde3/kio_krarc.la lib/kde3/kio_krarc.so share/applnk/Applications/krusader.desktop +share/applnk/Applications/krusader_root-mode.desktop share/apps/konqueror/servicemenus/isoservice.desktop share/apps/krusader/about.png share/apps/krusader/icons/hicolor/16x16/actions/kr_addbookmark.png @@ -90,8 +91,14 @@ share/apps/krusader/icons/hicolor/32x32/actions/kr_treeview.png share/apps/krusader/icons/hicolor/32x32/actions/kr_unselect.png share/apps/krusader/icons/hicolor/32x32/actions/kr_unselectall.png +share/apps/krusader/icons/hicolor/32x32/actions/kr_useractions.png share/apps/krusader/konfig_small.jpg share/apps/krusader/krusaderui.rc +share/apps/krusader/midnight_commander.color +share/apps/krusader/total_commander.color +share/apps/krusader/total_commander.keymap +share/apps/krusader/total_commander.keymap.info +share/apps/krusader/useractions.xml share/config/kio_isorc share/doc/HTML/en/krusader/bookmanadd.png share/doc/HTML/en/krusader/bookmanedit.png @@ -125,12 +132,16 @@ share/icons/hicolor/16x16/apps/krusader_red.png share/icons/hicolor/22x22/apps/krusader.png share/icons/hicolor/22x22/apps/krusader_red.png +share/icons/hicolor/22x22/apps/krusader_shield.png share/icons/hicolor/32x32/apps/krusader.png share/icons/hicolor/32x32/apps/krusader_red.png +share/icons/hicolor/32x32/apps/krusader_shield.png share/icons/hicolor/48x48/apps/krusader.png share/icons/hicolor/48x48/apps/krusader_red.png +share/icons/hicolor/48x48/apps/krusader_shield.png share/icons/hicolor/64x64/apps/krusader.png share/icons/hicolor/64x64/apps/krusader_red.png +share/icons/hicolor/64x64/apps/krusader_shield.png share/locale/bg/LC_MESSAGES/krusader.mo share/locale/bs/LC_MESSAGES/krusader.mo share/locale/ca/LC_MESSAGES/krusader.mo @@ -147,6 +158,7 @@ share/locale/pt/LC_MESSAGES/krusader.mo share/locale/ru/LC_MESSAGES/krusader.mo share/locale/sk/LC_MESSAGES/krusader.mo +share/locale/sl/LC_MESSAGES/krusader.mo share/locale/sv/LC_MESSAGES/krusader.mo share/locale/uk/LC_MESSAGES/krusader.mo share/locale/zh_CN/LC_MESSAGES/krusader.mo
State Changed From-To: open->feedback Does not build on 4.11 with KDE 3.4: /bin/sh ../libtool --silent --tag=CXX --mode=link c++ -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -W -Wpointer-arith -Wwrite-strings -O2 -O2 -pipe -g -fno-exceptions -fno-check-new -fno-common -o krusader -L/usr/local/lib -L/usr/local/lib -L/usr/X11R6/lib -D_THREAD_SAFE -pthread paneltabbar.o panelmanager.o krservices.o main.o krusaderview.o krusader.o krslots.o kicons.o krusaderapp.moc.o ./BookMan/libBookMan.a ./Dialogs/libDialogs.a ./DiskUsage/libDiskUsage.a ./DiskUsage/radialMap/libradialmap.a ./DiskUsage/filelightParts/libfilelightparts.a ./GUI/libGUI.a ./Konfigurator/libKonfigurator.a ./KViewer/libKViewer.a ./MountMan/libMountMan.a ./Panel/libPanel.a ./RemoteMan/libRemoteMan.a ./VFS/libVFS.a ./Search/libSearch.a ./Splitter/libSplitter.a ./Synchronizer/libSynchronizer.a ./UserMenu/libUserMenu.a ./Locate/libLocate.a UserAction/libUserAction.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a GUI/libGUI.a -lkparts -lkio -lkhtml -lkdeui -lkdecore -lqt-mt -lz -lpng -lz -lm -lXext -lX11 -lSM -lICE -Wl,-export-dynamic -L/usr/local/lib -L/usr/X11R6/lib -ljpeg -L/usr/X11R6/lib /usr/lib/libc.so.4: WARNING! setkey(3) not present in the system! /usr/lib/libc.so.4: warning: this program uses gets(), which is unsafe. /usr/lib/libc.so.4: warning: mktemp() possibly used unsafely; consider using mkstemp() /usr/lib/libc.so.4: WARNING! des_setkey(3) not present in the system! /usr/lib/libc.so.4: WARNING! encrypt(3) not present in the system! /usr/lib/libc.so.4: warning: tmpnam() possibly used unsafely; consider using mkstemp() /usr/lib/libc.so.4: warning: this program uses f_prealloc(), which is not recommended. /usr/lib/libc.so.4: WARNING! des_cipher(3) not present in the system! /usr/lib/libc.so.4: warning: tempnam() possibly used unsafely; consider using mkstemp() ./Synchronizer/libSynchronizer.a(synchronizer.o): In function `QMapPrivate<QString, QString>::QMapPrivate(void)': /usr/X11R6/include/qvaluelist.h(.gnu.linkonce.d._vt$Q312Synchronizer37synchronizeWithKGet__12Synchronizer.0_18KgetProgressDialog$12QPaintDevice+0xc): undefined reference to `_$_Q312Synchronizer37synchronizeWithKGet__12Synchronizer.0_18KgetProgressDialog.5855' /usr/X11R6/include/qvaluelist.h(.gnu.linkonce.d._vt$Q312Synchronizer37synchronizeWithKGet__12Synchronizer.0_18KgetProgressDialog+0x3c): undefined reference to `_$_Q312Synchronizer37synchronizeWithKGet__12Synchronizer.0_18KgetProgressDialog.5855' ./Synchronizer/libSynchronizer.a(synchronizer.o): In function `Synchronizer::compare(QString, QString, KRQuery *, bool, bool, bool, bool, bool, bool, bool)': /usr/ports/x11-fm/krusader/work/krusader-1.60.0/krusader/Synchronizer/synchronizer.cpp:106: undefined reference to `slotUser1__Q312Synchronizer37synchronizeWithKGet__12Synchronizer.0_18KgetProgressDialog.5851' /usr/ports/x11-fm/krusader/work/krusader-1.60.0/krusader/Synchronizer/synchronizer.cpp:106: undefined reference to `slotCancel__Q312Synchronizer37synchronizeWithKGet__12Synchronizer.0_18KgetProgressDialog.5852' gmake[3]: *** [krusader] Error 1 gmake[3]: Leaving directory `/usr/ports/x11-fm/krusader/work/krusader-1.60.0/krusader'
Thanks for the hint. Please add the attached file to the files directory. Heiner
State Changed From-To: feedback->closed committed, thanks