cvs commit: patches/kdebase kdebase-3.1.3-kwrited-1.patch kdebase-3.1.4-kwrited-1.patch kdebase-3.1.4-rundialog-1.patch kdebase-3.1.4-smbmount-1.patch kdebase-3.2.0-smbmount-1.patch kdebase-3.1.3-kwrited.patch kdebase-3.1.4-kwrited.patch kdebase-3.1.4-rundialog.patch kdebase-3.1.4-smbmount.patch kdebase-3.2.0-smbmount.patch

jim at linuxfromscratch.org jim at linuxfromscratch.org
Mon Jun 7 10:32:36 PDT 2004


jim         04/06/07 11:32:36

  Added:       kdebase  kdebase-3.1.3-kwrited-1.patch
                        kdebase-3.1.4-kwrited-1.patch
                        kdebase-3.1.4-rundialog-1.patch
                        kdebase-3.1.4-smbmount-1.patch
                        kdebase-3.2.0-smbmount-1.patch
  Removed:     kdebase  kdebase-3.1.3-kwrited.patch
                        kdebase-3.1.4-kwrited.patch
                        kdebase-3.1.4-rundialog.patch
                        kdebase-3.1.4-smbmount.patch
                        kdebase-3.2.0-smbmount.patch
  Log:
  Naming Scheme Update
  
  Revision  Changes    Path
  1.1                  patches/kdebase/kdebase-3.1.3-kwrited-1.patch
  
  Index: kdebase-3.1.3-kwrited-1.patch
  ===================================================================
  Submitted By: Alexander E. Patrakov (semzx at newmail dot ru)
  Date: 2003-08-13
  Initial Package Version: 3.1.3
  Origin: Alexander E. Patrakov
  Description: Allows the user to copy text from kwrited message window 
  and clear that window. Fixes a FIXME.
  Applies to only those people who have the "utempter" program.
  
  diff -ur kdebase-3.1.3/konsole/konsole/kwrited.cpp kdebase-3.1.3.tweaked/konsole/konsole/kwrited.cpp
  --- kdebase-3.1.3/konsole/konsole/kwrited.cpp	2003-05-07 17:44:16.000000000 +0600
  +++ kdebase-3.1.3.tweaked/konsole/konsole/kwrited.cpp	2003-07-30 20:02:42.000000000 +0600
  @@ -41,7 +41,7 @@
     wid->setFont(KGlobalSettings::fixedFont());
     wid->setMinimumWidth(wid->fontMetrics().maxWidth()*80 +
         wid->minimumSizeHint().width());
  -  wid->setReadOnly(true);
  +  wid->setReadOnly(false);
     wid->setFocusPolicy(QWidget::NoFocus);
   
     pty = new TEPty();
  
  
  
  1.1                  patches/kdebase/kdebase-3.1.4-kwrited-1.patch
  
  Index: kdebase-3.1.4-kwrited-1.patch
  ===================================================================
  Submitted By: Alexander E. Patrakov (semzx at newmail dot ru)
  Origin: Alexander E. Patrakov
  Date: 2003-09-28
  Initial Package Version: 3.1.3
  Description: Allows the user to copy text from kwrited message window
  and clear that window. Fixes a FIXME.
  Applies to only those people who have the "utempter" program.
  
  diff -ur kdebase-3.1.4/konsole/konsole/kwrited.cpp kdebase-3.1.4.tweaked/konsole/konsole/kwrited.cpp
  --- kdebase-3.1.4/konsole/konsole/kwrited.cpp	2003-05-07 17:44:16.000000000 +0600
  +++ kdebase-3.1.4.tweaked/konsole/konsole/kwrited.cpp	2003-09-28 14:56:46.000000000 +0600
  @@ -41,7 +41,7 @@
     wid->setFont(KGlobalSettings::fixedFont());
     wid->setMinimumWidth(wid->fontMetrics().maxWidth()*80 +
         wid->minimumSizeHint().width());
  -  wid->setReadOnly(true);
  +  wid->setReadOnly(false);
     wid->setFocusPolicy(QWidget::NoFocus);
   
     pty = new TEPty();
  @@ -75,6 +75,9 @@
     // Remove CR
     while ( (i = str.find('\r')) != -1)
        str.remove(i,1);
  +  // Remove BEL
  +  while ( (i = str.find('\a')) != -1)
  +     str.remove(i,1);
     wid->insert( str );
     wid->show();
     XRaiseWindow( wid->x11Display(), wid->winId());
  
  
  
  1.1                  patches/kdebase/kdebase-3.1.4-rundialog-1.patch
  
  Index: kdebase-3.1.4-rundialog-1.patch
  ===================================================================
  Submitted By: Alexander E. Patrakov (semzx at newmail dot ru)
  Origin: Alexander E. Patrakov
  Date: 2003-09-28
  Initial Package Version: 3.1.4
  Description: When kdebase is compiled against Qt 3.2.x, the "Run Command"
  dialog has wrong size (looks like the bottom is cut). This patch fixes
  this problem. Don't ask me how it works - I just noticed that in KDE CVS HEAD
  QVBoxLayout is used instead of QGridLayout. Maybe this is a bug in Qt.
  Applies to only those people who built Qt 3.2.x.
  
  
  diff -ur kdebase-3.1.4.orig/kdesktop/minicli.cpp kdebase-3.1.4/kdesktop/minicli.cpp
  --- kdebase-3.1.4.orig/kdesktop/minicli.cpp	2003-09-01 17:31:16.000000000 +0600
  +++ kdebase-3.1.4/kdesktop/minicli.cpp	2003-09-28 20:37:27.000000000 +0600
  @@ -51,8 +51,8 @@
   Minicli::Minicli( QWidget *parent, const char *name)
           :KDialog( parent, name )
   {
  -    m_vbox = new QGridLayout( this, 4, 1, KDialog::marginHint(),
  -                                         KDialog::spacingHint() );
  +    m_vbox = new QVBoxLayout( this, KDialog::marginHint(),
  +                              KDialog::spacingHint() );
       m_vbox->setResizeMode( QLayout::Fixed );
       KWin::setIcons( winId(), DesktopIcon("run"), SmallIcon("run") );
       setCaption( i18n("Run Command") );
  diff -ur kdebase-3.1.4.orig/kdesktop/minicli.h kdebase-3.1.4/kdesktop/minicli.h
  --- kdebase-3.1.4.orig/kdesktop/minicli.h	2003-09-01 17:31:17.000000000 +0600
  +++ kdebase-3.1.4/kdesktop/minicli.h	2003-09-28 20:15:42.000000000 +0600
  @@ -78,7 +78,7 @@
       KURIFilterData* m_filterData;
       QWidget* m_FocusWidget;
       QPushButton* m_btnRun;
  -    QGridLayout *m_vbox;
  +    QVBoxLayout *m_vbox;
       QStringList terminalAppList;
   
       QStringList middleFilters;
  
  
  
  1.1                  patches/kdebase/kdebase-3.1.4-smbmount-1.patch
  
  Index: kdebase-3.1.4-smbmount-1.patch
  ===================================================================
  Submitted By: Alexander E. Patrakov (semzx at newmail dot ru)
  Origin: Alexander E. Patrakov
  Date: 2003-09-27
  Initial Package Version: 3.1.3
  Description: implement the logic in the smb kioslave to make smbmounter from
  kdeaddons work with this kioslave. Earlier it worked with smbro ioslave only.
  Patch also applies to KDE 3.1.4
  Notes:
  1) Sorry for the "char samba3_corrupts_memory_here[4096]" hack.
  Please help debugging.
  2) The password is passed as an argument to smbmount. Beware!
  (This is also true for smbro)
  
  diff -ur kdebase-3.1.4.orig/kioslave/smb/kio_smb.h kdebase-3.1.4/kioslave/smb/kio_smb.h
  --- kdebase-3.1.4.orig/kioslave/smb/kio_smb.h	2003-09-09 00:40:26.000000000 +0600
  +++ kdebase-3.1.4/kioslave/smb/kio_smb.h	2003-09-27 12:51:02.000000000 +0600
  @@ -267,6 +267,7 @@
       void readOutput(KProcess *proc, char *buffer, int buflen);
   
   private:
  +    char samba3_corrupts_memory_here[4096];
       QString mybuf;
   
   };
  diff -ur kdebase-3.1.4.orig/kioslave/smb/kio_smb_mount.cpp kdebase-3.1.4/kioslave/smb/kio_smb_mount.cpp
  --- kdebase-3.1.4.orig/kioslave/smb/kio_smb_mount.cpp	2003-06-24 12:29:58.000000000 +0600
  +++ kdebase-3.1.4/kioslave/smb/kio_smb_mount.cpp	2003-09-27 13:00:31.000000000 +0600
  @@ -54,7 +54,7 @@
            }
   
            if (tmp==3) {
  -             if (!KStandardDirs::makeDir(mountPoint)) {
  +             if (!KStandardDirs::makeDir(mountPoint,0700)) {
                    error(KIO::ERR_COULD_NOT_MKDIR, mountPoint);
                    return;
                }
  @@ -62,11 +62,12 @@
            mybuf.truncate(0);
   
            KProcess proc;
  -         proc << "mount";
  -         proc << "-o guest";
  -         proc << "-t smbfs";
  +         proc << "smbmount";
            proc << remotePath.local8Bit();
            proc << mountPoint.local8Bit();
  +         QString autharg = "-o username=" + user;
  +         autharg += ",password=" + password;
  +         proc << autharg.local8Bit();
            connect(&proc, SIGNAL( receivedStdout(KProcess *, char *, int )),
                    SLOT(readOutput(KProcess *, char *, int)));
   
  @@ -85,47 +86,22 @@
      case 2:
      case 4:
         {
  -/*         QString mountPoint;
  +         QString mountPoint;
            stream >> mountPoint;
  -         ClientProcess proc;
  -         QCStringList args;
  -         args<<mountPoint.local8Bit();
  -         if (!proc.start("smbumount",args))
  +         KProcess proc;
  +         proc<<"smbumount";
  +         proc<<mountPoint.local8Bit();
  +         mybuf.truncate(0);
  +         connect(&proc, SIGNAL( receivedStdout(KProcess *, char *, int )),
  +                 SLOT(readOutput(KProcess *, char *, int)));
  +         if (!proc.start(KProcess::Block, KProcess::AllOutput))
            {
               error( KIO::ERR_CANNOT_LAUNCH_PROCESS, "smbumount"+i18n("\nMake sure that the samba package is installed properly on your system."));
               return;
            }
  -         clearBuffer();
  -         while (1)  //until smbumount exits
  -         {
  -            bool stdoutEvent;
  -            proc.select(1,0,&stdoutEvent);
  -            int exitStatus=proc.exited();
  -            if (exitStatus!=-1)
  -            {
  -               kdDebug(KIO_SMB)<<"Smb::waitUntilStarted() smbclient exited with exitcode "<<exitStatus<<endl;
  -               if (tmp==4)
  -               {
  -                  QDir dir(mountPoint);
  -                  dir.cdUp();
  -                  dir.rmdir(mountPoint);
  -                  QString p=dir.path();
  -                  dir.cdUp();
  -                  dir.rmdir(p);
  -               }
  -               if (exitStatus!=0)
  -               {
  -                  if (m_stdoutSize>0)
  -                     kdDebug(KIO_SMB)<<"Smb::waitUntilStarted(): received: -"<<m_stdoutBuffer<<"-"<<endl;
  -                  error( KIO::ERR_CANNOT_LAUNCH_PROCESS, "smbumount");
  -               }
  -               else
  -                  finished();
  -               return;
  -            }
  -            if (stdoutEvent)
  -               readOutput(proc.fd());
  -               }*/
  +         if (proc.exitStatus() != 0) {
  +             error( KIO::ERR_COULD_NOT_UNMOUNT, mybuf);
  +         }
         }
         break;
      default:
  
  
  
  1.1                  patches/kdebase/kdebase-3.2.0-smbmount-1.patch
  
  Index: kdebase-3.2.0-smbmount-1.patch
  ===================================================================
  Submitted By: Alexander E. Patrakov (semzx at newmail dot ru)
  Origin: Alexander E. Patrakov
  Date: 2003-09-27
  Initial Package Version: 3.1.3
  Description: implement the logic in the smb kioslave to make smbmounter from
  kdeaddons work with this kioslave. Earlier it worked with smbro ioslave only.
  Patch also applies to KDE 3.1.4
  Notes:
  1) Sorry for the "char samba3_corrupts_memory_here[4096]" hack.
  Please help debugging.
  2) The password is passed as an argument to smbmount. Beware!
  (This is also true for smbro)
  
  diff -ur kdebase-3.1.4.orig/kioslave/smb/kio_smb.h kdebase-3.1.4/kioslave/smb/kio_smb.h
  --- kdebase-3.1.4.orig/kioslave/smb/kio_smb.h	2003-09-09 00:40:26.000000000 +0600
  +++ kdebase-3.1.4/kioslave/smb/kio_smb.h	2003-09-27 12:51:02.000000000 +0600
  @@ -267,6 +267,7 @@
       void readOutput(KProcess *proc, char *buffer, int buflen);
   
   private:
  +    char samba3_corrupts_memory_here[4096];
       QString mybuf;
   
   };
  diff -ur kdebase-3.1.4.orig/kioslave/smb/kio_smb_mount.cpp kdebase-3.1.4/kioslave/smb/kio_smb_mount.cpp
  --- kdebase-3.1.4.orig/kioslave/smb/kio_smb_mount.cpp	2003-06-24 12:29:58.000000000 +0600
  +++ kdebase-3.1.4/kioslave/smb/kio_smb_mount.cpp	2003-09-27 13:00:31.000000000 +0600
  @@ -54,7 +54,7 @@
            }
   
            if (tmp==3) {
  -             if (!KStandardDirs::makeDir(mountPoint)) {
  +             if (!KStandardDirs::makeDir(mountPoint,0700)) {
                    error(KIO::ERR_COULD_NOT_MKDIR, mountPoint);
                    return;
                }
  @@ -62,11 +62,12 @@
            mybuf.truncate(0);
   
            KProcess proc;
  -         proc << "mount";
  -         proc << "-o guest";
  -         proc << "-t smbfs";
  +         proc << "smbmount";
            proc << remotePath.local8Bit();
            proc << mountPoint.local8Bit();
  +         QString autharg = "-o username=" + user;
  +         autharg += ",password=" + password;
  +         proc << autharg.local8Bit();
            connect(&proc, SIGNAL( receivedStdout(KProcess *, char *, int )),
                    SLOT(readOutput(KProcess *, char *, int)));
   
  @@ -85,47 +86,22 @@
      case 2:
      case 4:
         {
  -/*         QString mountPoint;
  +         QString mountPoint;
            stream >> mountPoint;
  -         ClientProcess proc;
  -         QCStringList args;
  -         args<<mountPoint.local8Bit();
  -         if (!proc.start("smbumount",args))
  +         KProcess proc;
  +         proc<<"smbumount";
  +         proc<<mountPoint.local8Bit();
  +         mybuf.truncate(0);
  +         connect(&proc, SIGNAL( receivedStdout(KProcess *, char *, int )),
  +                 SLOT(readOutput(KProcess *, char *, int)));
  +         if (!proc.start(KProcess::Block, KProcess::AllOutput))
            {
               error( KIO::ERR_CANNOT_LAUNCH_PROCESS, "smbumount"+i18n("\nMake sure that the samba package is installed properly on your system."));
               return;
            }
  -         clearBuffer();
  -         while (1)  //until smbumount exits
  -         {
  -            bool stdoutEvent;
  -            proc.select(1,0,&stdoutEvent);
  -            int exitStatus=proc.exited();
  -            if (exitStatus!=-1)
  -            {
  -               kdDebug(KIO_SMB)<<"Smb::waitUntilStarted() smbclient exited with exitcode "<<exitStatus<<endl;
  -               if (tmp==4)
  -               {
  -                  QDir dir(mountPoint);
  -                  dir.cdUp();
  -                  dir.rmdir(mountPoint);
  -                  QString p=dir.path();
  -                  dir.cdUp();
  -                  dir.rmdir(p);
  -               }
  -               if (exitStatus!=0)
  -               {
  -                  if (m_stdoutSize>0)
  -                     kdDebug(KIO_SMB)<<"Smb::waitUntilStarted(): received: -"<<m_stdoutBuffer<<"-"<<endl;
  -                  error( KIO::ERR_CANNOT_LAUNCH_PROCESS, "smbumount");
  -               }
  -               else
  -                  finished();
  -               return;
  -            }
  -            if (stdoutEvent)
  -               readOutput(proc.fd());
  -               }*/
  +         if (proc.exitStatus() != 0) {
  +             error( KIO::ERR_COULD_NOT_UNMOUNT, mybuf);
  +         }
         }
         break;
      default:
  
  
  



More information about the patches mailing list