Hello community,
here is the log from the commit of package kdeutils4 for openSUSE:Factory
checked in at Tue Dec 14 12:21:55 CET 2010.
--------
--- KDE/kdeutils4/kdeutils4.changes 2010-11-19 17:20:11.000000000 +0100
+++ kdeutils4/kdeutils4.changes 2010-12-09 18:34:13.000000000 +0100
@@ -1,0 +2,15 @@
+Fri Dec 8 19:18:53 UCT 2010 - toddrme2178@gmail.com
+
+- Add optional dependencies
+ * QJSON -- Required for compiling Ark's unit tests
+
+-------------------------------------------------------------------
+Fri Dec 3 17:16:34 CET 2010 - dmueller@suse.de
+
+- update to 4.5.85
+ * KDE 4.6 Beta2
+ * Final Beta before RC, various fixes from Beta1
+ * no upstream changelog available.
+
+
+-------------------------------------------------------------------
@@ -575 +589,0 @@
-
calling whatdependson for head-i586
Old:
----
kdeutils-4.5.80.tar.bz2
New:
----
kdeutils-4.5.85.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeutils4.spec ++++++
--- /var/tmp/diff_new_pack.rDgB2a/_old 2010-12-14 12:21:01.000000000 +0100
+++ /var/tmp/diff_new_pack.rDgB2a/_new 2010-12-14 12:21:01.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdeutils4 (Version 4.5.80)
+# spec file for package kdeutils4 (Version 4.5.85)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,7 +20,7 @@
Name: kdeutils4
BuildRequires: gmp-devel kdebase4-workspace-devel libqimageblitz-devel net-snmp-devel pcsc-lite python-devel
BuildRequires: libkdepimlibs4-devel libkonq-devel libqca2-devel libzip-devel oxygen-icon-theme-large
-BuildRequires: libarchive-devel libknotificationitem-devel
+BuildRequires: libarchive-devel libknotificationitem-devel libqjson-devel xz-devel
%if %suse_version > 1110
BuildRequires: xz-devel
@@ -34,7 +34,7 @@
Group: Productivity/Other
Summary: Base Package of KDE Utility Programs
Url: http://www.kde.org
-Version: 4.5.80
+Version: 4.5.85
Release: 1
Source0: kdeutils-%version.tar.bz2
Patch: 4_5_BRANCH.diff
++++++ kdeutils-4.5.80.tar.bz2 -> kdeutils-4.5.85.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.5.80/ark/plugins/clirarplugin/cliplugin.cpp new/kdeutils-4.5.85/ark/plugins/clirarplugin/cliplugin.cpp
--- old/kdeutils-4.5.80/ark/plugins/clirarplugin/cliplugin.cpp 2010-10-19 15:40:29.000000000 +0200
+++ new/kdeutils-4.5.85/ark/plugins/clirarplugin/cliplugin.cpp 2010-12-01 23:22:27.000000000 +0100
@@ -35,8 +35,9 @@
CliPlugin::CliPlugin(QObject *parent, const QVariantList& args)
: CliInterface(parent, args)
- , m_parseState(ParseStateHeader)
+ , m_parseState(ParseStateColumnDescription1)
, m_remainingIgnoredSubHeaderLines(0)
+ , m_isUnrarFree(false)
{
}
@@ -88,55 +89,77 @@
{
static const QLatin1String headerString("----------------------");
static const QLatin1String subHeaderString("Data header type: ");
+ static const QLatin1String columnDescription1String(" Size Packed Ratio Date Time Attr CRC Meth Ver");
+ static const QLatin1String columnDescription2String(" Host OS Solid Old"); // Only present in unrar-nonfree
- if (line.startsWith(headerString)) {
- if (m_parseState == ParseStateHeader) { // Skip the heading
- m_parseState = ParseStateEntryFileName;
- } else { // Catch the final line
+ switch (m_parseState)
+ {
+ case ParseStateColumnDescription1:
+ if (line.startsWith(columnDescription1String)) {
+ m_parseState = ParseStateColumnDescription2;
+ }
+
+ break;
+
+ case ParseStateColumnDescription2:
+ // #243273: We need a way to differentiate unrar and unrar-free,
+ // as their output for the "vt" option is different.
+ // Currently, we differ them by checking if "vt" produces
+ // two lines of column names before the header string, as
+ // only unrar does that (unrar-free always outputs one line
+ // for column names regardless of how verbose we tell it to
+ // be).
+ if (line.startsWith(columnDescription2String)) {
m_parseState = ParseStateHeader;
+ } else if (line.startsWith(headerString)) {
+ m_parseState = ParseStateEntryFileName;
+ m_isUnrarFree = true;
}
- return true;
- }
+ break;
- if (m_parseState == ParseStateHeader) {
- return true;
- } else if (m_parseState == ParseStateEntryIgnoredDetails) {
- m_parseState = ParseStateEntryFileName;
- return true;
- }
+ case ParseStateHeader:
+ if (line.startsWith(headerString)) {
+ m_parseState = ParseStateEntryFileName;
+ }
- if (m_remainingIgnoredSubHeaderLines > 0) {
- --m_remainingIgnoredSubHeaderLines;
- return true;
- }
+ break;
- // #242071: The RAR file format has the concept of subheaders, such as
- // CMT for comments and STM for NTFS streams (?).
- // Since the format is undocumented, we cannot do much, and
- // ignoring them seems harmless (at least 7zip and WinRAR do not
- // show them either).
- if (line.startsWith(subHeaderString)) {
- // subHeaderString's length is 18
- const QString subHeaderType(line.mid(18));
-
- // XXX: If we ever support archive comments, this code must
- // be changed, because the comments will be shown after
- // a CMT subheader and will have an arbitrary number of lines
- if (subHeaderType == QLatin1String("STM")) {
- m_remainingIgnoredSubHeaderLines = 4;
- } else {
- m_remainingIgnoredSubHeaderLines = 3;
+ case ParseStateEntryFileName:
+ if (m_remainingIgnoredSubHeaderLines > 0) {
+ --m_remainingIgnoredSubHeaderLines;
+ return true;
}
- kDebug() << "Found a subheader of type" << subHeaderType;
- kDebug() << "The next" << m_remainingIgnoredSubHeaderLines
- << "lines will be ignored";
+ // #242071: The RAR file format has the concept of subheaders, such as
+ // CMT for comments and STM for NTFS streams (?).
+ // Since the format is undocumented, we cannot do much, and
+ // ignoring them seems harmless (at least 7zip and WinRAR do
+ // notes show them either).
+ if (line.startsWith(subHeaderString)) {
+ // subHeaderString's length is 18
+ const QString subHeaderType(line.mid(18));
+
+ // XXX: If we ever support archive comments, this code must
+ // be changed, because the comments will be shown after
+ // a CMT subheader and will have an arbitrary number of lines
+ if (subHeaderType == QLatin1String("STM")) {
+ m_remainingIgnoredSubHeaderLines = 4;
+ } else {
+ m_remainingIgnoredSubHeaderLines = 3;
+ }
+
+ kDebug() << "Found a subheader of type" << subHeaderType;
+ kDebug() << "The next" << m_remainingIgnoredSubHeaderLines
+ << "lines will be ignored";
- return true;
- }
+ return true;
+ } else if (line.startsWith(headerString)) {
+ m_parseState = ParseStateHeader;
+
+ return true;
+ }
- if (m_parseState == ParseStateEntryFileName) {
m_isPasswordProtected = (line.at(0) == QLatin1Char( '*' ));
// Start from 1 because the first character is either ' ' or '*'
@@ -144,12 +167,21 @@
m_parseState = ParseStateEntryDetails;
- return true;
- } else if (m_parseState == ParseStateEntryDetails) {
- const QStringList details = line.split(QLatin1Char( ' ' ), QString::SkipEmptyParts);
+ break;
+
+ case ParseStateEntryIgnoredDetails:
+ m_parseState = ParseStateEntryFileName;
- QDateTime ts(QDate::fromString(details.at(3), QLatin1String( "dd-MM-yy" )),
- QTime::fromString(details.at(4), QLatin1String( "hh:mm" )));
+ break;
+
+ case ParseStateEntryDetails:
+ const QStringList details = line.split(QLatin1Char( ' ' ),
+ QString::SkipEmptyParts);
+
+ QDateTime ts(QDate::fromString(details.at(3),
+ QLatin1String("dd-MM-yy")),
+ QTime::fromString(details.at(4),
+ QLatin1String("hh:mm")));
// unrar outputs dates with a 2-digit year but QDate takes it as 19??
// let's take 1950 is cut-off; similar to KDateTime
@@ -197,7 +229,15 @@
entry(e);
- m_parseState = ParseStateEntryIgnoredDetails;
+ // #243273: unrar-free does not output the third file entry line,
+ // skip directly to parsing a new entry.
+ if (m_isUnrarFree) {
+ m_parseState = ParseStateEntryFileName;
+ } else {
+ m_parseState = ParseStateEntryIgnoredDetails;
+ }
+
+ break;
}
return true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.5.80/ark/plugins/clirarplugin/cliplugin.h new/kdeutils-4.5.85/ark/plugins/clirarplugin/cliplugin.h
--- old/kdeutils-4.5.80/ark/plugins/clirarplugin/cliplugin.h 2010-06-24 18:32:12.000000000 +0200
+++ new/kdeutils-4.5.85/ark/plugins/clirarplugin/cliplugin.h 2010-12-01 23:22:27.000000000 +0100
@@ -40,7 +40,9 @@
private:
enum {
- ParseStateHeader = 0,
+ ParseStateColumnDescription1 = 0,
+ ParseStateColumnDescription2,
+ ParseStateHeader,
ParseStateEntryFileName,
ParseStateEntryDetails,
ParseStateEntryIgnoredDetails
@@ -51,6 +53,8 @@
bool m_isPasswordProtected;
int m_remainingIgnoredSubHeaderLines;
+
+ bool m_isUnrarFree;
};
#endif // CLIPLUGIN_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.5.80/ark/plugins/libarchive/kerfuffle_libarchive_readonly.desktop new/kdeutils-4.5.85/ark/plugins/libarchive/kerfuffle_libarchive_readonly.desktop
--- old/kdeutils-4.5.80/ark/plugins/libarchive/kerfuffle_libarchive_readonly.desktop 2010-11-19 11:50:47.000000000 +0100
+++ new/kdeutils-4.5.85/ark/plugins/libarchive/kerfuffle_libarchive_readonly.desktop 2010-12-01 23:22:27.000000000 +0100
@@ -16,7 +16,9 @@
Name[de]=kerfuffle_libarchive_readonly
Name[es]=kerfuffle_libarchive_readonly
Name[et]=kerfuffle_libarchive_readonly
+Name[fr]=kerfuffle_libarchive_readonly
Name[nl]=kerfuffle_libarchive_readonly
+Name[pa]=kerfuffle_libarchive_readonly
Name[pt]=kerfuffle_libarchive_readonly
Name[pt_BR]=kerfuffle_libarchive_readonly
Name[ru]=kerfuffle_libarchive_readonly
Files old/kdeutils-4.5.80/doc/ark/index.cache.bz2 and new/kdeutils-4.5.85/doc/ark/index.cache.bz2 differ
Files old/kdeutils-4.5.80/doc/filelight/index.cache.bz2 and new/kdeutils-4.5.85/doc/filelight/index.cache.bz2 differ
Files old/kdeutils-4.5.80/doc/kcalc/index.cache.bz2 and new/kdeutils-4.5.85/doc/kcalc/index.cache.bz2 differ
Files old/kdeutils-4.5.80/doc/kcharselect/index.cache.bz2 and new/kdeutils-4.5.85/doc/kcharselect/index.cache.bz2 differ
Files old/kdeutils-4.5.80/doc/kcontrol/blockdevices/index.cache.bz2 and new/kdeutils-4.5.85/doc/kcontrol/blockdevices/index.cache.bz2 differ
Files old/kdeutils-4.5.80/doc/kcontrol/kremotecontrol/index.cache.bz2 and new/kdeutils-4.5.85/doc/kcontrol/kremotecontrol/index.cache.bz2 differ
Files old/kdeutils-4.5.80/doc/kdf/index.cache.bz2 and new/kdeutils-4.5.85/doc/kdf/index.cache.bz2 differ
Files old/kdeutils-4.5.80/doc/kfloppy/index.cache.bz2 and new/kdeutils-4.5.85/doc/kfloppy/index.cache.bz2 differ
Files old/kdeutils-4.5.80/doc/kgpg/index.cache.bz2 and new/kdeutils-4.5.85/doc/kgpg/index.cache.bz2 differ
Files old/kdeutils-4.5.80/doc/ktimer/index.cache.bz2 and new/kdeutils-4.5.85/doc/ktimer/index.cache.bz2 differ
Files old/kdeutils-4.5.80/doc/kwallet/index.cache.bz2 and new/kdeutils-4.5.85/doc/kwallet/index.cache.bz2 differ
Files old/kdeutils-4.5.80/doc/printer-applet/index.cache.bz2 and new/kdeutils-4.5.85/doc/printer-applet/index.cache.bz2 differ
Files old/kdeutils-4.5.80/doc/sweeper/index.cache.bz2 and new/kdeutils-4.5.85/doc/sweeper/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.5.80/filelight/misc/filelight.desktop new/kdeutils-4.5.85/filelight/misc/filelight.desktop
--- old/kdeutils-4.5.80/filelight/misc/filelight.desktop 2010-11-19 11:50:43.000000000 +0100
+++ new/kdeutils-4.5.85/filelight/misc/filelight.desktop 2010-12-01 23:22:27.000000000 +0100
@@ -7,6 +7,7 @@
Name[es]=Filelight
Name[et]=Filelight
Name[eu]=Filelight
+Name[fr]=Filelight
Name[ko]=Filelight
Name[nb]=Filelight
Name[nds]=Filelight
@@ -28,6 +29,7 @@
GenericName[es]=Estadísticas de uso de discos
GenericName[et]=Kettakasutuse statistika
GenericName[eu]=Diskoen erabilerari buruzko estatistikak
+GenericName[fr]=Statistiques d'utilisation de disque
GenericName[ko]=디스크 사용 통계
GenericName[nb]=Statistikk over diskbruk
GenericName[nds]=Fastplaatbruuk-Statistik
@@ -53,6 +55,7 @@
Comment[es]=Muestra información sobre el uso de discos
Comment[et]=Kettakasutuse teabe kuvamine
Comment[eu]=Erakutsi diskoen erabilerari buruzko informazioa
+Comment[fr]=Afficher l'information d'utilisation de disque
Comment[ko]=디스크 사용량 보기
Comment[nb]=Vis informasjon om bruk av diskplass
Comment[nds]=Wiest Informatschonen över den Bruuk vun de Fastplaat
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.5.80/filelight/misc/filelightpart.desktop new/kdeutils-4.5.85/filelight/misc/filelightpart.desktop
--- old/kdeutils-4.5.80/filelight/misc/filelightpart.desktop 2010-11-19 11:50:43.000000000 +0100
+++ new/kdeutils-4.5.85/filelight/misc/filelightpart.desktop 2010-12-01 23:22:27.000000000 +0100
@@ -7,6 +7,7 @@
Name[es]=Mapa radial
Name[et]=Radiaalkaart
Name[eu]=Mapa erradiala
+Name[fr]=Carte radiale
Name[ko]=원형 지도
Name[nb]=Radielt kart
Name[nds]=Rund Koort
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.5.80/filelight/src/part/part.cpp new/kdeutils-4.5.85/filelight/src/part/part.cpp
--- old/kdeutils-4.5.80/filelight/src/part/part.cpp 2010-10-05 13:38:31.000000000 +0200
+++ new/kdeutils-4.5.85/filelight/src/part/part.cpp 2010-11-25 18:40:29.000000000 +0100
@@ -37,7 +37,7 @@
#include <KMessageBox> //::start()
#include <KStandardAction>
#include <KStatusBar>
-#include