September 2008 - openSUSE Commits - openSUSE Mailing Lists

commit kdenetwork3
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package kdenetwork3 checked in at Mon Sep 29 17:51:29 CEST 2008. -------- --- KDE/kdenetwork3/kdenetwork3.changes 2008-08-26 11:46:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdenetwork3/kdenetwork3.changes 2008-09-27 11:12:23.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Sep 27 11:07:39 CEST 2008 - wstephenson(a)suse.de + +- Update branch diff: + * Fix crash on getting user details in Groupwise (bnc#354159) + * Fix crash on exit bug in GroupWise (bnc#336059) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenetwork3.spec ++++++ --- /var/tmp/diff_new_pack.m12923/_old 2008-09-29 17:51:12.000000000 +0200 +++ /var/tmp/diff_new_pack.m12923/_new 2008-09-29 17:51:12.000000000 +0200 @@ -31,7 +31,7 @@ Summary: KDE Network Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 3.5.10 -Release: 2 +Release: 11 Provides: kdenetwork3-lan:/opt/kde3/bin/kpf Source0: kdenetwork-%{version}.tar.bz2 Source1: init.lisa @@ -669,6 +669,10 @@ /opt/kde3/%_lib/libkopete_videodevice.so %changelog +* Sat Sep 27 2008 wstephenson(a)suse.de +- Update branch diff: + * Fix crash on getting user details in Groupwise (bnc#354159) + * Fix crash on exit bug in GroupWise (bnc#336059) * Tue Aug 26 2008 stbinner(a)suse.de - fix build again * Wed Aug 20 2008 coolo(a)suse.de ++++++ 3_5_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.m12923/_old 2008-09-29 17:51:12.000000000 +0200 +++ /var/tmp/diff_new_pack.m12923/_new 2008-09-29 17:51:12.000000000 +0200 @@ -3,13 +3,58 @@ --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: ++current HEAD: 865247 +svn di between //tags/KDE/3.5.10/kdenetwork and //branches/KDE/3.5/kdenetwork +--- kopete/protocols/groupwise/gwaccount.cpp ++++ kopete/protocols/groupwise/gwaccount.cpp +@@ -294,7 +294,7 @@ + // not implemented: error + QObject::connect( m_clientStream, SIGNAL( error(int) ), SLOT( slotCSError(int) ) ); + +- m_client = new Client( this, CMSGPRES_GW_6_5 ); ++ m_client = new Client( 0, CMSGPRES_GW_6_5 ); + + // NB these are prefixed with QObject:: to avoid any chance of a clash with our connect() methods. + // we connected successfully +--- kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp ++++ kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp +@@ -104,10 +104,27 @@ + const Field::FieldListIterator end = fl.end(); + for ( Field::FieldListIterator it = fl.begin(); it != end; ++it ) + { +- Field::SingleField * propField = static_cast<Field::SingleField *>( *it ); +- QString propName = propField->tag(); +- QString propValue = propField->value().toString(); +- propMap.insert( propName, propValue ); ++ Field::SingleField * propField = dynamic_cast<Field::SingleField *>( *it ); ++ if ( propField ) { ++ QString propName = propField->tag(); ++ QString propValue = propField->value().toString(); ++ propMap.insert( propName, propValue ); ++ } else { ++ Field::MultiField * mf2; ++ if ( ( mf2 = dynamic_cast<Field::MultiField *>( *it ) ) ) { ++ Field::FieldList fl2 = mf2->fields(); ++ const Field::FieldListIterator end = fl2.end(); ++ for ( Field::FieldListIterator it2 = fl2.begin(); it2 != end; ++it2 ) ++ { ++ propField = dynamic_cast<Field::SingleField *>( *it2 ); ++ if ( propField ) { ++ QString propName = propField->tag(); ++ QString propValue = propField->value().toString(); ++ propMap.insert( propName, propValue ); ++ } ++ } ++ } ++ } + } + } + if ( !propMap.empty() ) -Eigenschaftsänderungen: . +Property changes on: . ___________________________________________________________________ -Gelöscht: svn:mergeinfo -Hinzugefügt: svn:externals +Deleted: svn:mergeinfo +Added: svn:externals + admin https://svn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdelibs3
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package kdelibs3 checked in at Mon Sep 29 17:51:19 CEST 2008. -------- --- KDE/kdelibs3/kdelibs3.changes 2008-09-10 14:03:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdelibs3/kdelibs3.changes 2008-09-29 17:50:39.564544000 +0200 @@ -1,0 +2,5 @@ +Wed Sep 24 20:45:39 CEST 2008 - wstephenson(a)suse.de + +- Fix vcard encoding issue (bnc#382959) + +------------------------------------------------------------------- New: ---- bug-382959_kabc_fix_vcardparser.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.Y10147/_old 2008-09-29 17:51:00.000000000 +0200 +++ /var/tmp/diff_new_pack.Y10147/_new 2008-09-29 17:51:00.000000000 +0200 @@ -31,7 +31,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation Version: 3.5.10 -Release: 14 +Release: 17 %define kdelibs_patch_level b BuildArch: noarch Requires: kdelibs3 qt3-devel-doc ++++++ kdelibs3.spec ++++++ --- /var/tmp/diff_new_pack.Y10147/_old 2008-09-29 17:51:00.000000000 +0200 +++ /var/tmp/diff_new_pack.Y10147/_new 2008-09-29 17:51:00.000000000 +0200 @@ -38,7 +38,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: KDE Base Libraries Version: 3.5.10 -Release: 9 +Release: 12 Obsoletes: kde3-i18n kups keramik kdelibs3-cups kdelibs3-33addons kdepim3-networkstatus Provides: kups keramik kdelibs3-cups kdelibs3-33addons kdepim3-networkstatus Provides: kdelibs3_base = 3.3 @@ -137,6 +137,7 @@ Patch149: networkstatus.diff Patch150: kdesu-settings.diff Patch152: bug-399296_ftphandling-fix.diff +Patch153: bug-382959_kabc_fix_vcardparser.patch %description This package contains kdelibs, one of the basic packages of the K @@ -338,6 +339,7 @@ %patch149 %patch150 %patch152 +%patch153 tar xfvj %SOURCE12 # # define KDE version exactly @@ -832,6 +834,8 @@ /opt/kde3/%_lib/libconnectionmanager.so %changelog +* Wed Sep 24 2008 wstephenson(a)suse.de +- Fix vcard encoding issue (bnc#382959) * Wed Sep 10 2008 dmueller(a)suse.de - fix m4 macro nesting - fix build of inotify stuff for SLE10 ++++++ bug-382959_kabc_fix_vcardparser.patch ++++++ Index: kabc/vcardformatplugin.cpp ================================================================================ --- kabc/vcardconverter.cpp +++ kabc/vcardconverter.cpp @@ -51,6 +51,14 @@ return createVCards( list, version ); } +QCString VCardConverter::createVCardRaw( const Addressee &addr, Version version ) +{ + Addressee::List list; + list.append( addr ); + + return createVCardsRaw( list, version ); +} + QString VCardConverter::createVCards( Addressee::List list, Version version ) { VCardTool tool; @@ -58,6 +66,13 @@ return tool.createVCards( list, ( version == v3_0 ? VCard::v3_0 : VCard::v2_1 ) ); } +QCString VCardConverter::createVCardsRaw( Addressee::List list, Version version ) +{ + VCardTool tool; + + return tool.createVCardsRaw( list, ( version == v3_0 ? VCard::v3_0 : VCard::v2_1 ) ); +} + Addressee VCardConverter::parseVCard( const QString& vcard ) { Addressee::List list = parseVCards( vcard ); @@ -65,6 +80,13 @@ return list[ 0 ]; } +Addressee VCardConverter::parseVCardRaw( const QCString& vcard ) +{ + Addressee::List list = parseVCardsRaw( vcard ); + + return list[ 0 ]; +} + Addressee::List VCardConverter::parseVCards( const QString& vcard ) { VCardTool tool; @@ -72,6 +94,13 @@ return tool.parseVCards( vcard ); } +Addressee::List VCardConverter::parseVCardsRaw( const QCString& vcard ) +{ + VCardTool tool; + + return tool.parseVCardsRaw( vcard ); +} + // ---------------------------- deprecated stuff ---------------------------- // bool VCardConverter::vCardToAddressee( const QString &str, Addressee &addr, Version version ) --- kabc/vcardconverter.h +++ kabc/vcardconverter.h @@ -82,6 +82,7 @@ @param version The version of the generated vCard format */ QString createVCard( const Addressee &addr, Version version = v3_0 ); + QCString createVCardRaw( const Addressee &addr, Version version = v3_0 ); /** Creates a string in vCard format which contains the given @@ -92,6 +93,7 @@ */ // FIXME: Add error handling QString createVCards( Addressee::List list, Version version = v3_0 ); + QCString createVCardsRaw( Addressee::List list, Version version = v3_0 ); // FIXME: Add "createVCards( AddressBook * )" @@ -99,12 +101,14 @@ Parses a string in vCard format and returns the first contact. */ Addressee parseVCard( const QString& vcard ); + Addressee parseVCardRaw( const QCString& vcard ); /** Parses a string in vCard format and returns a list of contact objects. */ // FIXME: Add error handling Addressee::List parseVCards( const QString& vcard ); + Addressee::List parseVCardsRaw( const QCString& vcard ); // FIXME: Add "bool parseVCards( AddressBook *, const QString &vcard )" --- kabc/vcardformatplugin.cpp +++ kabc/vcardformatplugin.cpp @@ -38,14 +38,11 @@ bool VCardFormatPlugin::load( Addressee &addressee, QFile *file ) { - QString data; - - QTextStream t( file ); - t.setEncoding( QTextStream::Latin1 ); - data = t.read(); + const QByteArray rawData = file->readAll(); + const QCString data( rawData.data(), rawData.size() ); VCardConverter converter; - Addressee::List l = converter.parseVCards( data ); + Addressee::List l = converter.parseVCardsRaw( data ); if ( ! l.first().isEmpty() ) { addressee = l.first(); @@ -57,15 +54,11 @@ bool VCardFormatPlugin::loadAll( AddressBook*, Resource *resource, QFile *file ) { - QString data; - - QTextStream t( file ); - t.setEncoding( QTextStream::Latin1 ); - data = t.read(); + const QByteArray rawData = file->readAll(); + const QCString data( rawData.data(), rawData.size() ); VCardConverter converter; - - Addressee::List l = converter.parseVCards( data ); + Addressee::List l = converter.parseVCardsRaw( data ); Addressee::List::iterator itr; for ( itr = l.begin(); itr != l.end(); ++itr) { @@ -86,9 +79,8 @@ vcardlist.append( addressee ); - QTextStream t( file ); - t.setEncoding( QTextStream::UnicodeUTF8 ); - t << converter.createVCards( vcardlist ); + const QCString data = converter.createVCardsRaw( vcardlist ); + file->writeBlock( data, data.length() ); } void VCardFormatPlugin::saveAll( AddressBook*, Resource *resource, QFile *file ) @@ -102,9 +94,8 @@ vcardlist.append( *it ); } - QTextStream t( file ); - t.setEncoding( QTextStream::UnicodeUTF8 ); - t << converter.createVCards( vcardlist ); + const QCString data = converter.createVCardsRaw( vcardlist ); + file->writeBlock( data, data.length() ); } bool VCardFormatPlugin::checkFormat( QFile *file ) const --- kabc/vcardparser/vcardparser.cpp +++ kabc/vcardparser/vcardparser.cpp @@ -18,10 +18,13 @@ Boston, MA 02110-1301, USA. */ +#include <qcstring.h> #include <qregexp.h> #include <qtextcodec.h> +#include <qvaluelist.h> #include <kmdcodec.h> +#include <kdebug.h> #include "vcardparser.h" @@ -29,25 +32,60 @@ using namespace KABC; -static QString backslash( "\\\\" ); -static QString comma( "\\," ); -static QString newline( "\\n" ); -static QString cr( "\\r" ); +typedef QValueList<QCString> QCStringList; -static void addEscapes( QString &str ) +QValueList<QCString> splitCString( const QCString &str, char sep ) { - str.replace( '\\', backslash ); - str.replace( ',', comma ); - str.replace( '\r', cr ); - str.replace( '\n', newline ); + QValueList<QCString> list; + int start = 0; + int end; + while ((end = str.find(sep, start)) != -1) { + list.append(str.mid(start, end - start)); + start = end + 1; + } + list.append(str.mid(start)); + + return list; +} + +QValueList<QCString> splitCString( const QCString &str, const QRegExp &exp ) +{ + QValueList<QCString> list; + int start = 0; + int end; + while ((end = str.find(exp, start)) != -1) { + list.append(str.mid(start, end - start)); + start = end + 1; + } + list.append(str.mid(start)); + + return list; +} + +bool cStringStartsWith( const QCString &str, const QCString &pattern ) +{ + const int length = pattern.length(); + if ( length == 0 ) + return true; + + const QCString part = str.left( length ); + return (pattern == part); } -static void removeEscapes( QString &str ) +static void addEscapes( QCString &str ) { - str.replace( cr, "\\r" ); - str.replace( newline, "\n" ); - str.replace( comma, "," ); - str.replace( backslash, "\\" ); + str.replace( '\\', "\\\\" ); + str.replace( ',', "\\," ); + str.replace( '\r', "\\r" ); + str.replace( '\n', "\\n" ); +} + +static void removeEscapes( QCString &str ) +{ + str.replace( "\\r", "\r" ); + str.replace( "\\n", "\n" ); + str.replace( "\\,", "," ); + str.replace( "\\\\", "\\" ); } VCardParser::VCardParser() @@ -60,24 +98,29 @@ VCard::List VCardParser::parseVCards( const QString& text ) { + return parseVCardsRaw( text.utf8() ); +} + +VCard::List VCardParser::parseVCardsRaw( const QCString& text ) +{ static QRegExp sep( "[\x0d\x0a]" ); VCard currentVCard; VCard::List vCardList; - QString currentLine; + QCString currentLine; - const QStringList lines = QStringList::split( sep, text ); - QStringList::ConstIterator it; + const QCStringList lines = splitCString( text, sep ); + QCStringList::ConstIterator it; bool inVCard = false; - QStringList::ConstIterator linesEnd( lines.end() ); + QCStringList::ConstIterator linesEnd( lines.end() ); for ( it = lines.begin(); it != linesEnd; ++it ) { if ( (*it).isEmpty() ) // empty line continue; if ( (*it)[ 0 ] == ' ' || (*it)[ 0 ] == '\t' ) { // folded line => append to previous - currentLine += QString( *it ).remove( 0, 1 ); + currentLine.append( (*it).mid( 1 ) ); continue; } else { if ( inVCard && !currentLine.isEmpty() ) { // now parse the line @@ -88,23 +131,23 @@ } VCardLine vCardLine; - const QString key = currentLine.left( colon ).stripWhiteSpace(); - QString value = currentLine.mid( colon + 1 ); + const QCString key = currentLine.left( colon ).stripWhiteSpace(); + QCString value = currentLine.mid( colon + 1 ); - QStringList params = QStringList::split( ';', key ); + QCStringList params = splitCString( key, ';' ); // check for group if ( params[0].find( '.' ) != -1 ) { - const QStringList groupList = QStringList::split( '.', params[0] ); - vCardLine.setGroup( groupList[0] ); - vCardLine.setIdentifier( groupList[1] ); + const QCStringList groupList = splitCString( params[0], '.' ); + vCardLine.setGroup( QString::fromLatin1( groupList[0] ) ); + vCardLine.setIdentifier( QString::fromLatin1( groupList[1] ) ); } else - vCardLine.setIdentifier( params[0] ); + vCardLine.setIdentifier( QString::fromLatin1( params[0] ) ); if ( params.count() > 1 ) { // find all parameters - QStringList::ConstIterator paramIt = params.begin(); + QCStringList::ConstIterator paramIt = params.begin(); for ( ++paramIt; paramIt != params.end(); ++paramIt ) { - QStringList pair = QStringList::split( '=', *paramIt ); + QCStringList pair = splitCString( *paramIt, '=' ); if ( pair.size() == 1 ) { // correct the fucking 2.1 'standard' if ( pair[0].lower() == "quoted-printable" ) { @@ -119,12 +162,12 @@ } // This is pretty much a faster pair[1].contains( ',' )... if ( pair[1].find( ',' ) != -1 ) { // parameter in type=x,y,z format - const QStringList args = QStringList::split( ',', pair[ 1 ] ); - QStringList::ConstIterator argIt; + const QCStringList args = splitCString( pair[ 1 ], ',' ); + QCStringList::ConstIterator argIt; for ( argIt = args.begin(); argIt != args.end(); ++argIt ) - vCardLine.addParameter( pair[0].lower(), *argIt ); + vCardLine.addParameter( QString::fromLatin1( pair[0].lower() ), QString::fromLatin1( *argIt ) ); } else - vCardLine.addParameter( pair[0].lower(), pair[1] ); + vCardLine.addParameter( QString::fromLatin1( pair[0].lower() ), QString::fromLatin1( pair[1] ) ); } } @@ -133,10 +176,8 @@ QByteArray output; bool wasBase64Encoded = false; - params = vCardLine.parameterList(); - if ( params.findIndex( "encoding" ) != -1 ) { // have to decode the data - QByteArray input; - input = QCString(value.latin1()); + if ( vCardLine.parameterList().findIndex( "encoding" ) != -1 ) { // have to decode the data + QByteArray input = value; if ( vCardLine.parameter( "encoding" ).lower() == "b" || vCardLine.parameter( "encoding" ).lower() == "base64" ) { KCodecs::base64Decode( input, output ); @@ -148,14 +189,14 @@ value = value.remove( value.length() - 1, 1 ) + (*it); ++it; } - input = QCString(value.latin1()); + input = value; KCodecs::quotedPrintableDecode( input, output ); } } else { - output = QCString(value.latin1()); + output = value; } - if ( params.findIndex( "charset" ) != -1 ) { // have to convert the data + if ( vCardLine.parameterList().findIndex( "charset" ) != -1 ) { // have to convert the data QTextCodec *codec = QTextCodec::codecForName( vCardLine.parameter( "charset" ).latin1() ); if ( codec ) { @@ -173,17 +214,17 @@ } // we do not save the start and end tag as vcardline - if ( (*it).lower().startsWith( "begin:vcard" ) ) { + if ( cStringStartsWith( (*it).lower(), QCString( "begin:vcard" ) ) ) { inVCard = true; - currentLine.setLength( 0 ); + currentLine = QCString(); currentVCard.clear(); // flush vcard continue; } - if ( (*it).lower().startsWith( "end:vcard" ) ) { + if ( cStringStartsWith( (*it).lower(), QCString( "end:vcard" ) ) ) { inVCard = false; vCardList.append( currentVCard ); - currentLine.setLength( 0 ); + currentLine = QCString(); currentVCard.clear(); // flush vcard continue; } @@ -197,8 +238,13 @@ QString VCardParser::createVCards( const VCard::List& list ) { - QString text; - QString textLine; + return QString::fromUtf8( createVCardsRaw( list ) ); +} + +QCString VCardParser::createVCardsRaw( const VCard::List& list ) +{ + QCString text; + QCString textLine; QString encodingType; QStringList idents; QStringList params; @@ -213,7 +259,7 @@ bool hasEncoding; - text.reserve( list.size() * 300 ); // reserve memory to be more efficient +// text.reserve( list.size() * 300 ); // reserve memory to be more efficient // iterate over the cards VCard::List::ConstIterator listEnd( list.end() ); @@ -228,9 +274,9 @@ for ( lineIt = lines.constBegin(); lineIt != lines.constEnd(); ++lineIt ) { if ( !(*lineIt).value().asString().isEmpty() ) { if ( (*lineIt).hasGroup() ) - textLine = (*lineIt).group() + "." + (*lineIt).identifier(); + textLine = (*lineIt).group().latin1() + QCString( "." ) + (*lineIt).identifier().latin1(); else - textLine = (*lineIt).identifier(); + textLine = (*lineIt).identifier().latin1(); params = (*lineIt).parameterList(); hasEncoding = false; @@ -243,9 +289,9 @@ values = (*lineIt).parameters( *paramIt ); for ( valueIt = values.constBegin(); valueIt != values.constEnd(); ++valueIt ) { - textLine.append( ";" + (*paramIt).upper() ); + textLine.append( QCString( ";" ) + (*paramIt).upper().latin1() ); if ( !(*valueIt).isEmpty() ) - textLine.append( "=" + (*valueIt) ); + textLine.append( QCString( "=" ) + (*valueIt).latin1() ); } } } @@ -261,11 +307,11 @@ KCodecs::quotedPrintableEncode( input, output, false ); } - QString value( output ); + QCString value( output ); addEscapes( value ); textLine.append( ":" + value ); } else { - QString value( (*lineIt).value().asString() ); + QCString value( (*lineIt).value().toString().utf8() ); addEscapes( value ); textLine.append( ":" + value ); } --- kabc/vcardparser/vcardparser.h +++ kabc/vcardparser/vcardparser.h @@ -34,6 +34,9 @@ static VCard::List parseVCards( const QString& text ); static QString createVCards( const VCard::List& list ); + static VCard::List parseVCardsRaw( const QCString& text ); + static QCString createVCardsRaw( const VCard::List& list ); + private: class VCardParserPrivate; VCardParserPrivate *d; --- kabc/vcardtool.cpp +++ kabc/vcardtool.cpp @@ -74,15 +74,28 @@ { } -// TODO: make list a const& +QCString VCardTool::createVCardsRaw( Addressee::List list, VCard::Version version ) +{ + const VCard::List vCardList = createVCardsInternal( list, version ); + + return VCardParser::createVCardsRaw( vCardList ); +} + QString VCardTool::createVCards( Addressee::List list, VCard::Version version ) { - VCard::List vCardList; + const VCard::List vCardList = createVCardsInternal( list, version ); + + return VCardParser::createVCards( vCardList ); +} + +KABC::VCard::List VCardTool::createVCardsInternal( Addressee::List list, KABC::VCard::Version version ) +{ + KABC::VCard::List vCardList; Addressee::List::ConstIterator addrIt; Addressee::List::ConstIterator listEnd( list.constEnd() ); for ( addrIt = list.constBegin(); addrIt != listEnd; ++addrIt ) { - VCard card; + KABC::VCard card; QStringList::ConstIterator strIt; // ADR + LABEL @@ -348,17 +361,30 @@ vCardList.append( card ); } - return VCardParser::createVCards( vCardList ); + return vCardList; +} + +Addressee::List VCardTool::parseVCardsRaw( const QCString& vcard ) +{ + const VCard::List vCardList = VCardParser::parseVCardsRaw( vcard ); + + return parseVCardsInternal( vCardList ); } Addressee::List VCardTool::parseVCards( const QString& vcard ) { + const VCard::List vCardList = VCardParser::parseVCards( vcard ); + + return parseVCardsInternal( vCardList ); +} + +Addressee::List VCardTool::parseVCardsInternal( const VCard::List &vCardList ) +{ static const QChar semicolonSep( ';' ); static const QChar commaSep( ',' ); QString identifier; Addressee::List addrList; - const VCard::List vCardList = VCardParser::parseVCards( vcard ); VCard::List::ConstIterator cardIt; VCard::List::ConstIterator listEnd( vCardList.end() ); --- kabc/vcardtool.h +++ kabc/vcardtool.h @@ -46,12 +46,19 @@ */ QString createVCards( Addressee::List list, VCard::Version version = VCard::v3_0 ); + QCString createVCardsRaw( Addressee::List list, VCard::Version version = VCard::v3_0 ); + /** Parses the string and returns a list of addressee objects. */ Addressee::List parseVCards( const QString& vcard ); + Addressee::List parseVCardsRaw( const QCString& vcard ); + private: + VCard::List createVCardsInternal( Addressee::List list, VCard::Version version ); + Addressee::List parseVCardsInternal( const VCard::List &vCardList ); + /** Split a string and replaces escaped separators on the fly with unescaped ones. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdemultimedia4
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package kdemultimedia4 checked in at Mon Sep 29 17:51:00 CEST 2008. -------- --- KDE/kdemultimedia4/kdemultimedia4.changes 2008-09-15 17:43:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdemultimedia4/kdemultimedia4.changes 2008-09-25 18:59:32.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 25 18:59:27 CEST 2008 - dmueller(a)suse.de + +- update to 4.1.2 + * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php + +------------------------------------------------------------------- Old: ---- kdemultimedia-4.1.1.tar.bz2 New: ---- kdemultimedia-4.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdemultimedia4.spec ++++++ --- /var/tmp/diff_new_pack.bM8932/_old 2008-09-29 17:50:50.000000000 +0200 +++ /var/tmp/diff_new_pack.bM8932/_new 2008-09-29 17:50:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdemultimedia4 (Version 4.1.1) +# spec file for package kdemultimedia4 (Version 4.1.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,8 +25,8 @@ Group: System/GUI/KDE Summary: kdemultimedia base package Url: http://www.kde.org -Version: 4.1.1 -Release: 11 +Version: 4.1.2 +Release: 1 Source0: kdemultimedia-%version.tar.bz2 Source1: _upstream Patch0: 4_1_BRANCH.diff @@ -301,6 +301,9 @@ %doc COPYING COPYING.DOC README %changelog +* Thu Sep 25 2008 dmueller(a)suse.de +- update to 4.1.2 + * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php * Mon Sep 15 2008 dmueller(a)suse.de - fix requires * Thu Aug 28 2008 dmueller(a)suse.de ++++++ 4_1_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.bM8932/_old 2008-09-29 17:50:50.000000000 +0200 +++ /var/tmp/diff_new_pack.bM8932/_new 2008-09-29 17:50:50.000000000 +0200 @@ -1,7 +1,15 @@ -package: kdemultimedia-4.1.1.tar.bz2 +package: kdemultimedia-4.1.2.tar.bz2 kdemod: kdemultimedia --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: 853806 -+svn di between //tags/KDE/4.1.1/kdemultimedia and //tags/KDE/4.1.1/kdemultimedia ++current HEAD: ++svn di between //tags/KDE/4.1.2/kdemultimedia and //branches/KDE/4.1/kdemultimedia + +Eigenschaftsänderungen: . +___________________________________________________________________ +Gelöscht: svn:mergeinfo +Hinzugefügt: svn:externals + + + + ++++++ kdemultimedia-4.1.1.tar.bz2 -> kdemultimedia-4.1.2.tar.bz2 ++++++ Files old/kdemultimedia-4.1.1/doc/dragonplayer/index.cache.bz2 and new/kdemultimedia-4.1.2/doc/dragonplayer/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.1/doc/dragonplayer/index.docbook new/kdemultimedia-4.1.2/doc/dragonplayer/index.docbook --- old/kdemultimedia-4.1.1/doc/dragonplayer/index.docbook 2008-06-03 11:34:57.000000000 +0200 +++ new/kdemultimedia-4.1.2/doc/dragonplayer/index.docbook 2008-09-25 14:01:51.000000000 +0200 @@ -112,8 +112,6 @@ </chapter> - - <chapter id="commands"> <title>Menu and Command Reference</title> @@ -123,7 +121,7 @@ <varlistentry> <term><menuchoice> <shortcut> -<keycombo><keycap>Ctrl</keycap><keycap>o</keycap></keycombo> +<keycombo>&Ctrl;<keycap>O</keycap></keycombo> </shortcut> <guimenu>Play</guimenu> <guimenuitem>Play Media...</guimenuitem> @@ -137,16 +135,27 @@ <keycombo><keycap>Space</keycap></keycombo> </shortcut> <guimenu>Play</guimenu> -<guimenuitem>Play/Pause</guimenuitem> +<guimenuitem>Play</guimenuitem> </menuchoice></term> -<listitem><para><action>If a movie is loaded, this option allows you to pause or resume playback.</action></para></listitem> +<listitem><para><action>If a movie is loaded, this option allows you to pause playback.</action></para></listitem> +</varlistentry> + +<varlistentry> +<term><menuchoice> +<shortcut> +<keycombo><keycap>S</keycap></keycombo> +</shortcut> +<guimenu>Play</guimenu> +<guimenuitem>Stop</guimenuitem> +</menuchoice></term> +<listitem><para><action>If a movie is loaded, this option allows you to resume playback.</action></para></listitem> </varlistentry> <varlistentry> <term><menuchoice> <shortcut> -<keycombo><keycap>Ctrl</keycap><keycap>q</keycap></keycombo> +<keycombo>&Ctrl;<keycap>Q</keycap></keycombo> </shortcut> <guimenu>Play</guimenu> <guimenuitem>Quit</guimenuitem> @@ -163,6 +172,9 @@ <varlistentry> <term><menuchoice> +<shortcut> +<keycombo><keycap>F</keycap></keycombo> +</shortcut> <guimenu>Settings</guimenu> <guimenuitem>Full Screen Mode</guimenuitem> </menuchoice></term> @@ -174,7 +186,7 @@ <varlistentry> <term><menuchoice> <guimenu>Settings</guimenu> -<guimenuitem>Aspect Ratio</guimenuitem> +<guisubmenu>Aspect Ratio</guisubmenu> </menuchoice></term> <listitem><para><action>This menu lets you pick the aspect ratio of the playing movie. The aspect ratio is width of movie compared to the height.</action></para></listitem> </varlistentry> @@ -182,7 +194,7 @@ <varlistentry> <term><menuchoice> <guimenu>Settings</guimenu> -<guimenuitem>Subtitles</guimenuitem> +<guisubmenu>Subtitles</guisubmenu> </menuchoice></term> <listitem><para><action> This menu is active if there are any subtitles available from the currently playing movie. Note that it may take a few seconds of playback before the subtitles become available. @@ -192,7 +204,7 @@ <varlistentry> <term><menuchoice> <guimenu>Settings</guimenu> -<guimenuitem>Audio Channels</guimenuitem> +<guisubmenu>Audio Channels</guisubmenu> </menuchoice></term> <listitem><para><action> This menu is active if there are any additional audio channels available. For instance, some DVDs have additional languages. Note that it may take a few seconds of playback before the audio channels become available. @@ -201,79 +213,58 @@ <varlistentry> <term><menuchoice> +<shortcut> +<keycombo><keycap>R</keycap></keycombo> +</shortcut> <guimenu>Settings</guimenu> -<guimenuitem>Configure Shortcuts...</guimenuitem> +<guimenuitem>Menu Toggle</guimenuitem> </menuchoice></term> -<listitem><para><action>Allows you to configure the &codeine; shortcuts.</action></para></listitem> +<listitem><para><action> + To be written</action></para></listitem> </varlistentry> <varlistentry> <term><menuchoice> <guimenu>Settings</guimenu> -<guimenuitem>Configure Toolbars...</guimenuitem> +<guimenuitem>Videosettings</guimenuitem> </menuchoice></term> -<listitem><para><action>Allows you to configure the &codeine; what buttons are available on the toolbar.</action></para></listitem> +<listitem><para><action> + To be written +</action></para></listitem> </varlistentry> <varlistentry> <term><menuchoice> <guimenu>Settings</guimenu> -<guimenuitem>Show Toolbar</guimenuitem> +<guimenuitem>Configure Shortcuts...</guimenuitem> </menuchoice></term> -<listitem><para><action>Enables or disable the main application toolbar.</action></para></listitem> +<listitem><para><action>Allows you to configure the &codeine; shortcuts.</action></para></listitem> </varlistentry> -</variablelist> -</sect1> - -<sect1 id="help_menu"> -<title>The Help Menu</title> -<variablelist> - <varlistentry> <term><menuchoice> -<guimenu>Help</guimenu> -<guimenuitem>&codeine; Handbook</guimenuitem> +<guimenu>Settings</guimenu> +<guimenuitem>Configure Toolbars...</guimenuitem> </menuchoice></term> -<listitem><para><action>Opens this help document.</action></para></listitem> +<listitem><para><action>Allows you to configure the &codeine; what buttons are available on the toolbar.</action></para></listitem> </varlistentry> <varlistentry> <term><menuchoice> -<shortcut> -<keycombo><keycap>Shift</keycap><keycap>F1</keycap></keycombo> -</shortcut> -<guimenu>Help</guimenu> -<guimenuitem>What's This?</guimenuitem> +<guimenu>Settings</guimenu> +<guimenuitem>Show Toolbar</guimenuitem> </menuchoice></term> -<listitem><para><action>Activates the "What's This?" mouse cursor allowing you to click an object to get a "What's this?" tooltip.</action></para></listitem> +<listitem><para><action>Enables or disable the main application toolbar.</action></para></listitem> </varlistentry> -<varlistentry> -<term><menuchoice> -<guimenu>Help</guimenu> -<guimenuitem>Report Bug...</guimenuitem> -</menuchoice></term> -<listitem><para><action>Starts the bug report tool dialog window.</action></para></listitem> -</varlistentry> +</variablelist> +</sect1> -<varlistentry> -<term><menuchoice> -<guimenu>Help</guimenu> -<guimenuitem>About &codeine;</guimenuitem> -</menuchoice></term> -<listitem><para><action>Starts the About &codeine; dialog window.</action></para></listitem> -</varlistentry> +<sect1 id="help_menu"> +<title>The Help Menu</title> -<varlistentry> -<term><menuchoice> -<guimenu>Help</guimenu> -<guimenuitem>About KDE</guimenuitem> -</menuchoice></term> -<listitem><para><action>Starts the About &kde; dialog window.</action></para></listitem> -</varlistentry> +&help.menu.documentation; -</variablelist> </sect1> @@ -379,7 +370,7 @@ <title>How to obtain &codeine;</title> <para> -&codeine; is not yet part of the &kde; project, it can be found at: +&codeine; is part of the &kde; multimedia module, it can be found at: <ulink url="http://www.dragonplayer.org">http://www.dragonplayer.org</ulink>. </para> </sect1> Files old/kdemultimedia-4.1.1/doc/juk/index.cache.bz2 and new/kdemultimedia-4.1.2/doc/juk/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.1/doc/juk/index.docbook new/kdemultimedia-4.1.2/doc/juk/index.docbook --- old/kdemultimedia-4.1.1/doc/juk/index.docbook 2008-01-05 01:02:08.000000000 +0100 +++ new/kdemultimedia-4.1.2/doc/juk/index.docbook 2008-09-25 14:01:51.000000000 +0200 @@ -548,7 +548,7 @@ <para>You can select multiple files in the list view, and edit one or more fields in the tags for all files at once.</para> -<para>Use <keycap>Shift</keycap> and the &LMB; to select a contiguous +<para>Use &Shift; and the &LMB; to select a contiguous list of files, and &Ctrl; and &LMB; to select individual non-contiguous files.</para> @@ -669,7 +669,7 @@ <para>You can test your filename scheme by using the <guilabel>Current filename</guilabel> editor at the bottom of the dialog. Type in a filename of a music file, and the <guilabel>New -filename</guilabel> area will display would &juk; would rename the file as given the current +filename</guilabel> area will display how &juk; would rename the file as given the current settings. </para> </sect1> @@ -730,7 +730,7 @@ </para> <para>The Advanced Search dialog is used to create <link linkend="juk-search-playlists">Search -Playlists</link>. It allows you create a fine-grained search among the different tags of +Playlists</link>. It allows you to make a fine-grained search among the different tags of your song collection.</para> <para>At the top of the dialog, you can type in the name of your search playlist. Then, you @@ -814,7 +814,7 @@ <title>Examples of adding covers</title> -<para>So just as an example, let's say you wanted to set a cover for tracks you just ripped off of your &CD;. We'll use <quote>Alabama - Greatest Hits III</quote> for the sake of discussion. In &juk; 2.2, you could simply select any one of those tracks, and import a cover from the Internet by right-clicking on that track, and using the <menuchoice><guimenu>Tagger</guimenu> <guisubmenu>Cover Manager</guisubmenu> <guimenuitem>Get Cover From Internet</guimenuitem></menuchoice> command. As a side effect of the way &juk; worked, the cover would then be immediately applied to <emphasis>all</emphasis> of the <quote>Alabama - Greatest Hits III</quote> tracks, <emphasis>whether you wanted that or not</emphasis></para> +<para>So just as an example, let's say you wanted to set a cover for tracks you just ripped off of your &CD;. We'll use <quote>Alabama - Greatest Hits III</quote> for the sake of discussion. In &juk; 2.2, you could simply select any one of those tracks, and import a cover from the Internet by right-clicking on that track, and using the <menuchoice><guimenu>Tagger</guimenu> <guisubmenu>Cover Manager</guisubmenu> <guimenuitem>Get Cover From Internet</guimenuitem></menuchoice> command. As a side effect of the way &juk; worked, the cover would then be immediately applied to <emphasis>all</emphasis> of the <quote>Alabama - Greatest Hits III</quote> tracks, <emphasis>whether you wanted that or not</emphasis>.</para> <para>In &juk; 2.3, the procedure is exactly the same, with one exception: You should select all of the tracks you want to apply the cover to first. So you would select all the <quote>Alabama - Greatest Hits III</quote> tracks before using the <menuchoice><guimenuitem>Get Cover From Internet</guimenuitem></menuchoice> command. Or if you only wanted to set cover art to half of the tracks for some reason, you'd only select half the tracks before running the <menuchoice><guimenuitem>Get Cover From Internet</guimenuitem></menuchoice> command. Don't worry about duplicating covers, either: &juk; is smart enough to re-use the same image, so you won't get 14 duplicate <literal role="extension">.png</literal> images cluttering your hard drive.</para> </sect3> Files old/kdemultimedia-4.1.1/doc/kmix/index.cache.bz2 and new/kdemultimedia-4.1.2/doc/kmix/index.cache.bz2 differ Files old/kdemultimedia-4.1.1/doc/kscd/index.cache.bz2 and new/kdemultimedia-4.1.2/doc/kscd/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.1/doc/kscd/index.docbook new/kdemultimedia-4.1.2/doc/kscd/index.docbook --- old/kdemultimedia-4.1.1/doc/kscd/index.docbook 2008-05-29 13:20:13.000000000 +0200 +++ new/kdemultimedia-4.1.2/doc/kscd/index.docbook 2008-09-25 14:01:51.000000000 +0200 @@ -76,12 +76,12 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2005-12-22</date> +<date>2008-08-01</date> <releaseinfo>1.5</releaseinfo> <abstract> <para>&kscd; is a small, fast, <abbrev>CDDB</abbrev> enabled audio -<abbrev>&CD;</abbrev> player for &UNIX; platforms.</para> +<abbrev>&CD;</abbrev> player for &UNIX;, &Windows; and &MacOS; platforms.</para> </abstract> <keywordset> @@ -98,8 +98,8 @@ <chapter id="introduction"> <title>Introduction</title> -<para>&kscd; is a fast, <acronym>CDDB</acronym> enabled &CD; player for the &UNIX; -platform. &kscd; stands for <quote>The KDE Project's small/simple &CD; +<para>&kscd; is a fast, <acronym>CDDB</acronym> enabled &CD; player for &UNIX;, +&Windows; and &MacOS; platforms. &kscd; stands for <quote>The &kde; Project's small/simple &CD; player</quote>.</para> <para><emphasis>New</emphasis>: the <filename>workman2cddb.pl</filename> Perl @@ -130,6 +130,8 @@ <listitem><para>Sony NEWS</para></listitem> <listitem><para>OSF/1</para></listitem> <listitem><para>Ultrix</para></listitem> +<listitem><para>&Windows;</para></listitem> +<listitem><para>&MacOS;</para></listitem> </itemizedlist> <para>and should compile on many others with few modifications.</para> @@ -210,7 +212,7 @@ </sect2> <sect2 id="configuration-button"> -<title>The <guibutton>Configuration</guibutton> button</title> +<title>The <guibutton>Extras</guibutton> button</title> <screenshot> <screeninfo>The Extras button</screeninfo> @@ -253,8 +255,6 @@ </sect2> - - <sect2> <title>The Volume slider</title> @@ -283,7 +283,7 @@ </mediaobject> </screenshot> -<para>This combo box shows you the current track number, the name of the track and the time (in minutes and seconds). You can use this drop down box to directly select +<para>This drop down box shows you the current track number, the name of the track and the time (in minutes and seconds). You can use this drop down box to directly select any track on the &CD;. </para> </sect2> @@ -296,7 +296,7 @@ <title>The primary configuration window</title> <para>You configure &kscd; by clicking on the <guibutton>Extras</guibutton> button. This will bring up a menu, select -<guilabel>Configure &kscd;...</guilabel>. This will open a new window.</para> +<guilabel>Configure &kscd;...</guilabel> to open a new window.</para> <para>The primary configuration window for &kscd; is divided into two major sections. </para> @@ -316,46 +316,17 @@ <screeninfo>The <guilabel>CD Player</guilabel> dialog</screeninfo> <mediaobject> <imageobject><imagedata fileref="kscd12.png" format="PNG"/></imageobject> -<textobject><phrase>The <guilabel>KSCD Configuration</guilabel> dialog</phrase></textobject> +<textobject><phrase>The <guilabel>CD Player</guilabel> dialog</phrase></textobject> </mediaobject> </screenshot> -<para>The <guilabel>LCD font:</guilabel> text box lists the currently selected font to display all information in the &kscd; status display. To change the font, click the <guibutton>Choose...</guibutton> button.</para> +<para>The <guilabel>LCD font</guilabel> text box lists the currently selected font to display all information in the &kscd; status display. To change the font, click the <guibutton>Choose...</guibutton> button.</para> -<para>The <guilabel>LCD color:</guilabel> and <guilabel>Background -color:</guilabel> fields show the color selected for the foreground and +<para>The <guilabel>LCD color</guilabel> and <guilabel>Background +color</guilabel> fields show the color selected for the foreground and background of the status display. Press the color bars to change these colors.</para> - - - <para>Placing a mark in the check box labeled <guilabel>Show icon in system tray</guilabel> causes a &kscd; control to appear in the &kicker; panel.</para> @@ -370,11 +341,6 @@ </mediaobject> </screenshot> - -<para>Set the <guilabel>Skip interval</guilabel> box to the desired number of -seconds to move ahead or behind when the <guibutton>forward skip</guibutton> -or <guibutton>reverse skip</guibutton> buttons in the Control Panel are pressed.</para> - <para><guilabel>Autoplay when CD inserted</guilabel> causes &kscd; to start playing the &CD; when the tray is closed, with no need to press the <guibutton>Play</guibutton> button.</para> @@ -406,14 +372,15 @@ <para>The check box labeled <guilabel>Use direct digital playback</guilabel> determines which method &kscd; uses to read the audio tracts. If there is a mark in the check box, the first method is used. If there is no mark in the check box, the second method is utilized.</para> -<para>If you have selected direct digital playback, a drop down box labeled <guilabel>Select audio backend:</guilabel> will let you select which +<para>If you have selected direct digital playback, a drop down box labeled <guilabel>Select audio backend</guilabel> will let you select which sound backend the digital information should be sent to. The contents of the drop down box will vary depending on your system. Most users should select <guilabel>arts</guilabel>. You can also select the device the audio backend uses by entering the device location in -the text box labeled <guilabel>Select audio device:</guilabel>. A full discussion of audio devices and audio backends is beyond the scope of this manual.</para> +the text box labeled <guilabel>Select audio device</guilabel>. A full discussion of audio devices and audio backends is beyond the scope of this manual.</para> <para>If a mark is placed in the check box labeled <guilabel>Allow encoding selection</guilabel>, you can select the text encoding for the results of a CDDB request.</para> <tip><para>The standard describes CDDB results as being strictly Latin 1. If you are not having problems with your CDDB information, leave this box unchecked.</para></tip> + <para>The <guibutton>Help</guibutton> button opens the &kscd; help contents page. The <guibutton>Defaults</guibutton> button restores the default values of all entries in this dialog; <guibutton>OK</guibutton> saves the current settings and exits; @@ -421,34 +388,36 @@ <guibutton>Cancel</guibutton> exits without saving. </para> </sect1> -<sect1 id="freedb-tab"> -<title>The <guilabel>freedb Lookup</guilabel> tab</title> + +<sect1 id="cddb-page"> +<title>The <guilabel>CDDB</guilabel> Page</title> +<para>The <guilabel>CDDB</guilabel> page is divided in the <guilabel>Lookup</guilabel> tab +and the <guilabel>Submit</guilabel> tab.</para> + +<sect2 id="lookup-tab"> +<title>The <guilabel>Lookup</guilabel> Tab</title> <screenshot> -<screeninfo>The <guilabel>freedb Lookup</guilabel> tab of the configuration dialog</screeninfo> +<screeninfo>The <guilabel>Lookup</guilabel> tab of the configuration dialog</screeninfo> <mediaobject> <imageobject> <imagedata fileref="kscd14.png" format="PNG"/> </imageobject> -<textobject><phrase>The <guilabel>freedb Lookup</guilabel> tab of the configuration +<textobject><phrase>The <guilabel>Lookup</guilabel> tab of the configuration dialog</phrase></textobject> </mediaobject> </screenshot> -<para> The <guilabel>freedb Lookup</guilabel> tab sets up the <acronym>CDDB</acronym> functions +<para> The <guilabel>Lookup</guilabel> tab sets up the <acronym>CDDB</acronym> functions of &kscd;.</para> -<para>The <guilabel>Mode</guilabel> option determines how <acronym>CDDB</acronym> lookups -are performed. Setting <guilabel>Cache only</guilabel> means that only information already -on your computer will be used. <guilabel>Cache and remote</guilabel> will look up -information you do not already have while <guilabel>Remote only</guilabel> looks up -every disc over the Internet.</para> - +<para>You can select the options <guilabel>Enable MusicBrainz lookup</guilabel> or +<guilabel>Enable freedb lookup</guilabel>.</para> -<para>The <guilabel>CDDB Server:</guilabel> section determines which CDDB mirror site is used by &kscd; to +<para>The <guilabel>Freedb server</guilabel> section determines which CDDB mirror site is used by &kscd; to get album information. You can enter a server name, port number and protocol using the text boxes and drop down boxes or you can click the <guibutton>Show Mirror List</guibutton> button. Clicking this button will open a new window with a list of CDDB mirrors and their locations. Simply select the server you want from the list and click <guibutton>OK</guibutton>.</para> -<para>The section labeled <guilabel>Cache locations</guilabel> lets you determine where &kscd; saves CDDB information +<para>The section labeled <guilabel>Cache Locations</guilabel> lets you determine where &kscd; saves CDDB information on your computer. To add a folder, enter the folder location in the text box at the top of the section and click <guibutton>Add</guibutton>. You can also select a folder by clicking on the blue file folder to the right of the text box. To delete a folder, click on the folder name @@ -460,23 +429,24 @@ <guibutton>Apply</guibutton> saves the current settings without exiting; <guibutton>Cancel</guibutton> exits without saving. </para> -</sect1> +</sect2> -<sect1 id="smtp-options"> -<title>The <guilabel>freedb Submit</guilabel> tab</title> +<sect2 id="submit-tab"> +<title>The <guilabel>Submit</guilabel> Tab</title> <screenshot> -<screeninfo>The freedb Submit tab</screeninfo> +<screeninfo>The Submit tab</screeninfo> <mediaobject> <imageobject><imagedata fileref="kscd16.png" format="PNG"/></imageobject> </mediaobject> </screenshot> -<para>The freedb Submit tab sets up connection to a mail +<para>The f<guilabel>Submit</guilabel> tab sets up connection to a mail server or a web server to submit new <acronym>CDDB</acronym> entries. This is useful if you do not have your own system configured as a server. </para> -<para>If you plan to submit a CDDB entry, first you must decide between submitting between &HTTP; +<para>If you plan to submit a CDDB entry, enter your email address into the first textbox, +then you must decide between submitting between &HTTP; and submitting the entry as an email (via &SMTP;). </para> <tip><para>It is simpler to submit new entries using &HTTP;. Some firewalls block this traffic. If your @@ -485,36 +455,37 @@ <para>First select either <guilabel>&HTTP;</guilabel> or <guilabel>SMTP (Email)</guilabel> to determine which protocol to use.</para> -<sect2 id="http-options"> +<sect3 id="http-options"> <title>Using &HTTP; to send CDDB information</title> <para>You can enter a server name or port number in the text boxes provided. If you want to send this information to the international servers, you do not need to change anything.</para> -</sect2> +</sect3> -<sect2 id="smtp2-options"> +<sect3 id="smtp-options"> <title>Using &SMTP; (Email) to send CDDB information</title> <para>To prepare to submit information using email, enter your email address in the text box labeled <guilabel>Reply-To:</guilabel>, your email server in the text box -labeled <guilabel>SMTP-server:</guilabel> and select the port number in the drop down box +labeled <guilabel>SMTP server:</guilabel> and select the port number in the spinbox labeled <guilabel>Port:</guilabel>.</para> <para>If you need to use a password to send email using the email server, place a mark in the check box labeled <guilabel>Server needs authentication</guilabel> and enter your -username in the text box labeled <guilabel>Username:</guilabel>.</para> +username in the text box labeled <guilabel>Username</guilabel>.</para> <para>The <guibutton>Help</guibutton> button opens the &kscd; help contents page. The <guibutton>Defaults</guibutton> button restores the default values of all entries in this dialog; <guibutton>OK</guibutton> saves the current settings and exits; <guibutton>Apply</guibutton> saves the current settings without exiting; <guibutton>Cancel</guibutton> exits without saving. </para> +</sect3> </sect2> </sect1> - </chapter> + <chapter id="cddb-editor"> -<title>The <guilabel>CD Database Editor</guilabel></title> +<title>The CD Database Editor</title> <screenshot> <screeninfo>The &CD; Database Editor</screeninfo> @@ -529,7 +500,7 @@ Data Base)</link> entries.</para> <para>If there is an entry in your local <acronym>CDDB</acronym> tree -(see the <link linkend="freedb-tab">CDDB subsection</link> in the +(see the <link linkend="cddb-page">CDDB subsection</link> in the Configuration chapter) for the &CD; in your &CD-ROM; drive, or if the disc could be found in the freedb, you will see the name of the artist and the title of the &CD; in the <guilabel>Artist:</guilabel> and @@ -538,7 +509,7 @@ you will see a list of tracks and play times without titles.</para> <para>You can make an annotation for the entire disc with the -<guibutton>Comment</guibutton> button under the +<guilabel>Comment</guilabel> field under the <guilabel>Title</guilabel> field, or for a selected track in the <guilabel>Tracks</guilabel> selection box with the adjacent <guibutton>Comment</guibutton> button. If you select a track in the @@ -560,7 +531,7 @@ <guilabel>freedb</guilabel> entry. These categories correspond to the subfolders tree of the folder chosen in the <guilabel>freedb Base Folder:</guilabel> in the <link -linkend="freedb-tab"><guilabel>freedb</guilabel> tab</link> of the &kscd; +linkend="cddb-page"><guilabel>CDDB</guilabel> page</link> of the &kscd; Configuration window.</para> <para>The <guilabel>Length:</guilabel> display shows the total play time of @@ -586,18 +557,17 @@ </screenshot> <para>When the <guilabel>Show icon in system tray</guilabel> box is checked, a -small &kscd; applet is also displayed in the &kicker;. Unlike the main &kscd; window, this applet is available on +small &kscd; applet is also displayed in the panel. Unlike the main &kscd; window, this applet is available on any desktop. <mousebutton>Right</mousebutton> click on the applet to pop up a -menu to control &CD; playback. A <mousebutton>left</mousebutton> click on the +menu to control &CD; playback. A &LMB; click on the applet hides the main &kscd; window. If the main window is hidden, a second -<mousebutton>left</mousebutton> click on the applet restores it. </para> +&LMB; click on the applet restores it. </para> <note><para>To be precise, the applet is displayed in the <application>system tray</application> in the panel. If no applet appears when &kscd; is minimized, you may have removed the tray. To add it, <mousebutton>right</mousebutton> click -on an empty spot on the panel and select <menuchoice><guisubmenu>Add</guisubmenu> -<guisubmenu>Applet</guisubmenu> <guimenuitem>System Tray</guimenuitem> -</menuchoice></para></note> +on an empty spot on the panel and select <guimenuitem>Add Widgets...</guimenuitem>. +In the upcoming dialog, choose <guimenuitem>System Tray</guimenuitem></para></note> </chapter> @@ -608,7 +578,7 @@ over the Internet that contains information about most audio &CD;s in circulation. If you have Internet access, you will likely never have to manually enter track information for your &CD;s if you have this set up properly. See -<link linkend="freedb-tab">The freedb Tab</link> subsection in the configuring +<link linkend="cddb-page">The CDDB Page</link> subsection in the configuring &kscd; chapter for detailed instructions on how to configure this service, and the <link linkend="cddb-editor">The &CD; Database Editor</link> section for instructions on how to edit <acronym>CDDB</acronym> entries.</para> @@ -649,6 +619,9 @@ better to do with your spare time.</para> </chapter> + <chapter id="questions-and-answers"> <title>Questions and answers</title> @@ -819,7 +789,7 @@ </screenshot> </question> <answer><para>This means that &kscd; couldn't open your &CD-ROM; drive. The name of -the device in the <guilabel>&CD-ROM; Device</guilabel>cdrom field of the +the device in the <guilabel>&CD-ROM; Device</guilabel> field of the <guilabel>Kscd Configuration</guilabel> must actually refer to the block device associated with your &CD-ROM; drive. This will often be a hardlink to the appropriate <acronym>IDE</acronym> (<filename>/dev/hdx</filename>) or @@ -871,7 +841,7 @@ <para>Special thanks to Ti Kan and Steve Scherf, the inventors of the <acronym>CDDB</acronym> database concept. Visit <ulink -url="http://www.cddb.com/">http://ww.cddb.com</ulink> for more information on +url="http://www.cddb.com/">http://www.cddb.com</ulink> for more information on <acronym>CDDB</acronym>.</para> <para>A very special thank you also to David White who wrote the original &kscd; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.1/dragonplayer/src/app/videoWindow.cpp new/kdemultimedia-4.1.2/dragonplayer/src/app/videoWindow.cpp --- old/kdemultimedia-4.1.1/dragonplayer/src/app/videoWindow.cpp 2008-06-10 13:41:37.000000000 +0200 +++ new/kdemultimedia-4.1.2/dragonplayer/src/app/videoWindow.cpp 2008-09-25 14:01:50.000000000 +0200 @@ -529,15 +529,13 @@ refreshXineStream(); updateChannels(); - if(m_adjustedSize==false) - { - ( (QWidget*) mainWindow() )->adjustSize(); - m_adjustedSize=true; - debug() << "adjusting size to video resolution"; - } - //m_vWidget->updateGeometry(); - //updateGeometry(); - + if(m_adjustedSize==false) + { + if( mainWindow() ) + ( (QWidget*) mainWindow() )->adjustSize(); + m_adjustedSize=true; + debug() << "adjusting size to video resolution"; + } } emit stateChanged( state( currentState ) ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.1/juk/playlistsplitter.cpp new/kdemultimedia-4.1.2/juk/playlistsplitter.cpp --- old/kdemultimedia-4.1.1/juk/playlistsplitter.cpp 2008-06-18 14:42:28.000000000 +0200 +++ new/kdemultimedia-4.1.2/juk/playlistsplitter.cpp 2008-09-25 14:01:50.000000000 +0200 @@ -199,6 +199,8 @@ m_playlistBox->object(), SLOT(slotCreateSearchPlaylist())); connect(m_searchWidget, SIGNAL(signalShown(bool)), m_playlistBox->object(), SLOT(slotSetSearchEnabled(bool))); + connect(m_searchWidget, SIGNAL(returnPressed()), + m_playlistBox->object(), SLOT(slotPlayFirst())); connect(ActionCollection::action<KToggleAction>("showSearch"), SIGNAL(toggled(bool)), m_searchWidget, SLOT(setEnabled(bool))); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.1/juk/searchwidget.cpp new/kdemultimedia-4.1.2/juk/searchwidget.cpp --- old/kdemultimedia-4.1.1/juk/searchwidget.cpp 2008-01-05 01:02:03.000000000 +0100 +++ new/kdemultimedia-4.1.2/juk/searchwidget.cpp 2008-09-25 14:01:50.000000000 +0200 @@ -209,6 +209,7 @@ connect(&m_searchLine, SIGNAL(signalQueryChanged()), this, SIGNAL(signalQueryChanged())); connect(&m_searchLine, SIGNAL(signalDownPressed()), this, SIGNAL(signalDownPressed())); + connect(m_searchLine.m_lineEdit, SIGNAL(returnPressed()), this, SIGNAL(returnPressed())); // I've decided that I think this is ugly, for now. /* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.1/juk/searchwidget.h new/kdemultimedia-4.1.2/juk/searchwidget.h --- old/kdemultimedia-4.1.1/juk/searchwidget.h 2008-01-05 01:02:04.000000000 +0100 +++ new/kdemultimedia-4.1.2/juk/searchwidget.h 2008-09-25 14:01:50.000000000 +0200 @@ -30,11 +30,14 @@ class KComboBox; class KLineEdit; +class SearchWidget; class SearchLine : public QFrame { Q_OBJECT + friend class SearchWidget; + public: enum Mode { Default = 0, CaseSensitive = 1, Pattern = 2 }; @@ -88,6 +91,7 @@ signals: void signalQueryChanged(); void signalAdvancedSearchClicked(); + void returnPressed(); // This signal is only emitted when the Show/Hide action is triggered. // Minimizing/closing the JuK window will not trigger this signal. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdelibs4
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package kdelibs4 checked in at Mon Sep 29 17:50:55 CEST 2008. -------- --- KDE/kdelibs4/kdelibs4.changes 2008-09-13 13:15:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4.changes 2008-09-29 08:02:51.000000000 +0200 @@ -1,0 +2,17 @@ +Thu Sep 25 18:59:04 CEST 2008 - dmueller(a)suse.de + +- update to 4.1.2 + * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php + +------------------------------------------------------------------- +Thu Sep 25 15:27:24 CEST 2008 - schwab(a)suse.de + +- Mark register stack in collector. + +------------------------------------------------------------------- +Mon Sep 15 15:14:54 CEST 2008 - llunak(a)suse.cz + +- read .desktop file translations from .mo files if not present + (fate#300461) + +------------------------------------------------------------------- Old: ---- kdelibs-4.1.1.tar.bz2 New: ---- desktop-translations.diff kdelibs-4.1.2.tar.bz2 kjs-mark-register-stack.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.Oo6717/_old 2008-09-29 17:50:09.000000000 +0200 +++ /var/tmp/diff_new_pack.Oo6717/_new 2008-09-29 17:50:09.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdelibs4 (Version 4.1.1) +# spec file for package kdelibs4 (Version 4.1.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -32,9 +32,13 @@ Group: System/GUI/KDE Summary: KDE Base Libraries Url: http://www.kde.org -Version: 4.1.1 -Release: 12 +Version: 4.1.2 +Release: 1 +%if %suse_version > 1010 Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`) +%else +Requires: qt-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' qt-x11`) +%endif Requires: libstrigi0 >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`) Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) @@ -57,6 +61,8 @@ Patch9: kdesu-settings.diff Patch10: kdebug-areas-update.diff Patch11: display-key-support.diff +Patch12: desktop-translations.diff +Patch13: kjs-mark-register-stack.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?opensuse_bs} %define debug_package_requires %name = %version libqt4-debuginfo @@ -87,9 +93,9 @@ %patch8 %patch9 %patch10 -%if %suse_version > 1100 %patch11 -%endif +%patch12 +%patch13 # # define KDE version exactly # @@ -305,7 +311,12 @@ Requires: kdelibs4 = %version Requires: kdelibs4-doc = %version Requires: libkde4 = %version libkdecore4-devel = %version -Requires: libqt4-devel libxslt-devel libattr-devel aspell-devel libtiff-devel pcre-devel +Requires: libxslt-devel libattr-devel aspell-devel libtiff-devel pcre-devel +%if %suse_version > 1010 +Requires: libqt4-devel +%else +Requires: qt-devel +%endif Requires: giflib-devel alsa-devel cups-devel %if %suse_version > 1020 Requires: avahi-compat-mDNSResponder-devel @@ -367,6 +378,14 @@ /usr/share/mime/packages/kde.xml %changelog +* Thu Sep 25 2008 dmueller(a)suse.de +- update to 4.1.2 + * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php +* Thu Sep 25 2008 schwab(a)suse.de +- Mark register stack in collector. +* Mon Sep 15 2008 llunak(a)suse.cz +- read .desktop file translations from .mo files if not present + (fate#300461) * Sat Sep 13 2008 stbinner(a)suse.de - actually apply patch from last commit * Fri Sep 12 2008 llunak(a)suse.cz ++++++ 4_1_BRANCH.diff ++++++ ++++ 3565 lines (skipped) ++++ between KDE/kdelibs4/4_1_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdelibs4/4_1_BRANCH.diff ++++++ desktop-translations.diff ++++++ Subject: Read .desktop file translations from .mo files if not present From: Lubos Lunak Fate: #300461 Patch-upstream: no Relates: kdelibs3/desktop-translations.diff --- kdecore/services/kservicegroup.cpp.sav 2008-09-15 14:43:32.000000000 +0200 +++ kdecore/services/kservicegroup.cpp 2008-09-15 15:03:12.000000000 +0200 @@ -57,9 +57,9 @@ void KServiceGroupPrivate::load(const QS const KConfigGroup config = desktopFile.desktopGroup(); - m_strCaption = config.readEntry( "Name" ); - m_strIcon = config.readEntry( "Icon" ); - m_strComment = config.readEntry( "Comment" ); + m_strCaption = desktopFile.readName(); + m_strIcon = desktopFile.readIcon(); + m_strComment = desktopFile.readComment(); deleted = config.readEntry("Hidden", false ); m_bNoDisplay = desktopFile.noDisplay(); m_strBaseGroupName = config.readEntry( "X-KDE-BaseGroup" ); --- kdecore/config/kconfigdata.h.sav 2008-09-15 14:43:32.000000000 +0200 +++ kdecore/config/kconfigdata.h 2008-09-15 15:03:12.000000000 +0200 @@ -174,6 +174,19 @@ class KEntryMap : public QMap<KEntryKey, return find(theKey); } + ConstIterator findExactEntry(const QByteArray& group, const QByteArray& key = QByteArray(), + SearchFlags flags = SearchFlags()) const + { + KEntryKey theKey(group, key, false, bool(flags&SearchDefaults)); + + // try the localized key first + if (flags&SearchLocalized) { + theKey.bLocal = true; + return find(theKey); + } + return find(theKey); + } + Iterator findEntry(const QByteArray& group, const QByteArray& key = QByteArray(), SearchFlags flags = SearchFlags()) { --- kdecore/config/kdesktopfile.cpp.sav 2008-09-15 14:43:32.000000000 +0200 +++ kdecore/config/kdesktopfile.cpp 2008-09-15 15:03:12.000000000 +0200 @@ -34,6 +34,8 @@ #include "kstandarddirs.h" #include "kconfigini_p.h" #include "kde_file.h" +#include "kcatalog_p.h" +#include "klocale.h" class KDesktopFilePrivate : public KConfigPrivate { @@ -162,6 +164,29 @@ bool KDesktopFile::isAuthorizedDesktopFi return false; } +QString KDesktopFile::translatedEntry(const char* key) const +{ + Q_D(const KDesktopFile); + if (d->desktopGroup.hasTranslatedKey(key)) + return d->desktopGroup.readEntry(key); + + if (d->desktopGroup.hasKey(key)) { + QString value = d->desktopGroup.readEntryUntranslated(key); + QString fName = fileName(); + fName = fName.mid(fName.lastIndexOf('/')+1); + QString po_lookup_key = QString::fromLatin1(key) + "(" + fName + "): " + value; + QString po_value; + KGlobal::locale()->translateRaw(po_lookup_key.toUtf8().data(), NULL, &po_value); + + if (po_value == po_lookup_key) + return value; + + return po_value; + } + + return QString::null; +} + QString KDesktopFile::readType() const { Q_D(const KDesktopFile); @@ -176,20 +201,17 @@ QString KDesktopFile::readIcon() const QString KDesktopFile::readName() const { - Q_D(const KDesktopFile); - return d->desktopGroup.readEntry("Name", QString()); + return translatedEntry("Name"); } QString KDesktopFile::readComment() const { - Q_D(const KDesktopFile); - return d->desktopGroup.readEntry("Comment", QString()); + return translatedEntry("Comment"); } QString KDesktopFile::readGenericName() const { - Q_D(const KDesktopFile); - return d->desktopGroup.readEntry("GenericName", QString()); + return translatedEntry("GenericName"); } QString KDesktopFile::readPath() const --- kdecore/config/kdesktopfile.h.sav 2008-09-15 14:43:32.000000000 +0200 +++ kdecore/config/kdesktopfile.h 2008-09-15 15:03:12.000000000 +0200 @@ -243,6 +243,8 @@ protected: // virtual void virtual_hook( int id, void* data ); private: + QString translatedEntry(const char*) const; + Q_DISABLE_COPY(KDesktopFile) Q_DECLARE_PRIVATE(KDesktopFile) --- kdecore/config/kconfiggroup.h.sav 2008-09-15 14:43:32.000000000 +0200 +++ kdecore/config/kconfiggroup.h 2008-09-15 15:05:54.000000000 +0200 @@ -558,6 +558,11 @@ public: */ QMap<QString, QString> entryMap() const; + /** + * @internal + */ + bool hasTranslatedKey( const char *pKey ) const; + protected: bool hasGroupImpl(const QByteArray &group) const; KConfigGroup groupImpl(const QByteArray &b); --- kdecore/config/kconfig.cpp.sav 2008-09-15 14:43:32.000000000 +0200 +++ kdecore/config/kconfig.cpp 2008-09-15 15:03:12.000000000 +0200 @@ -732,6 +732,17 @@ QString KConfigPrivate::lookupData(const return entryMap.getEntry(group, key, QString(), flags, expand); } +QByteArray KConfigPrivate::lookupExactData(const QByteArray& group, const char* key, + KEntryMap::SearchFlags flags) const +{ + if (bReadDefaults) + flags |= KEntryMap::SearchDefaults; + const KEntryMapConstIterator it = entryMap.findExactEntry(group, key, flags); + if (it == entryMap.constEnd()) + return QByteArray(); + return it->mValue; +} + void KConfig::virtual_hook(int /*id*/, void* /*data*/) { /* nothing */ --- kdecore/config/kconfig_p.h.sav 2008-09-15 14:43:32.000000000 +0200 +++ kdecore/config/kconfig_p.h 2008-09-15 15:03:12.000000000 +0200 @@ -53,6 +53,7 @@ public: QString lookupData(const QByteArray& group, const char* key, KEntryMap::SearchFlags flags, bool* expand) const; QByteArray lookupData(const QByteArray& group, const char* key, KEntryMap::SearchFlags flags) const; + QByteArray lookupExactData(const QByteArray& group, const char* key, KEntryMap::SearchFlags flags) const; void putData(const QByteArray& group, const char* key, const QByteArray& value, KConfigBase::WriteConfigFlags flags, bool expand=false); --- kdecore/config/kconfiggroup.cpp.sav 2008-09-15 14:43:32.000000000 +0200 +++ kdecore/config/kconfiggroup.cpp 2008-09-15 15:03:12.000000000 +0200 @@ -1236,6 +1236,16 @@ bool KConfigGroup::hasKey(const char *ke return !config()->d_func()->lookupData(d->fullName(), key, flags).isNull(); } +bool KConfigGroup::hasTranslatedKey(const char* key) const +{ + Q_ASSERT_X(isValid(), "KConfigGroup::hasTranslatedKey", "accessing an invalid group"); + + KEntryMap::SearchFlags flags = KEntryMap::SearchLocalized; + if ( config()->readDefaults() ) + flags |= KEntryMap::SearchDefaults; + return !config()->d_func()->lookupExactData(d->fullName(), key, flags).isNull(); +} + bool KConfigGroup::hasKey(const QString &key) const { return hasKey(key.toUtf8().constData()); ++++++ kdelibs-4.1.1.tar.bz2 -> kdelibs-4.1.2.tar.bz2 ++++++ KDE/kdelibs4/kdelibs-4.1.1.tar.bz2 /mounts/work_src_done/STABLE/kdelibs4/kdelibs-4.1.2.tar.bz2 differ: byte 11, line 1 ++++++ kjs-mark-register-stack.diff ++++++ --- kjs/collector.cpp +++ kjs/collector.cpp @@ -528,6 +528,9 @@ static inline void* currentThreadStackBa return stackBase; } +#ifdef __ia64__ +extern "C" void *__libc_ia64_register_backing_store_base __attribute__((weak)); +#endif void Collector::markCurrentThreadConservatively() { @@ -547,6 +550,11 @@ void Collector::markCurrentThreadConserv void* stackBase = currentThreadStackBase(); markStackObjectsConservatively(stackPointer, stackBase); +#ifdef __ia64__ + __builtin_ia64_flushrs(); + void *bsp = __builtin_ia64_bsp(); + markStackObjectsConservatively(__libc_ia64_register_backing_store_base, bsp); +#endif } #if USE(MULTIPLE_THREADS) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdegraphics4
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package kdegraphics4 checked in at Mon Sep 29 17:49:55 CEST 2008. -------- --- KDE/kdegraphics4/kdegraphics4.changes 2008-09-20 20:43:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdegraphics4/kdegraphics4.changes 2008-09-25 18:58:48.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 25 18:58:41 CEST 2008 - dmueller(a)suse.de + +- update to 4.1.2 + * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php + +------------------------------------------------------------------- Old: ---- kdegraphics-4.1.1.tar.bz2 New: ---- kdegraphics-4.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics4.spec ++++++ --- /var/tmp/diff_new_pack.Bv2924/_old 2008-09-29 17:49:44.000000000 +0200 +++ /var/tmp/diff_new_pack.Bv2924/_new 2008-09-29 17:49:44.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdegraphics4 (Version 4.1.1) +# spec file for package kdegraphics4 (Version 4.1.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -33,8 +33,8 @@ Group: Productivity/Graphics/Other Summary: kdegraphics base package Url: http://www.kde.org -Version: 4.1.1 -Release: 15 +Version: 4.1.2 +Release: 1 Source0: kdegraphics-%version.tar.bz2 Source1: _upstream Patch0: 4_1_BRANCH.diff @@ -521,6 +521,9 @@ /usr/bin/xf86gammacfg %changelog +* Thu Sep 25 2008 dmueller(a)suse.de +- update to 4.1.2 + * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php * Sat Sep 20 2008 stbinner(a)suse.de - fix packaging of libksane includes * Wed Sep 10 2008 dmueller(a)suse.de ++++++ 4_1_BRANCH.diff ++++++ ++++ 4388 lines (skipped) ++++ between KDE/kdegraphics4/4_1_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdegraphics4/4_1_BRANCH.diff ++++++ kdegraphics-4.1.1.tar.bz2 -> kdegraphics-4.1.2.tar.bz2 ++++++ ++++ 4719 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdegames4
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package kdegames4 checked in at Mon Sep 29 17:49:48 CEST 2008. -------- --- KDE/kdegames4/kdegames4-carddecks.changes 2008-09-01 15:01:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdegames4/kdegames4-carddecks.changes 2008-09-29 17:49:21.991190000 +0200 @@ -1,0 +2,12 @@ +Thu Sep 25 18:58:10 CEST 2008 - dmueller(a)suse.de + +- update to 4.1.2 + * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php + +------------------------------------------------------------------- +Thu Sep 11 15:58:17 CEST 2008 - stbinner(a)suse.de + +- branch diff update (many kpat fixes) +- dump unnecssary requirements on empty kdegames4 package + +------------------------------------------------------------------- kdegames4.changes: same change Old: ---- kdegames-4.1.1.tar.bz2 New: ---- kdegames-4.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegames4-carddecks.spec ++++++ --- /var/tmp/diff_new_pack.MS1770/_old 2008-09-29 17:49:32.000000000 +0200 +++ /var/tmp/diff_new_pack.MS1770/_new 2008-09-29 17:49:32.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdegames4-carddecks (Version 4.1.1) +# spec file for package kdegames4-carddecks (Version 4.1.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ Group: System/GUI/KDE Summary: Default Card Decks for KDE Games Url: http://www.kde.org -Version: 4.1.1 +Version: 4.1.2 Release: 1 Source0: kdegames-%version.tar.bz2 Patch0: 4_1_BRANCH.diff @@ -103,6 +103,12 @@ %_kde_share_dir/apps/carddecks/svg-oxygen-white %changelog +* Thu Sep 25 2008 dmueller(a)suse.de +- update to 4.1.2 + * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php +* Thu Sep 11 2008 stbinner(a)suse.de +- branch diff update (many kpat fixes) +- dump unnecssary requirements on empty kdegames4 package * Thu Aug 28 2008 dmueller(a)suse.de - update to 4.1.1 * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php ++++++ kdegames4.spec ++++++ --- /var/tmp/diff_new_pack.MS1770/_old 2008-09-29 17:49:32.000000000 +0200 +++ /var/tmp/diff_new_pack.MS1770/_new 2008-09-29 17:49:32.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdegames4 (Version 4.1.1) +# spec file for package kdegames4 (Version 4.1.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,7 +26,7 @@ Group: System/GUI/KDE Summary: General Data for KDE Games Url: http://www.kde.org -Version: 4.1.1 +Version: 4.1.2 Release: 1 Source0: kdegames-%version.tar.bz2 Source1: _upstream @@ -182,12 +182,14 @@ %files -n libkdegames4 -f filelists/libkdegames %defattr(-,root,root) %doc COPYING COPYING.DOC COPYING.LIB README +%dir /usr/share/kde4/apps/kdegames +%dir /usr/share/kde4/apps/kdegames/pics %package -n libkdegames4-devel License: LGPL v2.1 or later Group: System/GUI/KDE Summary: Library for KDE Games: Build Environment -Requires: libkdegames4 = %version kdegames4 = %version +Requires: libkdegames4 = %version %description -n libkdegames4-devel This package contains all necessary files and libraries needed to @@ -245,7 +247,6 @@ License: GPL v2 or later Group: Amusements/Games/Board/Other Summary: Battleship game -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires %description -n kde4-kbattleship @@ -361,7 +362,6 @@ License: LGPL v2.1 or later Group: System/GUI/KDE Summary: General Data for KDE Games -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires %description -n kde4-kdiamond @@ -385,7 +385,6 @@ License: LGPL v2.1 or later Group: System/GUI/KDE Summary: Kubrick is a game based on Rubik's Cube -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires %description -n kde4-kubrick @@ -409,7 +408,6 @@ License: GPL v2 or later Group: Amusements/Games/Board/Puzzle Summary: Logic game -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires %description -n kde4-kblackbox @@ -434,7 +432,6 @@ License: GPL v2 or later Group: Amusements/Games/Action/Other Summary: Bounce ball game -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires %description -n kde4-kbounce @@ -460,7 +457,6 @@ License: GPL v2 or later Group: Amusements/Games/Action/Arcade Summary: Action & Puzzle Solving Game -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires %description -n kde4-kgoldrunner @@ -484,7 +480,6 @@ License: GPL v2 or later Group: Amusements/Games/Board/Puzzle Summary: Tactical game -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires %description -n kde4-klines @@ -510,7 +505,6 @@ License: GPL v2 or later Group: Amusements/Games/Board/Puzzle Summary: Mahjongg game -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires %description -n kde4-kmahjongg @@ -539,7 +533,6 @@ License: GPL v2 or later Group: Amusements/Games/Board/Puzzle Summary: Minesweeper-like game -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires %description -n kde4-kmines @@ -565,7 +558,6 @@ License: GPL v2 or later Group: Amusements/Games/Board/Puzzle Summary: Tactical board game -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires %description -n kde4-kjumpingcube @@ -587,7 +579,6 @@ License: GPL v2 or later Group: Amusements/Games/Board/Puzzle Summary: Puzzle game -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires %description -n kde4-knetwalk @@ -611,7 +602,6 @@ License: GPL v2 or later Group: Amusements/Games/Other Summary: Miniature golf game -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires %description -n kde4-kolf @@ -635,7 +625,6 @@ License: GPL v2 or later Group: Amusements/Games/Board/Card Summary: Galactic strategy game -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires %description -n kde4-konquest @@ -661,7 +650,6 @@ License: GPL v2 or later Group: Amusements/Games/Board/Card Summary: Patience card game -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires %description -n kde4-kpat @@ -687,7 +675,6 @@ License: GPL v2 or later Group: Amusements/Games/Board/Other Summary: Reversi board game -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires %description -n kde4-kreversi @@ -713,7 +700,6 @@ License: GPL v2 or later Group: Amusements/Games/Board/Other Summary: Strategic board game -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires %description -n kde4-ksame @@ -738,7 +724,6 @@ License: GPL v2 or later Group: Amusements/Games/Board/Other Summary: Shisen-Sho Mahjongg-like game -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires %description -n kde4-kshisen @@ -764,7 +749,6 @@ License: GPL v2 or later Group: Amusements/Games/Action/Arcade Summary: Space arcade game -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires %description -n kde4-kspaceduel @@ -791,7 +775,6 @@ License: GPL v2 or later Group: Amusements/Toys/Other Summary: Potato drawing editor -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires %description -n kde4-ktuberling @@ -818,7 +801,6 @@ License: GPL v2 or later Group: Amusements/Toys/Other Summary: Four Wins game -Requires: kdegames4 >= %_kde_platform_version Provides: kde4-kwin4 = 3.97.1 Obsoletes: kde4-kwin4 <= 3.97.1 %kde4_runtime_requires @@ -846,7 +828,6 @@ License: GPL v2 or later Group: Amusements/Games/Board/Card Summary: German Skat game -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires %description -n kde4-lskat @@ -873,7 +854,6 @@ License: GPL v2 or later Group: Amusements/Games/Action/Arcade Summary: Strategic board game -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires %description -n kde4-ksquares @@ -899,7 +879,6 @@ License: GPL v2 or later Group: Amusements/Games/Board/Other Summary: Yahtzee-like Game -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires %description -n kde4-kiriki @@ -923,7 +902,6 @@ License: GPL v2 or later Group: Amusements/Games/Board/Other Summary: Five-in-a-row Board Game -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires %description -n kde4-bovo @@ -947,7 +925,6 @@ License: GPL v2 or later Group: Amusements/Games/Board/Puzzle Summary: Generate and Solve Sudoku Puzzles in 2D or 3D -Requires: kdegames4 >= %_kde_platform_version %kde4_runtime_requires Obsoletes: ksudoku <= 0.4 Provides: ksudoku <= 0.4 @@ -979,6 +956,12 @@ #%doc %lang(en) /usr/share/doc/kde/HTML/en/kbackgammon %changelog +* Thu Sep 25 2008 dmueller(a)suse.de +- update to 4.1.2 + * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php +* Thu Sep 11 2008 stbinner(a)suse.de +- branch diff update (many kpat fixes) +- dump unnecssary requirements on empty kdegames4 package * Thu Aug 28 2008 dmueller(a)suse.de - update to 4.1.1 * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php ++++++ 4_1_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.MS1770/_old 2008-09-29 17:49:32.000000000 +0200 +++ /var/tmp/diff_new_pack.MS1770/_new 2008-09-29 17:49:32.000000000 +0200 @@ -1,7 +1,15 @@ -package: kdegames-4.1.1.tar.bz2 +package: kdegames-4.1.2.tar.bz2 kdemod: kdegames --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: 853806 -+svn di between //tags/KDE/4.1.1/kdegames and //tags/KDE/4.1.1/kdegames ++current HEAD: ++svn di between //tags/KDE/4.1.2/kdegames and //branches/KDE/4.1/kdegames + +Eigenschaftsänderungen: . +___________________________________________________________________ +Gelöscht: svn:mergeinfo +Hinzugefügt: svn:externals + + + + ++++++ kdegames-4.1.1.tar.bz2 -> kdegames-4.1.2.tar.bz2 ++++++ KDE/kdegames4/kdegames-4.1.1.tar.bz2 /mounts/work_src_done/STABLE/kdegames4/kdegames-4.1.2.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdeedu4
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package kdeedu4 checked in at Mon Sep 29 17:49:33 CEST 2008. -------- --- KDE/kdeedu4/kdeedu4.changes 2008-09-05 10:41:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdeedu4/kdeedu4.changes 2008-09-25 18:57:55.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 25 18:57:35 CEST 2008 - dmueller(a)suse.de + +- update to 4.1.2 + * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php + +------------------------------------------------------------------- kdeedu4-noarch.changes: same change Old: ---- kdeedu-4.1.1.tar.bz2 New: ---- kdeedu-4.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeedu4-noarch.spec ++++++ --- /var/tmp/diff_new_pack.OrX442/_old 2008-09-29 17:49:17.000000000 +0200 +++ /var/tmp/diff_new_pack.OrX442/_new 2008-09-29 17:49:17.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdeedu4-noarch (Version 4.1.1) +# spec file for package kdeedu4-noarch (Version 4.1.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,8 +27,8 @@ Group: System/GUI/KDE Summary: General Data for KDE Education Applications Url: http://edu.kde.org -Version: 4.1.1 -Release: 6 +Version: 4.1.2 +Release: 1 Source0: kdeedu-%version.tar.bz2 Source1: _upstream Patch0: 4_1_BRANCH.diff @@ -120,6 +120,9 @@ %doc COPYING COPYING.DOC README %changelog +* Thu Sep 25 2008 dmueller(a)suse.de +- update to 4.1.2 + * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php * Fri Sep 05 2008 stbinner(a)suse.de - build separate kde4-kstars-data package again * Thu Aug 28 2008 dmueller(a)suse.de ++++++ kdeedu4.spec ++++++ --- /var/tmp/diff_new_pack.OrX442/_old 2008-09-29 17:49:17.000000000 +0200 +++ /var/tmp/diff_new_pack.OrX442/_new 2008-09-29 17:49:17.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdeedu4 (Version 4.1.1) +# spec file for package kdeedu4 (Version 4.1.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -35,8 +35,8 @@ Group: System/GUI/KDE Summary: General Data for KDE Education Applications Url: http://edu.kde.org -Version: 4.1.1 -Release: 7 +Version: 4.1.2 +Release: 1 Source0: kdeedu-%version.tar.bz2 Source1: _upstream Patch0: 4_1_BRANCH.diff @@ -706,6 +706,9 @@ %dir %_kde_share_dir/apps/libkdeedu %changelog +* Thu Sep 25 2008 dmueller(a)suse.de +- update to 4.1.2 + * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php * Fri Sep 05 2008 stbinner(a)suse.de - build separate kde4-kstars-data package again * Thu Aug 28 2008 dmueller(a)suse.de ++++++ 4_1_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.OrX442/_old 2008-09-29 17:49:17.000000000 +0200 +++ /var/tmp/diff_new_pack.OrX442/_new 2008-09-29 17:49:17.000000000 +0200 @@ -1,7 +1,15 @@ -package: kdeedu-4.1.1.tar.bz2 +package: kdeedu-4.1.2.tar.bz2 kdemod: kdeedu --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: 853806 -+svn di between //tags/KDE/4.1.1/kdeedu and //tags/KDE/4.1.1/kdeedu ++current HEAD: ++svn di between //tags/KDE/4.1.2/kdeedu and //branches/KDE/4.1/kdeedu + +Eigenschaftsänderungen: . +___________________________________________________________________ +Gelöscht: svn:mergeinfo +Hinzugefügt: svn:externals + + + + ++++++ kdeedu-4.1.1.tar.bz2 -> kdeedu-4.1.2.tar.bz2 ++++++ KDE/kdeedu4/kdeedu-4.1.1.tar.bz2 /mounts/work_src_done/STABLE/kdeedu4/kdeedu-4.1.2.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebindings4
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package kdebindings4 checked in at Mon Sep 29 17:49:16 CEST 2008. -------- --- KDE/kdebindings4/kdebindings4.changes 2008-09-10 12:21:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebindings4/kdebindings4.changes 2008-09-28 22:12:03.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Sep 28 22:10:36 CEST 2008 - stbinner(a)suse.de + +- update to 4.1.2 + +------------------------------------------------------------------- python-kde4.changes: same change ruby-kde4.changes: same change Old: ---- kdebindings-4.1.1.tar.bz2 New: ---- kdebindings-4.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebindings4.spec ++++++ --- /var/tmp/diff_new_pack.n30997/_old 2008-09-29 17:48:59.000000000 +0200 +++ /var/tmp/diff_new_pack.n30997/_new 2008-09-29 17:48:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebindings4 (Version 4.1.1) +# spec file for package kdebindings4 (Version 4.1.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,8 +30,8 @@ License: LGPL v2.1 or later Group: Development/Libraries/KDE Summary: Bindings for KDE 4.x libraries -Version: 4.1.1 -Release: 2 +Version: 4.1.2 +Release: 1 Source0: kdebindings-%version.tar.bz2 Patch0: 4_1_BRANCH.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -125,6 +125,8 @@ %files -n libsmoke2 %defattr(-,root,root) +%_libdir/libsmokeakonadi.so.2 +%_libdir/libsmokeakonadi.so.2.0.0 %_libdir/libsmokekde.so.2 %_libdir/libsmokekde.so.2.0.0 %_libdir/libsmokeqt.so.2 @@ -149,6 +151,7 @@ %defattr(-,root,root) /usr/include/smoke.h /usr/include/smoke +%_libdir/libsmokeakonadi.so %_libdir/libsmokekde.so %_libdir/libsmokeqt.so %_libdir/libsmokekhtml.so @@ -193,18 +196,19 @@ %_libdir/kde4/krossruby.so %_libdir/kde4/krubypluginfactory.so %_libdir/libqtruby4shared.so +%_libdir/libqtruby4shared.so.* +%_libdir/ruby/site_ruby/*/akonadi/akonadi.rb +%_libdir/ruby/site_ruby/*/*-linux/akonadi.so %_libdir/ruby/site_ruby/*/KDE %_libdir/ruby/site_ruby/*/khtml/khtml.rb %_libdir/ruby/site_ruby/*/ktexteditor/ktexteditor.rb %_libdir/ruby/site_ruby/*/*-linux/khtml.so %_libdir/ruby/site_ruby/*/*-linux/korundum4.so %_libdir/ruby/site_ruby/*/*-linux/ktexteditor.so -%_libdir/ruby/site_ruby/*/*-linux/phonon.so %_libdir/ruby/site_ruby/*/*-linux/qtruby4.so %_libdir/ruby/site_ruby/*/*-linux/qtuitools.so %_libdir/ruby/site_ruby/*/*-linux/qtwebkit.so %_libdir/ruby/site_ruby/*/*-linux/solid.so -%_libdir/ruby/site_ruby/*/phonon/phonon.rb %_libdir/ruby/site_ruby/*/Qt %_libdir/ruby/site_ruby/*/Qt3.rb %_libdir/ruby/site_ruby/*/Qt4.rb @@ -221,7 +225,6 @@ %_libdir/ruby/site_ruby/*/khtml %_libdir/ruby/site_ruby/*/ktexteditor %_libdir/ruby/site_ruby/*/nepomuk -%_libdir/ruby/site_ruby/*/phonon %_libdir/ruby/site_ruby/*/qtscript %_libdir/ruby/site_ruby/*/qtuitools %_libdir/ruby/site_ruby/*/qtwebkit @@ -238,6 +241,8 @@ %endif %changelog +* Mon Sep 29 2008 stbinner(a)suse.de +- update to 4.1.2 * Wed Sep 10 2008 ro(a)suse.de - use py_sitedir macro * Thu Aug 28 2008 dmueller(a)suse.de ++++++ python-kde4.spec ++++++ --- /var/tmp/diff_new_pack.n30997/_old 2008-09-29 17:48:59.000000000 +0200 +++ /var/tmp/diff_new_pack.n30997/_new 2008-09-29 17:48:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python-kde4 (Version 4.1.1) +# spec file for package python-kde4 (Version 4.1.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,8 +30,8 @@ License: LGPL v2.1 or later Group: Development/Libraries/KDE Summary: Python Bindings for KDE 4.x Platform -Version: 4.1.1 -Release: 10 +Version: 4.1.2 +Release: 1 Source0: kdebindings-%version.tar.bz2 Patch0: 4_1_BRANCH.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -125,6 +125,8 @@ %files -n libsmoke2 %defattr(-,root,root) +%_libdir/libsmokeakonadi.so.2 +%_libdir/libsmokeakonadi.so.2.0.0 %_libdir/libsmokekde.so.2 %_libdir/libsmokekde.so.2.0.0 %_libdir/libsmokeqt.so.2 @@ -149,6 +151,7 @@ %defattr(-,root,root) /usr/include/smoke.h /usr/include/smoke +%_libdir/libsmokeakonadi.so %_libdir/libsmokekde.so %_libdir/libsmokeqt.so %_libdir/libsmokekhtml.so @@ -193,18 +196,19 @@ %_libdir/kde4/krossruby.so %_libdir/kde4/krubypluginfactory.so %_libdir/libqtruby4shared.so +%_libdir/libqtruby4shared.so.* +%_libdir/ruby/site_ruby/*/akonadi/akonadi.rb +%_libdir/ruby/site_ruby/*/*-linux/akonadi.so %_libdir/ruby/site_ruby/*/KDE %_libdir/ruby/site_ruby/*/khtml/khtml.rb %_libdir/ruby/site_ruby/*/ktexteditor/ktexteditor.rb %_libdir/ruby/site_ruby/*/*-linux/khtml.so %_libdir/ruby/site_ruby/*/*-linux/korundum4.so %_libdir/ruby/site_ruby/*/*-linux/ktexteditor.so -%_libdir/ruby/site_ruby/*/*-linux/phonon.so %_libdir/ruby/site_ruby/*/*-linux/qtruby4.so %_libdir/ruby/site_ruby/*/*-linux/qtuitools.so %_libdir/ruby/site_ruby/*/*-linux/qtwebkit.so %_libdir/ruby/site_ruby/*/*-linux/solid.so -%_libdir/ruby/site_ruby/*/phonon/phonon.rb %_libdir/ruby/site_ruby/*/Qt %_libdir/ruby/site_ruby/*/Qt3.rb %_libdir/ruby/site_ruby/*/Qt4.rb @@ -221,7 +225,6 @@ %_libdir/ruby/site_ruby/*/khtml %_libdir/ruby/site_ruby/*/ktexteditor %_libdir/ruby/site_ruby/*/nepomuk -%_libdir/ruby/site_ruby/*/phonon %_libdir/ruby/site_ruby/*/qtscript %_libdir/ruby/site_ruby/*/qtuitools %_libdir/ruby/site_ruby/*/qtwebkit @@ -238,6 +241,8 @@ %endif %changelog +* Mon Sep 29 2008 stbinner(a)suse.de +- update to 4.1.2 * Wed Sep 10 2008 ro(a)suse.de - use py_sitedir macro * Thu Aug 28 2008 dmueller(a)suse.de ++++++ ruby-kde4.spec ++++++ --- /var/tmp/diff_new_pack.n30997/_old 2008-09-29 17:48:59.000000000 +0200 +++ /var/tmp/diff_new_pack.n30997/_new 2008-09-29 17:48:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package ruby-kde4 (Version 4.1.1) +# spec file for package ruby-kde4 (Version 4.1.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,8 +30,8 @@ License: LGPL v2.1 or later Group: Development/Libraries/KDE Summary: Ruby bindings for KDE 4 -Version: 4.1.1 -Release: 12 +Version: 4.1.2 +Release: 1 Source0: kdebindings-%version.tar.bz2 Patch0: 4_1_BRANCH.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -125,6 +125,8 @@ %files -n libsmoke2 %defattr(-,root,root) +%_libdir/libsmokeakonadi.so.2 +%_libdir/libsmokeakonadi.so.2.0.0 %_libdir/libsmokekde.so.2 %_libdir/libsmokekde.so.2.0.0 %_libdir/libsmokeqt.so.2 @@ -149,6 +151,7 @@ %defattr(-,root,root) /usr/include/smoke.h /usr/include/smoke +%_libdir/libsmokeakonadi.so %_libdir/libsmokekde.so %_libdir/libsmokeqt.so %_libdir/libsmokekhtml.so @@ -193,18 +196,19 @@ %_libdir/kde4/krossruby.so %_libdir/kde4/krubypluginfactory.so %_libdir/libqtruby4shared.so +%_libdir/libqtruby4shared.so.* +%_libdir/ruby/site_ruby/*/akonadi/akonadi.rb +%_libdir/ruby/site_ruby/*/*-linux/akonadi.so %_libdir/ruby/site_ruby/*/KDE %_libdir/ruby/site_ruby/*/khtml/khtml.rb %_libdir/ruby/site_ruby/*/ktexteditor/ktexteditor.rb %_libdir/ruby/site_ruby/*/*-linux/khtml.so %_libdir/ruby/site_ruby/*/*-linux/korundum4.so %_libdir/ruby/site_ruby/*/*-linux/ktexteditor.so -%_libdir/ruby/site_ruby/*/*-linux/phonon.so %_libdir/ruby/site_ruby/*/*-linux/qtruby4.so %_libdir/ruby/site_ruby/*/*-linux/qtuitools.so %_libdir/ruby/site_ruby/*/*-linux/qtwebkit.so %_libdir/ruby/site_ruby/*/*-linux/solid.so -%_libdir/ruby/site_ruby/*/phonon/phonon.rb %_libdir/ruby/site_ruby/*/Qt %_libdir/ruby/site_ruby/*/Qt3.rb %_libdir/ruby/site_ruby/*/Qt4.rb @@ -221,7 +225,6 @@ %_libdir/ruby/site_ruby/*/khtml %_libdir/ruby/site_ruby/*/ktexteditor %_libdir/ruby/site_ruby/*/nepomuk -%_libdir/ruby/site_ruby/*/phonon %_libdir/ruby/site_ruby/*/qtscript %_libdir/ruby/site_ruby/*/qtuitools %_libdir/ruby/site_ruby/*/qtwebkit @@ -238,6 +241,8 @@ %endif %changelog +* Mon Sep 29 2008 stbinner(a)suse.de +- update to 4.1.2 * Wed Sep 10 2008 ro(a)suse.de - use py_sitedir macro * Thu Aug 28 2008 dmueller(a)suse.de ++++++ kdebindings-4.1.1.tar.bz2 -> kdebindings-4.1.2.tar.bz2 ++++++ ++++ 19460 lines of diff (skipped) ++++++ kdebindings4.spec.in ++++++ --- KDE/kdebindings4/kdebindings4.spec.in 2008-09-10 12:21:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebindings4/kdebindings4.spec.in 2008-09-28 23:32:29.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebindings4 (Version 4.0) +# spec file for package kdebindings4 (Version 4.1.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,7 +21,7 @@ License: GPL Group: System/GUI/KDE Summary: kdebindings build -Version: 4.1.1 +Version: 4.1.2 Release: 1 Source0: kdebindings-%version.tar.bz2 Patch0: 4_1_BRANCH.diff @@ -104,6 +104,8 @@ %if %is_base %files -n libsmoke2 %defattr(-,root,root) +%_libdir/libsmokeakonadi.so.2 +%_libdir/libsmokeakonadi.so.2.0.0 %_libdir/libsmokekde.so.2 %_libdir/libsmokekde.so.2.0.0 %_libdir/libsmokeqt.so.2 @@ -129,6 +131,7 @@ %defattr(-,root,root) /usr/include/smoke.h /usr/include/smoke +%_libdir/libsmokeakonadi.so %_libdir/libsmokekde.so %_libdir/libsmokeqt.so %_libdir/libsmokekhtml.so @@ -173,18 +176,19 @@ %_libdir/kde4/krossruby.so %_libdir/kde4/krubypluginfactory.so %_libdir/libqtruby4shared.so +%_libdir/libqtruby4shared.so.* +%_libdir/ruby/site_ruby/*/akonadi/akonadi.rb +%_libdir/ruby/site_ruby/*/*-linux/akonadi.so %_libdir/ruby/site_ruby/*/KDE %_libdir/ruby/site_ruby/*/khtml/khtml.rb %_libdir/ruby/site_ruby/*/ktexteditor/ktexteditor.rb %_libdir/ruby/site_ruby/*/*-linux/khtml.so %_libdir/ruby/site_ruby/*/*-linux/korundum4.so %_libdir/ruby/site_ruby/*/*-linux/ktexteditor.so -%_libdir/ruby/site_ruby/*/*-linux/phonon.so %_libdir/ruby/site_ruby/*/*-linux/qtruby4.so %_libdir/ruby/site_ruby/*/*-linux/qtuitools.so %_libdir/ruby/site_ruby/*/*-linux/qtwebkit.so %_libdir/ruby/site_ruby/*/*-linux/solid.so -%_libdir/ruby/site_ruby/*/phonon/phonon.rb %_libdir/ruby/site_ruby/*/Qt %_libdir/ruby/site_ruby/*/Qt3.rb %_libdir/ruby/site_ruby/*/Qt4.rb @@ -201,7 +205,6 @@ %_libdir/ruby/site_ruby/*/khtml %_libdir/ruby/site_ruby/*/ktexteditor %_libdir/ruby/site_ruby/*/nepomuk -%_libdir/ruby/site_ruby/*/phonon %_libdir/ruby/site_ruby/*/qtscript %_libdir/ruby/site_ruby/*/qtuitools %_libdir/ruby/site_ruby/*/qtwebkit ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-session
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package kdebase4-session checked in at Mon Sep 29 17:48:44 CEST 2008. -------- --- KDE/kdebase4-session/kdebase4-session.changes 2008-09-02 10:35:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-session/kdebase4-session.changes 2008-09-28 18:56:46.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Sep 28 18:56:14 CEST 2008 - stbinner(a)suse.de + +- update version to 4.1.2 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-session.spec ++++++ --- /var/tmp/diff_new_pack.J27114/_old 2008-09-29 17:48:36.000000000 +0200 +++ /var/tmp/diff_new_pack.J27114/_new 2008-09-29 17:48:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-session (Version 4.1.1) +# spec file for package kdebase4-session (Version 4.1.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,8 +22,8 @@ Group: System/GUI/KDE Summary: The KDE Session Url: http://www.kde.org/ -Version: 4.1.1 -Release: 3 +Version: 4.1.2 +Release: 1 Source1: kde4.desktop Source2: COPYING BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -60,6 +60,8 @@ /usr/share/doc/packages/kdebase4-session/COPYING %changelog +* Sun Sep 28 2008 stbinner(a)suse.de +- update version to 4.1.2 * Tue Sep 02 2008 stbinner(a)suse.de - require kdebase4-workspace >= %%_kde_platform_version * Thu Aug 28 2008 stbinner(a)suse.de ++++++ kde4.desktop ++++++ --- KDE/kdebase4-session/kde4.desktop 2008-08-28 14:44:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-session/kde4.desktop 2008-09-28 18:56:45.000000000 +0200 @@ -3,4 +3,4 @@ Type=XSession Exec=/usr/bin/startkde TryExec=/usr/bin/startkde -Name=KDE 4.1.1 +Name=KDE 4.1.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-runtime
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package kdebase4-runtime checked in at Mon Sep 29 17:48:26 CEST 2008. -------- --- KDE/kdebase4-runtime/kdebase4-runtime.changes 2008-09-15 17:13:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-runtime/kdebase4-runtime.changes 2008-09-28 17:47:20.000000000 +0200 @@ -1,0 +2,11 @@ +Sun Sep 28 17:46:34 CEST 2008 - stbinner(a)suse.de + +- fix kdebase4-runtime-debuginfo requirements (bnc#430481) + +------------------------------------------------------------------- +Thu Sep 25 18:59:04 CEST 2008 - dmueller(a)suse.de + +- update to 4.1.2 + * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php + +------------------------------------------------------------------- oxygen-icon-theme.changes: same change Old: ---- kdebase-runtime-4.1.1.tar.bz2 New: ---- kdebase-runtime-4.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.z24683/_old 2008-09-29 17:47:46.000000000 +0200 +++ /var/tmp/diff_new_pack.z24683/_new 2008-09-29 17:47:46.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-runtime (Version 4.1.1) +# spec file for package kdebase4-runtime (Version 4.1.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,8 +29,8 @@ Group: System/GUI/KDE Summary: The KDE Runtime Components Url: http://www.kde.org/ -Version: 4.1.1 -Release: 12 +Version: 4.1.2 +Release: 1 Source0: kdebase-runtime-%version.tar.bz2 Source1: kde4-essential.menu Source2: kde-settings.menu @@ -48,7 +48,7 @@ Requires: phonon Provides: suse_help_viewer Recommends: ispell, enscript -%define debug_package_requires %name = %version kdelibs3-debuginfo +%define debug_package_requires %name = %version kdelibs4-debuginfo %description This package contains all run-time dependencies of KDE applications. @@ -369,6 +369,11 @@ %_kde4_modules/kcm_phononxine.so %changelog +* Sun Sep 28 2008 stbinner(a)suse.de +- fix kdebase4-runtime-debuginfo requirements (bnc#430481) +* Thu Sep 25 2008 dmueller(a)suse.de +- update to 4.1.2 + * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php * Mon Sep 15 2008 dmueller(a)suse.de - adjust buildrequires * Sat Sep 13 2008 stbinner(a)suse.de ++++++ oxygen-icon-theme.spec ++++++ --- /var/tmp/diff_new_pack.z24683/_old 2008-09-29 17:47:46.000000000 +0200 +++ /var/tmp/diff_new_pack.z24683/_new 2008-09-29 17:47:46.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package oxygen-icon-theme (Version 4.1.1) +# spec file for package oxygen-icon-theme (Version 4.1.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,8 +26,8 @@ Group: System/GUI/KDE Summary: Oxygen Icon Theme Url: http://www.kde.org -Version: 4.1.1 -Release: 12 +Version: 4.1.2 +Release: 1 Requires: hicolor-icon-theme Recommends: oxygen-icon-theme-scalable Source0: kdebase-runtime-%version.tar.bz2 @@ -126,6 +126,11 @@ /usr/share/icons/oxygen %changelog +* Sun Sep 28 2008 stbinner(a)suse.de +- fix kdebase4-runtime-debuginfo requirements (bnc#430481) +* Thu Sep 25 2008 dmueller(a)suse.de +- update to 4.1.2 + * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php * Mon Sep 15 2008 dmueller(a)suse.de - adjust buildrequires * Sat Sep 13 2008 stbinner(a)suse.de ++++++ 4_1_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.z24683/_old 2008-09-29 17:47:46.000000000 +0200 +++ /var/tmp/diff_new_pack.z24683/_new 2008-09-29 17:47:46.000000000 +0200 @@ -1,7 +1,7 @@ -package: kdebase-runtime-4.1.1.tar.bz2 +package: kdebase-runtime-4.1.2.tar.bz2 kdemod: kdebase/runtime --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: 853806 -+svn di between //tags/KDE/4.1.1/kdebase/runtime and //tags/KDE/4.1.1/kdebase/runtime ++current HEAD: ++svn di between //tags/KDE/4.1.2/kdebase/runtime and //branches/KDE/4.1/kdebase/runtime ++++++ kdebase-runtime-4.1.1.tar.bz2 -> kdebase-runtime-4.1.2.tar.bz2 ++++++ KDE/kdebase4-runtime/kdebase-runtime-4.1.1.tar.bz2 /mounts/work_src_done/STABLE/kdebase4-runtime/kdebase-runtime-4.1.2.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0