Hello community, here is the log from the commit of package kdesdk3 for openSUSE:Factory checked in at Fri May 1 02:05:54 CEST 2009. -------- --- KDE/kdesdk3/kdesdk3.changes 2009-02-13 13:56:57.000000000 +0100 +++ kdesdk3/kdesdk3.changes 2009-04-29 10:06:12.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 29 10:05:51 CEST 2009 - coolo@suse.de + +- update 3.5 branch diff to fix compilation with gcc 4.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk3.spec ++++++ --- /var/tmp/diff_new_pack.jA2433/_old 2009-05-01 02:04:49.000000000 +0200 +++ /var/tmp/diff_new_pack.jA2433/_new 2009-05-01 02:04:49.000000000 +0200 @@ -38,7 +38,7 @@ Group: System/GUI/KDE Summary: The KDE Software Development Kit Version: 3.5.10 -Release: 13 +Release: 14 Url: http://www.kde.org/ Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) Requires: cvs @@ -353,6 +353,8 @@ /opt/kde3/include/repository_stub.h %changelog +* Wed Apr 29 2009 coolo@suse.de +- update 3.5 branch diff to fix compilation with gcc 4.4 * Fri Feb 13 2009 coolo@suse.de - remove the dependency on kdepim3-devel, kbugbuster stopped working with new bugs.kde.org anyway @@ -594,7 +596,7 @@ - update to snapshot 2004011309 * Mon Dec 01 2003 adrian@suse.de - update to 3.1.94 ( KDE 3.2 beta 2 ) -* Thu Nov 13 2003 adrian@suse.de +* Fri Nov 14 2003 adrian@suse.de - update to new snapshot from 2003102409 * Wed Oct 29 2003 adrian@suse.de - update to KDE 3.2 beta1 @@ -690,7 +692,7 @@ - update to 3.0 final :) * Thu Mar 21 2002 adrian@suse.de - update to 3.0rc3 -* Sun Mar 10 2002 adrian@suse.de +* Mon Mar 11 2002 adrian@suse.de - update to 3.0rc2 * Mon Mar 04 2002 adrian@suse.de - update to 3.0rc1 @@ -738,9 +740,9 @@ - neededforbuild fix * Tue Mar 27 2001 ro@suse.de - changed neededforbuild <docbkdsl> to <docbook-dsssl-stylesheets> -* Tue Mar 20 2001 adrian@suse.de +* Wed Mar 21 2001 adrian@suse.de - update to final 2.1.1 -* Sun Mar 18 2001 ro@suse.de +* Mon Mar 19 2001 ro@suse.de - fixed neededforbuild * Tue Mar 13 2001 ro@suse.de - removed second occurence of docbk30 from neededforbuild @@ -758,7 +760,7 @@ - fixed neededforbuild: += libmng-devel * Tue Oct 17 2000 adrian@suse.de - update to 2.0.0 -* Mon Sep 18 2000 adrian@suse.de +* Tue Sep 19 2000 adrian@suse.de - switch to -O0 for axp * Sun Sep 17 2000 adrian@suse.de - update to post final beta @@ -770,5 +772,5 @@ - snapshot from 17.07.2000 * Sun Jul 09 2000 adrian@suse.de - snapshot from 06.07.2000 -* Thu Jul 06 2000 adrian@suse.de +* Fri Jul 07 2000 adrian@suse.de - Spec file created from kdesdk-1.91.20000706.tar.gz by autospec ++++++ 3_5_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.jA2433/_old 2009-05-01 02:04:49.000000000 +0200 +++ /var/tmp/diff_new_pack.jA2433/_new 2009-05-01 02:04:49.000000000 +0200 @@ -3,13 +3,151 @@ --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: ++current HEAD: 957058 +svn di between //tags/KDE/3.5.10/kdesdk and //branches/KDE/3.5/kdesdk +--- poxml/antlr/antlr/CharScanner.hpp ++++ poxml/antlr/antlr/CharScanner.hpp +@@ -42,6 +42,7 @@ + #include "antlr/BitSet.hpp" + #include "antlr/LexerSharedInputState.hpp" + #include <map> ++#include <cstdio> + + ANTLR_BEGIN_NAMESPACE(antlr) + +--- kcachegrind/kcachegrind/callgraphview.cpp ++++ kcachegrind/kcachegrind/callgraphview.cpp +@@ -2073,13 +2073,12 @@ + continue; + } + +- // artifical calls should be blue +- bool isArtifical = false; +- TraceFunction* caller = e->fromNode()->function(); +- TraceFunction* called = e->toNode()->function(); +- if (caller->cycle() == caller) isArtifical = true; +- if (called->cycle() == called) isArtifical = true; +- QColor arrowColor = isArtifical ? Qt::blue : Qt::black; ++ // calls into/out of cycles are special: make them blue ++ QColor arrowColor = Qt::black; ++ TraceFunction* caller = e->fromNode() ? e->fromNode()->function() : 0; ++ TraceFunction* called = e->toNode() ? e->toNode()->function() : 0; ++ if ( (caller && (caller->cycle() == caller)) || ++ (called && (called->cycle() == called)) ) arrowColor = Qt::blue; + + sItem = new CanvasEdge(e, _canvas); + e->setCanvasEdge(sItem); +--- cervisia/repositories.cpp ++++ cervisia/repositories.cpp +@@ -29,17 +29,29 @@ + #include "cervisiapart.h" + + ++static QString fileNameCvs() ++{ ++ return QDir::homeDirPath() + "/.cvspass"; ++} ++ ++ ++static QString fileNameCvsnt() ++{ ++ return QDir::homeDirPath() + "/.cvs/cvspass"; ++} ++ ++ + // old .cvspass format: + // user@host:/path Acleartext_password + // + // new .cvspass format (since cvs 1.11.1): + // /1 user@host:port/path Aencoded_password + // +-QStringList Repositories::readCvsPassFile() ++static QStringList readCvsPassFile() + { + QStringList list; +- +- QFile f(QDir::homeDirPath() + "/.cvspass"); ++ ++ QFile f(fileNameCvs()); + if (f.open(IO_ReadOnly)) + { + QTextStream stream(&f); +@@ -55,13 +67,46 @@ + list.append(line.section(' ', 1, 1)); + } + } +- f.close(); + } + + return list; + } + + ++// .cvs/cvspass format ++// user@host:port/path=Aencoded_password ++// ++static QStringList readCvsntPassFile() ++{ ++ QStringList list; ++ ++ QFile file(fileNameCvsnt()); ++ if (file.open(IO_ReadOnly)) ++ { ++ QTextStream stream(&file); ++ while (!stream.atEnd()) ++ { ++ const QString line(stream.readLine()); ++ ++ const int pos(line.find("=A")); ++ if (pos >= 0) ++ list.append(line.left(pos)); ++ } ++ } ++ ++ return list; ++} ++ ++ ++QStringList Repositories::readCvsPassFile() ++{ ++ return (QFileInfo(fileNameCvs()).lastModified() ++ < QFileInfo(fileNameCvsnt()).lastModified()) ++ ? readCvsntPassFile() ++ : ::readCvsPassFile(); ++} ++ ++ + QStringList Repositories::readConfigFile() + { + QStringList list; +--- cervisia/ChangeLog ++++ cervisia/ChangeLog +@@ -1,3 +1,8 @@ ++2008-08-15 André Wöbbeking <Woebbeking@kde.org> ++ ++ * Fix BR #162523: ++ Allow cvsnt users to login to repositories. ++ + 2008-06-18 André Wöbbeking <Woebbeking@kde.org> + + * Fix BR #164216: +--- cervisia/cvsservice/cvsloginjob.cpp ++++ cervisia/cvsservice/cvsloginjob.cpp +@@ -104,7 +104,8 @@ + } + + // process asks for the password +- if( line.contains(PASS_PHRASE) ) ++ // search case insensitive as cvs and cvsnt use different capitalization ++ if( line.contains(PASS_PHRASE, false) ) + { + kdDebug(8051) << "process waits for the password." << endl; + -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@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org