Hello community, here is the log from the commit of package kdeutils3 checked in at Tue Nov 27 18:31:55 CET 2007. -------- --- KDE/kdeutils3/kdeutils3.changes 2007-10-15 17:36:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdeutils3/kdeutils3.changes 2007-11-27 15:15:57.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 27 15:15:24 CET 2007 - stbinner@suse.de + +- fix Ark decoding problems (#337117) + +------------------------------------------------------------------- New: ---- 3_5_BRANCH.diff ark-decoding.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeutils3.spec ++++++ --- /var/tmp/diff_new_pack.Du5352/_old 2007-11-27 18:30:39.000000000 +0100 +++ /var/tmp/diff_new_pack.Du5352/_new 2007-11-27 18:30:39.000000000 +0100 @@ -28,14 +28,15 @@ Url: http://www.kde.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 3.5.8 -Release: 1 +Release: 18 Source0: kdeutils-%{version}.tar.bz2 -#Patch0: 3_5_BRANCH.diff +Patch0: 3_5_BRANCH.diff Patch2: klaptop.diff Patch5: disable-nonsense-security-check.diff Patch11: ppc.dif Patch12: kfloppy.dif Patch13: FIXME.diff +Patch14: ark-decoding.diff %description A couple of utility programs for KDE. @@ -121,13 +122,14 @@ %prep %setup -q -n kdeutils-%{version} -#%patch0 +%patch0 %patch2 %patch5 %ifarch ppc ppc64 %patch11 %endif %patch13 +%patch14 %ifarch s390 s390x rm -rf kfloppy doc/kfloppy %endif @@ -345,7 +347,10 @@ /opt/kde3/include/kmultiformlistbox* /opt/kde3/include/ksim /opt/kde3/include/kwidgetstreamer.h + %changelog +* Tue Nov 27 2007 - stbinner@suse.de +- fix Ark decoding problems (#337117) * Tue Oct 09 2007 - stbinner@suse.de - update to 3.5.8: bug fixes in KFloppy and klaptopdaemon * Fri Sep 21 2007 - stbinner@suse.de ++++++ 3_5_BRANCH.diff ++++++ package: kdeutils-3.5.8.tar.bz2 kdemod: kdeutils current HEAD: 742203 svn di between /tags/KDE/3.5.8 and /branches/KDE//branches/KDE/3.5 --- charselectapplet/kcharselectapplet.desktop (revision 742204) +++ charselectapplet/kcharselectapplet.desktop (revision 742204) @@ -12,6 +12,7 @@ Name[da]=Tegnvælger Name[de]=Tabelle zur Zeichenauswahl Name[el]=Επιλογέας χαρακτήρων +Name[eo]=Elektilo por signoj Name[es]=Selector de caracteres Name[et]=Sümbolite valija Name[eu]=Karaktere autatzailea --- kfloppy/format.cpp (revision 742204) +++ kfloppy/format.cpp (revision 742204) @@ -165,15 +165,15 @@ // #ifdef ANY_LINUX -const char *fd0H1440[] = { "/dev/fd0u1440", "/dev/floppy/0u1440", "/dev/fd0h1440", "/dev/fd0H1440", 0L } ; -const char *fd0D720[] = { "/dev/fd0u720", "/dev/floppy/0u720", "/dev/fd0D720", "/dev/fd0h720", 0L }; -const char *fd0h1200[] = { "/dev/fd0h1200", "/dev/floppy/0h1200", 0L }; -const char *fd0h360[] = { "/dev/fd0u360", "/dev/floppy/0u360", "/dev/fd0h360", "/dev/fd0d360", 0L }; - -const char *fd1H1440[] = { "/dev/fd1u1440", "/dev/floppy/1u1440","/dev/fd1h1440", "/dev/fd1H1440", 0L } ; -const char *fd1D720[] = { "/dev/fd1u720", "/dev/floppy/1u720", "/dev/fd1D720", "/dev/fd1h720", 0L }; -const char *fd1h1200[] = { "/dev/fd1h1200", "/dev/floppy/1h1200", 0L }; -const char *fd1h360[] = { "/dev/fd1u360", "/dev/floppy/1u360","/dev/fd1h360", "/dev/fd1d360", 0L }; +const char *fd0H1440[] = { "/dev/fd0u1440", "/dev/floppy/0u1440", "/dev/fd0h1440", "/dev/fd0H1440", "/dev/fd0", 0L } ; +const char *fd0D720[] = { "/dev/fd0u720", "/dev/floppy/0u720", "/dev/fd0D720", "/dev/fd0h720", "/dev/fd0", 0L }; +const char *fd0h1200[] = { "/dev/fd0h1200", "/dev/floppy/0h1200", "/dev/fd0", 0L }; +const char *fd0h360[] = { "/dev/fd0u360", "/dev/floppy/0u360", "/dev/fd0h360", "/dev/fd0d360", "/dev/fd0", 0L }; + +const char *fd1H1440[] = { "/dev/fd1u1440", "/dev/floppy/1u1440","/dev/fd1h1440", "/dev/fd1H1440", "/dev/fd1", 0L } ; +const char *fd1D720[] = { "/dev/fd1u720", "/dev/floppy/1u720", "/dev/fd1D720", "/dev/fd1h720", "/dev/fd1", 0L }; +const char *fd1h1200[] = { "/dev/fd1h1200", "/dev/floppy/1h1200", "/dev/fd1", 0L }; +const char *fd1h360[] = { "/dev/fd1u360", "/dev/floppy/1u360","/dev/fd1h360", "/dev/fd1d360", "/dev/fd1", 0L }; const char *fd0auto[] = { "/dev/fd0", 0L }; const char *fd1auto[] = { "/dev/fd1", 0L }; --- kgpg/kgpg.desktop (revision 742204) +++ kgpg/kgpg.desktop (revision 742204) @@ -17,6 +17,7 @@ GenericName[da]=Krypteringsværktøj GenericName[de]=Verschlüsselungsprogramm GenericName[el]=Εργαλείο κρυπτογράφησης +GenericName[eo]=Ilo por Ĉifrado GenericName[es]=Herramienta de cifrado GenericName[et]=Krüptimisvahend GenericName[eu]=Zifraketa Tresna @@ -66,6 +67,7 @@ Comment[da]=En GnuPG-forende Comment[de]=Eine Benutzeroberfläche für GnuPG Comment[el]=Λογισμικό κρυπτογράφησης (GnuPG) +Comment[eo]=Fasado por GnuPG Comment[es]=Interfaz para GnuPG Comment[et]=GnuPG kasutajaliides Comment[eu]=GnuPGren bitarteko bat --- kgpg/encryptfolder.desktop (revision 742204) +++ kgpg/encryptfolder.desktop (revision 742204) @@ -12,6 +12,7 @@ Name[da]=Arkivér & kryptér mappe Name[de]=Ordner packen und verschlüsseln Name[el]=Αρχειοθέτηση & κρυπτογράφηση φακέλου +Name[eo]=Arkivigi kaj ĉifri dosierujon Name[es]=Archivar y cifrar carpeta Name[et]=Arhiveeri ja krüpti kataloog Name[eu]=Artxibatu eta enkriptatu karpeta --- kgpg/encryptfile.desktop (revision 742204) +++ kgpg/encryptfile.desktop (revision 742204) @@ -15,6 +15,7 @@ Name[da]=Indkod fil Name[de]=Datei verschlüsseln Name[el]=Κρυπτογράφηση αρχείου +Name[eo]=Ĉifri dosieron Name[es]=Cifrar archivo Name[et]=Krüpti fail Name[eu]=Fitxategiak Zifratu --- klaptopdaemon/applnk/klaptopdaemon.desktop (revision 742204) +++ klaptopdaemon/applnk/klaptopdaemon.desktop (revision 742204) @@ -20,6 +20,7 @@ Comment[da]=Batteriovervågning for bærbar Comment[de]=Benachrichtigung über den Akku-Ladezustand Comment[el]=Επόπτης μπαταρίας φορητού +Comment[eo]=Portkomputila baterimonitoro Comment[es]=Monitor de batería del portátil Comment[et]=Sülearvuti aku monitooring Comment[eu]=Magalekoaren bateria begiralea @@ -67,6 +68,7 @@ Name[da]=Batteriovervågning for bærbar Name[de]=Akku-Überwachung Name[el]=Επόπτης μπαταρίας φορητού +Name[eo]=Portkomputila baterimonitoro Name[es]=Monitor de batería del portátil Name[et]=Sülearvuti aku monitooring Name[eu]=Magalekoaren Bateria Begiralea --- kedit/KEdit.desktop (revision 742204) +++ kedit/KEdit.desktop (revision 742204) @@ -11,6 +11,7 @@ GenericName[da]=Simpel teksteditor GenericName[de]=Einfacher Texteditor GenericName[el]=Απλός επεξεργαστής κειμένου +GenericName[eo]=Simpla Tekstredaktilo GenericName[es]=Editor de texto sencillo GenericName[et]=Lihtne tekstiredaktor GenericName[eu]=Testu Editore Soila --- ksim/monitors/snmp/Snmp.desktop (revision 742204) +++ ksim/monitors/snmp/Snmp.desktop (revision 742204) @@ -9,6 +9,7 @@ Comment[da]=Snmp statusovervågning Comment[de]=Statusanzeige für SNMP Comment[el]=Επόπτης κατάστασης snmp +Comment[eo]=Monitoro por la Snmp-stato Comment[es]=Monitor de estado de Snmp Comment[et]=Snmp oleku monitooring Comment[eu]=Snmp Egoera Begiralea --- ksim/ksim.desktop (revision 742204) +++ ksim/ksim.desktop (revision 742204) @@ -77,6 +77,7 @@ Comment[da]=Systeminformationsovervågning (GKrellM-lignende) Comment[de]=System-Informationsüberwachung (GKrellM-Stil) Comment[el]=Επόπτης πληροφοριών συστήματος (στο στυλ του GKrellM) +Comment[eo]=Monitoro por Sisteminformoj (GKrellM-stilo) Comment[es]=Monitor de información del sistema (estilo GKrellM) Comment[et]=Süsteemi monitooring (GKrellM stiil) Comment[eu]=Sistemaren Informazioaren Begiralea (GKrellM estiloa) --- khexedit/parts/kpart/khexedit2part.desktop (revision 742204) +++ khexedit/parts/kpart/khexedit2part.desktop (revision 742204) @@ -12,6 +12,7 @@ Name[da]=Indlejret binær fremviser Name[de]=Eingebettetes Anzeigeprogramm für Binärdateien Name[el]=Ενσωματωμένος προβολέας δυαδικών αρχείων +Name[eo]=Enkonstruita duum-rigardilo Name[es]=Visor binario empotrado Name[et]=Põimitud binaarfailide näitaja Name[eu]=Ikusgailu binario txertagarria @@ -34,7 +35,7 @@ Name[nn]=Innebygd binærframvisar Name[pa]=ਸ਼ਾਮਲ ਬਾਈਨਰੀ ਦਰਸ਼ਕ Name[pl]=Wbudowana przeglądarka binarna -Name[pt]=Visualizador Binário Embebido +Name[pt]=Visualizador Binário Incorporado Name[pt_BR]=Visualizador Binário Embutido Name[ru]=Компонент просмотра двоичных данных Name[sk]=Vložený binárny prezerač @@ -57,6 +58,7 @@ Comment[da]=Indlejret binær fremviser Comment[de]=Eingebettetes Anzeigeprogramm für Binärdateien Comment[el]=Ενσωματωμένος προβολέας δυαδικών αρχείων +Comment[eo]=Enkonstruita duum-rigardilo Comment[es]=Visor binario empotrado Comment[et]=Põimitud binaarfailide näitaja Comment[eu]=Ikusgailu binario txertagarria @@ -79,7 +81,7 @@ Comment[nn]=Innebygd binærframvisar Comment[pa]=ਸ਼ਾਮਲ ਬਾਈਨਰੀ ਦਰਸ਼ਕ Comment[pl]=Wbudowana przeglądarka binarna -Comment[pt]=Visualizador Binário Embebido +Comment[pt]=Visualizador Binário Incorporado Comment[pt_BR]=Visualizador Binário Embutido Comment[ru]=Компонент просмотра двоичных данных Comment[sk]=Vložený binárny prezerač --- khexedit/parts/kbytesedit/kbyteseditwidget.desktop (revision 742204) +++ khexedit/parts/kbytesedit/kbyteseditwidget.desktop (revision 742204) @@ -9,6 +9,7 @@ Name[cy]=Celfigyn GolyguBeit Name[de]=BytesEdit-Bedienelement Name[el]=Γραφικό συστατικό BytesEdit +Name[eo]=BytesEdit-fenestraĵo Name[es]=Ventana de edición de bytes Name[et]=Baitide redigeerimise komponent Name[eu]=Byteak Editatzeko Widget-a --- kmilo/kmilod/kmilod.desktop (revision 742204) +++ kmilo/kmilod/kmilod.desktop (revision 742204) @@ -22,6 +22,7 @@ Comment[da]=KDE Speciel tast bekendtgørelse Comment[de]=Unterstützung für Sonder- und Multimediatasten in KDE Comment[el]=Ειδοποιητής ειδικών πλήκτρων του KDE +Comment[eo]=KDE-specialklavatentigilo Comment[es]=Notificador de teclas especiales de KDE Comment[et]=KDE eriklahvide märkija Comment[eu]=KDE tekla berezien jakinarazlea --- kmilo/thinkpad/kmilo_thinkpad.desktop (revision 742204) +++ kmilo/thinkpad/kmilo_thinkpad.desktop (revision 742204) @@ -12,6 +12,7 @@ Name[cy]=Ategyn Thinkpad Name[de]=Thinkpad-Plugin Name[el]=Πρόσθετο Thinkpad +Name[eo]=Thinkpad-kromaĵo Name[es]=Extensión para Thinkpad Name[et]=Thinkpadi plugin Name[eu]=Thikpad Plugina --- kmilo/demo/kmilo_demo.desktop (revision 742204) +++ kmilo/demo/kmilo_demo.desktop (revision 742204) @@ -11,6 +11,7 @@ Name[da]=Demo-plugin Name[de]=Demo-Plugin Name[el]=Πρόσθετο επίδειξης +Name[eo]=Demo-kromaĵo Name[es]=Extensión de demostración Name[et]=Demoplugin Name[eu]=Demo Plugina @@ -60,6 +61,7 @@ Comment[da]=Dette plugin gør ingenting. Comment[de]=Dieses Plugin macht nichts. Comment[el]=Αυτό το πρόσθετο δεν κάνει τίποτα. +Comment[eo]=Tiu kromaĵo faras nenion. Comment[es]=Esta extensión no hace nada. Comment[et]=See plugin ei tee mitte kui midagi. Comment[eu]=Plugin honek ez du ezer egiten. --- kmilo/generic/kmilo_generic.desktop (revision 742204) +++ kmilo/generic/kmilo_generic.desktop (revision 742204) @@ -13,6 +13,7 @@ Name[da]=Generisk tastatur-plugin Name[de]=Allgemeines Tastatur-Plugin Name[el]=Γενικευμένο πρόσθετο πληκτρολογίου +Name[eo]=Komuna klavar-kromprogramo Name[es]=Extensión de teclado genérico Name[et]=Tavaline klaviatuuriplugin Name[eu]=Teklatu Arruntaren Plugina --- kregexpeditor/kregexpeditor.desktop (revision 742204) +++ kregexpeditor/kregexpeditor.desktop (revision 742204) @@ -25,6 +25,7 @@ GenericName[da]=Editor for regulære udtryk GenericName[de]=Editor für reguläre Ausdrücke GenericName[el]=Επεξεργαστής κανονικών εκφράσεων +GenericName[eo]=Redaktilo por regulesprimoj GenericName[es]=Editor de expresiones regulares GenericName[et]=Regulaaravaldiste redaktor GenericName[eu]=Adierazpen Erregularren Editorea --- kdelirc/kcmlirc/kcmlirc.desktop (revision 742204) +++ kdelirc/kcmlirc/kcmlirc.desktop (revision 742204) @@ -3,7 +3,7 @@ Icon=irkick Comment=Configure your remote controls for use with applications Comment[ar]=إعداد التحكّم عن بعد لاستخدامه في تطبيقاتك -Comment[bg]=Настройване на дистанционно управление +Comment[bg]=Настройване на дистанционното управление Comment[bs]=Podesite vaš daljinski upravljač za upotrebu sa programima Comment[ca]=Configura els teus controls remots per usar amb aplicacions Comment[cs]=Nastavení dálkových ovladačů @@ -68,6 +68,7 @@ Name[da]=Fjernbetjeninger Name[de]=Fernsteuerungen Name[el]=Τηλεχειριστήρια +Name[eo]=Teleregiloj Name[es]=Controles remotos Name[et]=Kaugjuhtimine Name[eu]=Urruneko Aginteak --- kdelirc/irkick/irkick.desktop (revision 742204) +++ kdelirc/irkick/irkick.desktop (revision 742204) @@ -13,6 +13,7 @@ GenericName[da]=KDE LIRC-server GenericName[de]=KDE LIRC-Server GenericName[el]=Εξυπηρετητής LIRC του KDE +GenericName[eo]=KDE LIRC-servilo GenericName[es]=Servidor LIRC de KDE GenericName[et]=KDE LIRC server GenericName[eu]=KDE LIRC Zerbitzaria --- ark/zoo.cpp (revision 742204) +++ ark/zoo.cpp (revision 742204) @@ -54,8 +54,9 @@ ZooArch::ZooArch( ArkWidget *gui, const QString & fileName ) : Arch( gui, fileName ) { - m_archiver_program = "zoo"; + m_archiver_program = m_unarchiver_program = "zoo"; verifyCompressUtilityIsAvailable( m_archiver_program ); + verifyUncompressUtilityIsAvailable( m_unarchiver_program ); m_headerString = "----"; } --- ark/arch.h (revision 742204) +++ ark/arch.h (revision 742204) @@ -142,7 +142,7 @@ QString getUnarchUtility() { return m_unarchiver_program; } - void appendShellOutputData( const char * data ) { m_lastShellOutput.append( data ); } + void appendShellOutputData( const char * data ) { m_lastShellOutput.append( QString::fromLocal8Bit( data ) ); } void clearShellOutput() { m_lastShellOutput.truncate( 0 ); } const QString& getLastShellOutput() const { return m_lastShellOutput; } --- ark/compressedfile.cpp (revision 742204) +++ ark/compressedfile.cpp (revision 742204) @@ -361,11 +361,9 @@ kdDebug(1601) << "+CompressedFile::remove" << endl; QFile::remove(m_tmpfile); - // delete the compressed file but then create it empty in case someone + // do not delete but truncate the compressed file in case someone // does a reload and finds it no longer exists! - QFile::remove(m_filename); - - ::close(::open(QFile::encodeName(m_filename), O_WRONLY | O_CREAT | O_EXCL)); + truncate(QFile::encodeName(m_filename), 0); m_tmpfile = ""; emit sigDelete(true); --- ark/arch.cpp (revision 742204) +++ ark/arch.cpp (revision 742204) @@ -327,7 +327,7 @@ pos = strpos + len; - columns[ curCol->colRef ] = line.mid( strpos, len ); + columns[curCol->colRef] = QString::fromLocal8Bit( line.mid(strpos, len) ); } --- ark/rar.cpp (revision 742204) +++ ark/rar.cpp (revision 742204) @@ -82,7 +82,7 @@ { if ( m_isFirstLine ) { - m_entryFilename = line; + m_entryFilename = QString::fromLocal8Bit( line ); m_entryFilename.remove( 0, 1 ); m_isFirstLine = false; return true; @@ -226,6 +226,8 @@ if ( !m_password.isEmpty() ) *kp << "-p" + m_password; + else + *kp << "-p-"; if ( !ArkSettings::extractOverwrite() ) { --- superkaramba/src/superkaramba.desktop (revision 742204) +++ superkaramba/src/superkaramba.desktop (revision 742204) @@ -59,6 +59,7 @@ GenericName[da]=Desktopkontroller GenericName[de]=Arbeitsflächen-Erweiterungen GenericName[el]=Γραφικά συστατικά επιφάνειας εργασίας +GenericName[eo]=Tabulaj fenestraĵoj GenericName[es]=Elementos visuales para el escritorio GenericName[et]=Töölauavidinad GenericName[eu]=Mahaigaineko trepetak Property changes on: . ___________________________________________________________________ Name: svn:externals + admin https://svn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin ++++++ ark-decoding.diff ++++++ --- ark/tar.cpp.orig 2006-11-20 19:35:44.000000000 +0900 +++ ark/tar.cpp 2006-11-20 19:38:13.000000000 +0900 @@ -622,7 +622,7 @@ for ( QStringList::Iterator it = m_fileList->begin(); it != m_fileList->end(); ++it ) { - *kp << QString(m_dotslash ? "./" : "")+(*it); + *kp << QString(m_dotslash ? "./" : "") + QFile::decodeName((*it).latin1()); } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org