Hello community, here is the log from the commit of package kdebase4-runtime for openSUSE:Factory checked in at Mon May 17 23:54:50 CEST 2010. -------- --- KDE/kdebase4-runtime/kdebase4-runtime.changes 2010-04-29 22:37:27.000000000 +0200 +++ kdebase4-runtime/kdebase4-runtime.changes 2010-05-17 14:55:30.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 17 12:55:16 UTC 2010 - llunak@novell.com + +- update 4_4_BRANCH.diff: various fixes, translation updates + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.tY2mlF/_old 2010-05-17 23:54:25.000000000 +0200 +++ /var/tmp/diff_new_pack.tY2mlF/_new 2010-05-17 23:54:25.000000000 +0200 @@ -43,7 +43,7 @@ Summary: The KDE Runtime Components Url: http://www.kde.org/ Version: 4.4.3 -Release: 1 +Release: 2 Source0: kdebase-runtime-%version.tar.bz2 Source1: kde4-essential.menu Source2: kde-settings.menu ++++++ 4_4_BRANCH.diff ++++++ ++++ 1869 lines (skipped) ++++ between KDE/kdebase4-runtime/4_4_BRANCH.diff ++++ and kdebase4-runtime/4_4_BRANCH.diff ++++++ khelpcenter-gnome-support.patch ++++++ --- /var/tmp/diff_new_pack.tY2mlF/_old 2010-05-17 23:54:26.000000000 +0200 +++ /var/tmp/diff_new_pack.tY2mlF/_new 2010-05-17 23:54:26.000000000 +0200 @@ -213,51 +213,52 @@ } // If the navigator already has the given URL selected, do nothing. -@@ -400,15 +409,43 @@ - TOC *tocTree = item->createTOC(); - kDebug( 1400 ) << "slotItemSelected(): Trying to build TOC for " - << item->entry()->name() << endl; -- tocTree->setApplication( url.directory() ); -+ if (url.directory() != "/") -+ tocTree->setApplication( url.directory() ); -+ else -+ tocTree->setApplication( url.path() ); - QString doc = View::langLookup( url.path() ); - // Enforce the original .docbook version, in case langLookup returns a - // cached version - if ( !doc.isNull() ) { -- int pos = doc.indexOf( ".html" ); -- if ( pos >= 0 ) { -- doc.replace( pos, 5, ".docbook" ); -+ if (doc.endsWith( ".html" )) { -+ doc = doc.left (doc.length() - 5) + ".docbook"; - } -+ -+ QFileInfo di (doc); -+ if (!di.isFile()) { -+ -+ int last_slash = doc.lastIndexOf ('/'); -+ if (last_slash >= 1) { -+ -+ QString filename = doc.right(doc.length() - last_slash - 1); -+ if (filename == "index.html" || filename == "") { -+ -+ int slash2 = doc.lastIndexOf('/', last_slash -1); -+ if (slash2 != -1 && slash2 != 0) { -+ -+ int slash3 = doc.lastIndexOf('/', slash2 - 1); -+ if (slash3 != -1) { -+ QString xml_file = doc.left(last_slash) + "/" + doc.mid(slash3 + 1, slash2 - (slash3 + 1)) + ".xml"; -+ kDebug() << "xml_file " << xml_file << endl; -+ QFileInfo fi(xml_file); -+ if (fi.exists()) -+ doc = xml_file; +--- khelpcenter/navigatoritem.cpp.sav 2010-05-17 15:40:52.000000000 +0200 ++++ khelpcenter/navigatoritem.cpp 2010-05-17 15:53:45.233053786 +0200 +@@ -94,14 +94,42 @@ void NavigatorItem::scheduleTOCBuild() + mToc = new TOC( this ); + + kDebug( 1400 ) << "Trying to build TOC for " << entry()->name() << endl; +- mToc->setApplication( url.directory() ); ++ if (url.directory() != "/") ++ mToc->setApplication( url.directory() ); ++ else ++ mToc->setApplication( url.path() ); + QString doc = View::langLookup( url.path() ); + // Enforce the original .docbook version, in case langLookup returns a + // cached version + if ( !doc.isNull() ) { +- int pos = doc.indexOf( ".html" ); +- if ( pos >= 0 ) { +- doc.replace( pos, 5, ".docbook" ); ++ if (doc.endsWith( ".html" )) { ++ doc = doc.left (doc.length() - 5) + ".docbook"; ++ } ++ ++ QFileInfo di (doc); ++ if (!di.isFile()) { ++ ++ int last_slash = doc.lastIndexOf ('/'); ++ if (last_slash >= 1) { ++ ++ QString filename = doc.right(doc.length() - last_slash - 1); ++ if (filename == "index.html" || filename == "") { ++ ++ int slash2 = doc.lastIndexOf('/', last_slash -1); ++ if (slash2 != -1 && slash2 != 0) { ++ ++ int slash3 = doc.lastIndexOf('/', slash2 - 1); ++ if (slash3 != -1) { ++ QString xml_file = doc.left(last_slash) + "/" + doc.mid(slash3 + 1, slash2 - (slash3 + 1)) + ".xml"; ++ kDebug() << "xml_file " << xml_file << endl; ++ QFileInfo fi(xml_file); ++ if (fi.exists()) ++ doc = xml_file; + -+ } -+ } + } + } + } - kDebug( 1400 ) << "slotItemSelected(): doc = " << doc; ++ } + } + kDebug( 1400 ) << "doc = " << doc; - tocTree->build( doc ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org