From 3273442a2482cd4ae3659ccc7c0ccbc62ec7cdf0 Mon Sep 17 00:00:00 2001 From: Tilman Keskinoz Date: Tue, 3 Jun 2003 07:43:39 +0000 Subject: Update to 1.20 PR: 52874 Submitted by: maintainer --- x11-fm/krusader/Makefile | 2 +- x11-fm/krusader/distinfo | 2 +- x11-fm/krusader/files/patch-krusader::arc_vfs.cpp | 22 -- .../krusader/files/patch-krusader::kmountman.cpp | 268 --------------------- .../files/patch-krusader::kmountmangui.cpp | 19 -- x11-fm/krusader/pkg-plist | 3 +- x11-fm/krusader2/Makefile | 2 +- x11-fm/krusader2/distinfo | 2 +- x11-fm/krusader2/files/patch-krusader::arc_vfs.cpp | 22 -- .../krusader2/files/patch-krusader::kmountman.cpp | 268 --------------------- .../files/patch-krusader::kmountmangui.cpp | 19 -- x11-fm/krusader2/pkg-plist | 3 +- 12 files changed, 8 insertions(+), 624 deletions(-) delete mode 100644 x11-fm/krusader/files/patch-krusader::arc_vfs.cpp delete mode 100644 x11-fm/krusader/files/patch-krusader::kmountman.cpp delete mode 100644 x11-fm/krusader/files/patch-krusader::kmountmangui.cpp delete mode 100644 x11-fm/krusader2/files/patch-krusader::arc_vfs.cpp delete mode 100644 x11-fm/krusader2/files/patch-krusader::kmountman.cpp delete mode 100644 x11-fm/krusader2/files/patch-krusader::kmountmangui.cpp (limited to 'x11-fm') diff --git a/x11-fm/krusader/Makefile b/x11-fm/krusader/Makefile index 3247914edbbc..eb93d7d3e4a4 100644 --- a/x11-fm/krusader/Makefile +++ b/x11-fm/krusader/Makefile @@ -6,7 +6,7 @@ # PORTNAME= krusader -PORTVERSION= 1.11 +PORTVERSION= 1.20 CATEGORIES= x11-fm kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=krusader diff --git a/x11-fm/krusader/distinfo b/x11-fm/krusader/distinfo index 13fa856669c9..46f750d15e58 100644 --- a/x11-fm/krusader/distinfo +++ b/x11-fm/krusader/distinfo @@ -1 +1 @@ -MD5 (krusader-1.11.tar.gz) = 3450c67d2b7d5409fe82b7436b7b7204 +MD5 (krusader-1.20.tar.gz) = cc0d59ab5a8129b3bbbb329487ab1062 diff --git a/x11-fm/krusader/files/patch-krusader::arc_vfs.cpp b/x11-fm/krusader/files/patch-krusader::arc_vfs.cpp deleted file mode 100644 index fba19376a360..000000000000 --- a/x11-fm/krusader/files/patch-krusader::arc_vfs.cpp +++ /dev/null @@ -1,22 +0,0 @@ -*** krusader/VFS/arc_vfs.cpp.orig Mon Apr 15 20:51:37 2002 ---- krusader/VFS/arc_vfs.cpp Thu Oct 24 12:01:13 2002 -*************** -*** 814,821 **** - group = temp.mid(temp.find('/')+1,temp.length()).toInt(); - size = nextWord(line).toLong(); - temp = nextWord(line); -! dateTime = temp.mid(8,2)+"/"+temp.mid(5,2)+"/"+temp.mid(2,2)+ -! " "+nextWord(line).left(5); - name = nextWord(line,'\n'); - if( name.contains(" -> ") ){ - link = true; ---- 814,822 ---- - group = temp.mid(temp.find('/')+1,temp.length()).toInt(); - size = nextWord(line).toLong(); - temp = nextWord(line); -! dateTime = nextWord(line) + "/" + month2Qstring(temp) + "/"; -! temp = nextWord(line); -! dateTime += nextWord(line) + " " + temp; - name = nextWord(line,'\n'); - if( name.contains(" -> ") ){ - link = true; diff --git a/x11-fm/krusader/files/patch-krusader::kmountman.cpp b/x11-fm/krusader/files/patch-krusader::kmountman.cpp deleted file mode 100644 index fdc2c1a1f5ca..000000000000 --- a/x11-fm/krusader/files/patch-krusader::kmountman.cpp +++ /dev/null @@ -1,268 +0,0 @@ -*** krusader/MountMan/kmountman.cpp.orig Sun Jul 28 22:36:55 2002 ---- krusader/MountMan/kmountman.cpp Thu Oct 24 12:01:13 2002 -*************** -*** 176,182 **** - --i; fstab.close(); // finished with it - for (j=0; j<=i; ++j) { - if (temp[0][j]=="" || temp[0][j]=="tmpfs" || temp[0][j]=="none" || temp[0][j]=="proc" || -! temp[0][j]=="swap" || temp[1][j]=="proc" || temp[1][j]=="/dev/pts" || - temp[1][j]=="swap" || temp[4][j]=="supermount") continue; - ++noOfFilesystems; - } ---- 176,182 ---- - --i; fstab.close(); // finished with it - for (j=0; j<=i; ++j) { - if (temp[0][j]=="" || temp[0][j]=="tmpfs" || temp[0][j]=="none" || temp[0][j]=="proc" || -! temp[0][j]=="swap" || temp[1][j]=="procfs" || temp[1][j]=="/dev/pts" || // FreeBSD: procfs instead of proc - temp[1][j]=="swap" || temp[4][j]=="supermount") continue; - ++noOfFilesystems; - } -*************** -*** 203,220 **** - } - } - kdDebug() << "Mt.Man: found the followning:\n" << forDebugOnly << "Trying DF..." << endl; - return true; - } - - // run DF process and when it finishes, catch output with "parseDfData" - /////////////////////////////////////////////////////////////////////// - void KMountMan::updateFilesystems() { -! // create the "df -P -T" process - tempFile = new KTempFile(); - tempFile->setAutoDelete(true); - dfProc.clearArguments(); - dfProc.setExecutable("df"); -! dfProc << "-T" << "-P" << ">" << tempFile->name(); - connect(&dfProc, SIGNAL(processExited(KProcess *)), this, - SLOT(finishUpdateFilesystems())); - dfProc.start(KProcess::NotifyOnExit); ---- 203,267 ---- - } - } - kdDebug() << "Mt.Man: found the followning:\n" << forDebugOnly << "Trying DF..." << endl; -+ -+ -+ // FreeBSD problem: df does not retrive fs type. -+ // Workaround: execute mount -p and merge result. -+ -+ KShellProcess proc; -+ proc << "mount -p"; -+ -+ // connect all outputs to collectOutput, to be displayed later -+ connect(&proc,SIGNAL(receivedStdout(KProcess*, char*, int)), -+ this,SLOT(collectOutput(KProcess*, char*,int))); -+ // launch -+ clearOutput(); -+ if (!proc.start(KProcess::Block,KProcess::Stdout)) { -+ KMessageBox::error(0, -+ i18n("Unable to execute 'mount -p' !!!")); -+ return true; -+ } -+ -+ QString str = getOutput(); -+ QTextStream t2(str, IO_ReadOnly); -+ while (!t2.atEnd()) { -+ s = t2.readLine(); -+ s = s.simplifyWhiteSpace(); // remove TABs -+ if (s==QString::null || s=="") continue; // skip empty lines in fstab -+ // temp[0]==name, temp[1]==type, temp[2]==mount point, temp[3]==options -+ // temp[4] is reserved for special cases, right now, only for supermount -+ QString temp0=nextWord(s,' '); -+ QString temp2=nextWord(s,' '); -+ QString temp1=nextWord(s,' '); -+ QString temp3=nextWord(s,' '); -+ if (temp0=="" || temp2=="/proc" || temp2=="/dev/pts" || -+ temp2=="swap" || temp0=="none" || temp0=="procfs" || -+ temp0=="swap" || location(temp0)) continue; -+ else { -+ fsData* system=new fsData(); -+ system->setName(temp0); -+ system->setType(temp1); -+ system->setMntPoint(temp2); -+ system->supermount=false; -+ system->options=temp3; -+ filesystems.append(system); -+ ++noOfFilesystems; -+ kdWarning() << "Mt.Man: filesystem [" << temp0 << "] found by mount -p is unlisted in /etc/fstab." << endl; -+ } -+ } -+ - return true; - } - - // run DF process and when it finishes, catch output with "parseDfData" - /////////////////////////////////////////////////////////////////////// - void KMountMan::updateFilesystems() { -! // create the "df" process // FreeBSD: df instead of df -T -P - tempFile = new KTempFile(); - tempFile->setAutoDelete(true); - dfProc.clearArguments(); - dfProc.setExecutable("df"); -! dfProc << ">" << tempFile->name(); // FreeBSD: df instead of df -T -P - connect(&dfProc, SIGNAL(processExited(KProcess *)), this, - SLOT(finishUpdateFilesystems())); - dfProc.start(KProcess::NotifyOnExit); -*************** -*** 244,250 **** - fsData* KMountMan::location(QString name) { - fsData* it; - for (it=filesystems.first() ; (it!=0) ; it=filesystems.next()) -! if (followLink(it->name())==followLink(name)) break; - return it; - } - ---- 291,300 ---- - fsData* KMountMan::location(QString name) { - fsData* it; - for (it=filesystems.first() ; (it!=0) ; it=filesystems.next()) -! { -! if (followLink(it->name())==followLink(name)) break; -! if (name.left(2) == "//" && !strcasecmp(followLink(it->name()).latin1(), followLink(name).latin1())) break; // FreeBSD: ignore case due to smbfs mounts -! } - return it; - } - -*************** -*** 336,341 **** ---- 386,392 ---- - temp=nextWord(s,' '); - // avoid adding unwanted filesystems to the list - if (temp=="tmpfs") continue; -+ if (temp == "procfs") continue;// FreeBSD: ignore procfs - temp=followLink(temp); // make sure DF gives us the true device and not a link - fsData* loc=location(temp); // where is the filesystem located in our list? - if (loc==0) { -*************** -*** 347,361 **** - else loc->setName("/dev/"+temp); - newFS=true; - } -! temp=nextWord(s,' '); // catch the TYPE - // is it supermounted ? -! if (temp=="supermount") loc->supermount=true; -! loc->setType(temp); -! if (loc->type()!=temp) { -! kdWarning() << "Mt.Man: according to DF, filesystem [" << loc->name() << -! "] has a different type from what's stated in /etc/fstab." << endl; -! loc->setType(temp); // DF knows best -! } - temp=nextWord(s,' '); - loc->setTotalBlks(temp.toLong()); - temp=nextWord(s,' '); ---- 398,412 ---- - else loc->setName("/dev/"+temp); - newFS=true; - } -! // temp=nextWord(s,' '); // catch the TYPE // FreeBSD: different df output - // is it supermounted ? -! //if (temp=="supermount") loc->supermount=true; -! //loc->setType(temp); -! //if (loc->type()!=temp) { -! // kdWarning() << "Mt.Man: according to DF, filesystem [" << loc->name() << -! // "] has a different type from what's stated in /etc/fstab." << endl; -! // loc->setType(temp); // DF knows best -! //} - temp=nextWord(s,' '); - loc->setTotalBlks(temp.toLong()); - temp=nextWord(s,' '); -*************** -*** 389,395 **** - Operational=Ready=false; - return; // if something went wrong, bail out! - } else Operational=true; // mountman is alive but not yet ready -! updateFilesystems(); // use the output of "DF -T -P" to update data - } - - void KMountMan::collectOutput(KProcess *p, char *buffer,int buflen) { ---- 440,446 ---- - Operational=Ready=false; - return; // if something went wrong, bail out! - } else Operational=true; // mountman is alive but not yet ready -! updateFilesystems(); // use the output of "DF" to update data // FreeBSD: df instead of df -T -P - } - - void KMountMan::collectOutput(KProcess *p, char *buffer,int buflen) { -*************** -*** 523,535 **** - KMessageBox::information(0,i18n("Error ejecting device ! You need to have 'eject' in your path."),i18n("Error"),"CantExecuteEjectWarning"); - } - - // returns true if the path is an ejectable mount point (at the moment CDROM) - bool KMountMan::ejectable(QString path) { -! fsData* it; -! for (it=filesystems.first() ; (it!=0) ; it=filesystems.next()) -! if (it->mntPoint()==path && -! (it->type()=="iso9660" || followLink(it->name()).left(2)=="cd")) -! return true; - return false; - } - ---- 574,587 ---- - KMessageBox::information(0,i18n("Error ejecting device ! You need to have 'eject' in your path."),i18n("Error"),"CantExecuteEjectWarning"); - } - -+ - // returns true if the path is an ejectable mount point (at the moment CDROM) - bool KMountMan::ejectable(QString path) { -! //fsData* it;// FreeBSD: no eject command -! //for (it=filesystems.first() ; (it!=0) ; it=filesystems.next()) -! // if (it->mntPoint()==path && -! // (it->type()=="iso9660" || followLink(it->name()).left(2)=="cd")) -! // return true; - return false; - } - -*************** -*** 537,544 **** - statsCollector::statsCollector(QString path, QObject *caller): QObject() { - QString stats; - connect(this, SIGNAL(gotStats(QString)), caller, SLOT(gotStats(QString))); -! if (path.left(5)=="/proc") { // /proc is a special case - no volume information -! stats=i18n("No space information on a [proc]"); - emit gotStats(stats); - return; - } ---- 589,596 ---- - statsCollector::statsCollector(QString path, QObject *caller): QObject() { - QString stats; - connect(this, SIGNAL(gotStats(QString)), caller, SLOT(gotStats(QString))); -! if (path.left(11)=="/dev/procfs") { // /dev/procfs is a special case - no volume information FreeBSD: procfs instead of proc -! stats=i18n("No space information on a [procfs]"); // FreeBSD: procfs instead of proc - emit gotStats(stats); - return; - } -*************** -*** 571,577 **** - QString s; - s = t.readLine(); // read the 1st line - it's trash for us - s = t.readLine(); // this is the important one! -! data->setName(KMountMan::nextWord(s,' ')); - data->setType(KMountMan::nextWord(s,' ')); - data->setTotalBlks( KMountMan::nextWord(s,' ').toLong() ); - data->setUsedBlks( KMountMan::nextWord(s,' ').toLong() ); ---- 623,629 ---- - QString s; - s = t.readLine(); // read the 1st line - it's trash for us - s = t.readLine(); // this is the important one! -! // data->setName(KMountMan::nextWord(s,' ')); FreeBSD: different df output format - data->setType(KMountMan::nextWord(s,' ')); - data->setTotalBlks( KMountMan::nextWord(s,' ').toLong() ); - data->setUsedBlks( KMountMan::nextWord(s,' ').toLong() ); -*************** -*** 587,593 **** - KShellProcess dfProc; - QString tmpFile = krApp->getTempFile(); - -! dfProc << "df" << "-T" << "-P" << "\""+path+"\"" << ">" << tmpFile; - dfProc.start(KProcess::Block); - parseDf(tmpFile, data); - QDir().remove(tmpFile); ---- 639,645 ---- - KShellProcess dfProc; - QString tmpFile = krApp->getTempFile(); - -! dfProc << "df" << "\""+path+"\"" << ">" << tmpFile; // FreeBSD: df instead of df -T -P - dfProc.start(KProcess::Block); - parseDf(tmpFile, data); - QDir().remove(tmpFile); diff --git a/x11-fm/krusader/files/patch-krusader::kmountmangui.cpp b/x11-fm/krusader/files/patch-krusader::kmountmangui.cpp deleted file mode 100644 index ece61d226126..000000000000 --- a/x11-fm/krusader/files/patch-krusader::kmountmangui.cpp +++ /dev/null @@ -1,19 +0,0 @@ -*** krusader/MountMan/kmountmangui.cpp.orig Mon Apr 15 20:49:42 2002 ---- krusader/MountMan/kmountmangui.cpp Thu Oct 24 12:42:12 2002 -*************** -*** 70,76 **** - // connections - connect(mountList,SIGNAL(doubleClicked(QListViewItem *)),this, - SLOT(doubleClicked(QListViewItem*))); -! connect(mountList,SIGNAL(rightButtonClicked(QListViewItem *, const QPoint &, int)), - this, SLOT(clicked(QListViewItem*))); - connect(mountList,SIGNAL(clicked(QListViewItem *)), this, - SLOT(changeActive(QListViewItem *))); ---- 70,76 ---- - // connections - connect(mountList,SIGNAL(doubleClicked(QListViewItem *)),this, - SLOT(doubleClicked(QListViewItem*))); -! connect(mountList,SIGNAL(rightButtonPressed(QListViewItem *, const QPoint &, int)), - this, SLOT(clicked(QListViewItem*))); - connect(mountList,SIGNAL(clicked(QListViewItem *)), this, - SLOT(changeActive(QListViewItem *))); diff --git a/x11-fm/krusader/pkg-plist b/x11-fm/krusader/pkg-plist index 2be24bcde5b7..0df7268cf998 100644 --- a/x11-fm/krusader/pkg-plist +++ b/x11-fm/krusader/pkg-plist @@ -112,7 +112,8 @@ share/locale/dk/LC_MESSAGES/krusader.mo share/locale/fr/LC_MESSAGES/krusader.mo share/locale/pl/LC_MESSAGES/krusader.mo share/locale/sv/LC_MESSAGES/krusader.mo -share/locale/es/LC_MESSAGES/krusader.mo +share/locale/it/LC_MESSAGES/krusader.mo +share/locale/jp/LC_MESSAGES/krusader.mo @dirrm share/doc/HTML/en/krusader @dirrm share/apps/krusader/icons/hicolor/16x16/actions @dirrm share/apps/krusader/icons/hicolor/16x16 diff --git a/x11-fm/krusader2/Makefile b/x11-fm/krusader2/Makefile index 3247914edbbc..eb93d7d3e4a4 100644 --- a/x11-fm/krusader2/Makefile +++ b/x11-fm/krusader2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= krusader -PORTVERSION= 1.11 +PORTVERSION= 1.20 CATEGORIES= x11-fm kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=krusader diff --git a/x11-fm/krusader2/distinfo b/x11-fm/krusader2/distinfo index 13fa856669c9..46f750d15e58 100644 --- a/x11-fm/krusader2/distinfo +++ b/x11-fm/krusader2/distinfo @@ -1 +1 @@ -MD5 (krusader-1.11.tar.gz) = 3450c67d2b7d5409fe82b7436b7b7204 +MD5 (krusader-1.20.tar.gz) = cc0d59ab5a8129b3bbbb329487ab1062 diff --git a/x11-fm/krusader2/files/patch-krusader::arc_vfs.cpp b/x11-fm/krusader2/files/patch-krusader::arc_vfs.cpp deleted file mode 100644 index fba19376a360..000000000000 --- a/x11-fm/krusader2/files/patch-krusader::arc_vfs.cpp +++ /dev/null @@ -1,22 +0,0 @@ -*** krusader/VFS/arc_vfs.cpp.orig Mon Apr 15 20:51:37 2002 ---- krusader/VFS/arc_vfs.cpp Thu Oct 24 12:01:13 2002 -*************** -*** 814,821 **** - group = temp.mid(temp.find('/')+1,temp.length()).toInt(); - size = nextWord(line).toLong(); - temp = nextWord(line); -! dateTime = temp.mid(8,2)+"/"+temp.mid(5,2)+"/"+temp.mid(2,2)+ -! " "+nextWord(line).left(5); - name = nextWord(line,'\n'); - if( name.contains(" -> ") ){ - link = true; ---- 814,822 ---- - group = temp.mid(temp.find('/')+1,temp.length()).toInt(); - size = nextWord(line).toLong(); - temp = nextWord(line); -! dateTime = nextWord(line) + "/" + month2Qstring(temp) + "/"; -! temp = nextWord(line); -! dateTime += nextWord(line) + " " + temp; - name = nextWord(line,'\n'); - if( name.contains(" -> ") ){ - link = true; diff --git a/x11-fm/krusader2/files/patch-krusader::kmountman.cpp b/x11-fm/krusader2/files/patch-krusader::kmountman.cpp deleted file mode 100644 index fdc2c1a1f5ca..000000000000 --- a/x11-fm/krusader2/files/patch-krusader::kmountman.cpp +++ /dev/null @@ -1,268 +0,0 @@ -*** krusader/MountMan/kmountman.cpp.orig Sun Jul 28 22:36:55 2002 ---- krusader/MountMan/kmountman.cpp Thu Oct 24 12:01:13 2002 -*************** -*** 176,182 **** - --i; fstab.close(); // finished with it - for (j=0; j<=i; ++j) { - if (temp[0][j]=="" || temp[0][j]=="tmpfs" || temp[0][j]=="none" || temp[0][j]=="proc" || -! temp[0][j]=="swap" || temp[1][j]=="proc" || temp[1][j]=="/dev/pts" || - temp[1][j]=="swap" || temp[4][j]=="supermount") continue; - ++noOfFilesystems; - } ---- 176,182 ---- - --i; fstab.close(); // finished with it - for (j=0; j<=i; ++j) { - if (temp[0][j]=="" || temp[0][j]=="tmpfs" || temp[0][j]=="none" || temp[0][j]=="proc" || -! temp[0][j]=="swap" || temp[1][j]=="procfs" || temp[1][j]=="/dev/pts" || // FreeBSD: procfs instead of proc - temp[1][j]=="swap" || temp[4][j]=="supermount") continue; - ++noOfFilesystems; - } -*************** -*** 203,220 **** - } - } - kdDebug() << "Mt.Man: found the followning:\n" << forDebugOnly << "Trying DF..." << endl; - return true; - } - - // run DF process and when it finishes, catch output with "parseDfData" - /////////////////////////////////////////////////////////////////////// - void KMountMan::updateFilesystems() { -! // create the "df -P -T" process - tempFile = new KTempFile(); - tempFile->setAutoDelete(true); - dfProc.clearArguments(); - dfProc.setExecutable("df"); -! dfProc << "-T" << "-P" << ">" << tempFile->name(); - connect(&dfProc, SIGNAL(processExited(KProcess *)), this, - SLOT(finishUpdateFilesystems())); - dfProc.start(KProcess::NotifyOnExit); ---- 203,267 ---- - } - } - kdDebug() << "Mt.Man: found the followning:\n" << forDebugOnly << "Trying DF..." << endl; -+ -+ -+ // FreeBSD problem: df does not retrive fs type. -+ // Workaround: execute mount -p and merge result. -+ -+ KShellProcess proc; -+ proc << "mount -p"; -+ -+ // connect all outputs to collectOutput, to be displayed later -+ connect(&proc,SIGNAL(receivedStdout(KProcess*, char*, int)), -+ this,SLOT(collectOutput(KProcess*, char*,int))); -+ // launch -+ clearOutput(); -+ if (!proc.start(KProcess::Block,KProcess::Stdout)) { -+ KMessageBox::error(0, -+ i18n("Unable to execute 'mount -p' !!!")); -+ return true; -+ } -+ -+ QString str = getOutput(); -+ QTextStream t2(str, IO_ReadOnly); -+ while (!t2.atEnd()) { -+ s = t2.readLine(); -+ s = s.simplifyWhiteSpace(); // remove TABs -+ if (s==QString::null || s=="") continue; // skip empty lines in fstab -+ // temp[0]==name, temp[1]==type, temp[2]==mount point, temp[3]==options -+ // temp[4] is reserved for special cases, right now, only for supermount -+ QString temp0=nextWord(s,' '); -+ QString temp2=nextWord(s,' '); -+ QString temp1=nextWord(s,' '); -+ QString temp3=nextWord(s,' '); -+ if (temp0=="" || temp2=="/proc" || temp2=="/dev/pts" || -+ temp2=="swap" || temp0=="none" || temp0=="procfs" || -+ temp0=="swap" || location(temp0)) continue; -+ else { -+ fsData* system=new fsData(); -+ system->setName(temp0); -+ system->setType(temp1); -+ system->setMntPoint(temp2); -+ system->supermount=false; -+ system->options=temp3; -+ filesystems.append(system); -+ ++noOfFilesystems; -+ kdWarning() << "Mt.Man: filesystem [" << temp0 << "] found by mount -p is unlisted in /etc/fstab." << endl; -+ } -+ } -+ - return true; - } - - // run DF process and when it finishes, catch output with "parseDfData" - /////////////////////////////////////////////////////////////////////// - void KMountMan::updateFilesystems() { -! // create the "df" process // FreeBSD: df instead of df -T -P - tempFile = new KTempFile(); - tempFile->setAutoDelete(true); - dfProc.clearArguments(); - dfProc.setExecutable("df"); -! dfProc << ">" << tempFile->name(); // FreeBSD: df instead of df -T -P - connect(&dfProc, SIGNAL(processExited(KProcess *)), this, - SLOT(finishUpdateFilesystems())); - dfProc.start(KProcess::NotifyOnExit); -*************** -*** 244,250 **** - fsData* KMountMan::location(QString name) { - fsData* it; - for (it=filesystems.first() ; (it!=0) ; it=filesystems.next()) -! if (followLink(it->name())==followLink(name)) break; - return it; - } - ---- 291,300 ---- - fsData* KMountMan::location(QString name) { - fsData* it; - for (it=filesystems.first() ; (it!=0) ; it=filesystems.next()) -! { -! if (followLink(it->name())==followLink(name)) break; -! if (name.left(2) == "//" && !strcasecmp(followLink(it->name()).latin1(), followLink(name).latin1())) break; // FreeBSD: ignore case due to smbfs mounts -! } - return it; - } - -*************** -*** 336,341 **** ---- 386,392 ---- - temp=nextWord(s,' '); - // avoid adding unwanted filesystems to the list - if (temp=="tmpfs") continue; -+ if (temp == "procfs") continue;// FreeBSD: ignore procfs - temp=followLink(temp); // make sure DF gives us the true device and not a link - fsData* loc=location(temp); // where is the filesystem located in our list? - if (loc==0) { -*************** -*** 347,361 **** - else loc->setName("/dev/"+temp); - newFS=true; - } -! temp=nextWord(s,' '); // catch the TYPE - // is it supermounted ? -! if (temp=="supermount") loc->supermount=true; -! loc->setType(temp); -! if (loc->type()!=temp) { -! kdWarning() << "Mt.Man: according to DF, filesystem [" << loc->name() << -! "] has a different type from what's stated in /etc/fstab." << endl; -! loc->setType(temp); // DF knows best -! } - temp=nextWord(s,' '); - loc->setTotalBlks(temp.toLong()); - temp=nextWord(s,' '); ---- 398,412 ---- - else loc->setName("/dev/"+temp); - newFS=true; - } -! // temp=nextWord(s,' '); // catch the TYPE // FreeBSD: different df output - // is it supermounted ? -! //if (temp=="supermount") loc->supermount=true; -! //loc->setType(temp); -! //if (loc->type()!=temp) { -! // kdWarning() << "Mt.Man: according to DF, filesystem [" << loc->name() << -! // "] has a different type from what's stated in /etc/fstab." << endl; -! // loc->setType(temp); // DF knows best -! //} - temp=nextWord(s,' '); - loc->setTotalBlks(temp.toLong()); - temp=nextWord(s,' '); -*************** -*** 389,395 **** - Operational=Ready=false; - return; // if something went wrong, bail out! - } else Operational=true; // mountman is alive but not yet ready -! updateFilesystems(); // use the output of "DF -T -P" to update data - } - - void KMountMan::collectOutput(KProcess *p, char *buffer,int buflen) { ---- 440,446 ---- - Operational=Ready=false; - return; // if something went wrong, bail out! - } else Operational=true; // mountman is alive but not yet ready -! updateFilesystems(); // use the output of "DF" to update data // FreeBSD: df instead of df -T -P - } - - void KMountMan::collectOutput(KProcess *p, char *buffer,int buflen) { -*************** -*** 523,535 **** - KMessageBox::information(0,i18n("Error ejecting device ! You need to have 'eject' in your path."),i18n("Error"),"CantExecuteEjectWarning"); - } - - // returns true if the path is an ejectable mount point (at the moment CDROM) - bool KMountMan::ejectable(QString path) { -! fsData* it; -! for (it=filesystems.first() ; (it!=0) ; it=filesystems.next()) -! if (it->mntPoint()==path && -! (it->type()=="iso9660" || followLink(it->name()).left(2)=="cd")) -! return true; - return false; - } - ---- 574,587 ---- - KMessageBox::information(0,i18n("Error ejecting device ! You need to have 'eject' in your path."),i18n("Error"),"CantExecuteEjectWarning"); - } - -+ - // returns true if the path is an ejectable mount point (at the moment CDROM) - bool KMountMan::ejectable(QString path) { -! //fsData* it;// FreeBSD: no eject command -! //for (it=filesystems.first() ; (it!=0) ; it=filesystems.next()) -! // if (it->mntPoint()==path && -! // (it->type()=="iso9660" || followLink(it->name()).left(2)=="cd")) -! // return true; - return false; - } - -*************** -*** 537,544 **** - statsCollector::statsCollector(QString path, QObject *caller): QObject() { - QString stats; - connect(this, SIGNAL(gotStats(QString)), caller, SLOT(gotStats(QString))); -! if (path.left(5)=="/proc") { // /proc is a special case - no volume information -! stats=i18n("No space information on a [proc]"); - emit gotStats(stats); - return; - } ---- 589,596 ---- - statsCollector::statsCollector(QString path, QObject *caller): QObject() { - QString stats; - connect(this, SIGNAL(gotStats(QString)), caller, SLOT(gotStats(QString))); -! if (path.left(11)=="/dev/procfs") { // /dev/procfs is a special case - no volume information FreeBSD: procfs instead of proc -! stats=i18n("No space information on a [procfs]"); // FreeBSD: procfs instead of proc - emit gotStats(stats); - return; - } -*************** -*** 571,577 **** - QString s; - s = t.readLine(); // read the 1st line - it's trash for us - s = t.readLine(); // this is the important one! -! data->setName(KMountMan::nextWord(s,' ')); - data->setType(KMountMan::nextWord(s,' ')); - data->setTotalBlks( KMountMan::nextWord(s,' ').toLong() ); - data->setUsedBlks( KMountMan::nextWord(s,' ').toLong() ); ---- 623,629 ---- - QString s; - s = t.readLine(); // read the 1st line - it's trash for us - s = t.readLine(); // this is the important one! -! // data->setName(KMountMan::nextWord(s,' ')); FreeBSD: different df output format - data->setType(KMountMan::nextWord(s,' ')); - data->setTotalBlks( KMountMan::nextWord(s,' ').toLong() ); - data->setUsedBlks( KMountMan::nextWord(s,' ').toLong() ); -*************** -*** 587,593 **** - KShellProcess dfProc; - QString tmpFile = krApp->getTempFile(); - -! dfProc << "df" << "-T" << "-P" << "\""+path+"\"" << ">" << tmpFile; - dfProc.start(KProcess::Block); - parseDf(tmpFile, data); - QDir().remove(tmpFile); ---- 639,645 ---- - KShellProcess dfProc; - QString tmpFile = krApp->getTempFile(); - -! dfProc << "df" << "\""+path+"\"" << ">" << tmpFile; // FreeBSD: df instead of df -T -P - dfProc.start(KProcess::Block); - parseDf(tmpFile, data); - QDir().remove(tmpFile); diff --git a/x11-fm/krusader2/files/patch-krusader::kmountmangui.cpp b/x11-fm/krusader2/files/patch-krusader::kmountmangui.cpp deleted file mode 100644 index ece61d226126..000000000000 --- a/x11-fm/krusader2/files/patch-krusader::kmountmangui.cpp +++ /dev/null @@ -1,19 +0,0 @@ -*** krusader/MountMan/kmountmangui.cpp.orig Mon Apr 15 20:49:42 2002 ---- krusader/MountMan/kmountmangui.cpp Thu Oct 24 12:42:12 2002 -*************** -*** 70,76 **** - // connections - connect(mountList,SIGNAL(doubleClicked(QListViewItem *)),this, - SLOT(doubleClicked(QListViewItem*))); -! connect(mountList,SIGNAL(rightButtonClicked(QListViewItem *, const QPoint &, int)), - this, SLOT(clicked(QListViewItem*))); - connect(mountList,SIGNAL(clicked(QListViewItem *)), this, - SLOT(changeActive(QListViewItem *))); ---- 70,76 ---- - // connections - connect(mountList,SIGNAL(doubleClicked(QListViewItem *)),this, - SLOT(doubleClicked(QListViewItem*))); -! connect(mountList,SIGNAL(rightButtonPressed(QListViewItem *, const QPoint &, int)), - this, SLOT(clicked(QListViewItem*))); - connect(mountList,SIGNAL(clicked(QListViewItem *)), this, - SLOT(changeActive(QListViewItem *))); diff --git a/x11-fm/krusader2/pkg-plist b/x11-fm/krusader2/pkg-plist index 2be24bcde5b7..0df7268cf998 100644 --- a/x11-fm/krusader2/pkg-plist +++ b/x11-fm/krusader2/pkg-plist @@ -112,7 +112,8 @@ share/locale/dk/LC_MESSAGES/krusader.mo share/locale/fr/LC_MESSAGES/krusader.mo share/locale/pl/LC_MESSAGES/krusader.mo share/locale/sv/LC_MESSAGES/krusader.mo -share/locale/es/LC_MESSAGES/krusader.mo +share/locale/it/LC_MESSAGES/krusader.mo +share/locale/jp/LC_MESSAGES/krusader.mo @dirrm share/doc/HTML/en/krusader @dirrm share/apps/krusader/icons/hicolor/16x16/actions @dirrm share/apps/krusader/icons/hicolor/16x16 -- cgit v1.2.3