rev 3479 - trunk/packages/kdelibs/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Tue Apr 4 13:16:52 UTC 2006
Author: chrsmrtn
Date: 2006-04-04 13:16:51 +0000 (Tue, 04 Apr 2006)
New Revision: 3479
Added:
trunk/packages/kdelibs/debian/patches/01_kdelibs_branch_r526316.diff
Log:
New kdelibe branch pull; important khtml fixes.
Added: trunk/packages/kdelibs/debian/patches/01_kdelibs_branch_r526316.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/01_kdelibs_branch_r526316.diff 2006-04-03 22:50:09 UTC (rev 3478)
+++ trunk/packages/kdelibs/debian/patches/01_kdelibs_branch_r526316.diff 2006-04-04 13:16:51 UTC (rev 3479)
@@ -0,0 +1,1931 @@
+#DPATCHLEVEL=0
+--- kate/part/katedocument.cpp (revision 523640)
++++ kate/part/katedocument.cpp (revision 526316)
+@@ -699,6 +699,10 @@
+
+ bool replacetabs = ( config()->configFlags() & KateDocumentConfig::cfReplaceTabsDyn && ! m_isInUndo );
+ uint tw = config()->tabWidth();
++ uint insertPosExpanded = insertPos;
++ KateTextLine::Ptr l = m_buffer->line( line );
++ if (l != 0)
++ insertPosExpanded = l->cursorX( insertPos, tw );
+
+ for (uint pos = 0; pos < len; pos++)
+ {
+@@ -706,28 +710,30 @@
+
+ if (ch == '\n')
+ {
++ editInsertText (line, insertPos, buf);
++
+ if ( !blockwise )
+ {
+- editInsertText (line, insertPos, buf);
+ editWrapLine (line, insertPos + buf.length());
++ insertPos = insertPosExpanded = 0;
+ }
+ else
+ {
+- editInsertText (line, col, buf);
+-
+ if ( line == lastLine() )
+- editWrapLine (line, col + buf.length());
++ editWrapLine (line, insertPos + buf.length());
+ }
+
+ line++;
+- insertPos = 0;
+ buf.truncate(0);
++ l = m_buffer->line( line );
++ if (l)
++ insertPosExpanded = l->cursorX( insertPos, tw );
+ }
+ else
+ {
+ if ( replacetabs && ch == '\t' )
+ {
+- uint tr = tw - ( ((blockwise?col:insertPos)+buf.length())%tw ); //###
++ uint tr = tw - ( insertPosExpanded+buf.length() )%tw;
+ for ( uint i=0; i < tr; i++ )
+ buf += ' ';
+ }
+@@ -736,10 +742,7 @@
+ }
+ }
+
+- if ( !blockwise )
+- editInsertText (line, insertPos, buf);
+- else
+- editInsertText (line, col, buf);
++ editInsertText (line, insertPos, buf);
+
+ editEnd ();
+ emit textInserted(line,insertPos);
+@@ -3097,29 +3100,7 @@
+ if (pos < 0 || pos >= (int)colX)
+ {
+ // only spaces on left side of cursor
+- // search a line with less spaces
+- int y = line;
+- while (--y >= 0)
+- {
+- // this is save, y <= line, and line was already success
+- textLine = m_buffer->plainLine(y);
+-
+- pos = textLine->firstChar();
+-
+- if (pos >= 0)
+- {
+- pos = textLine->cursorX(pos, config()->tabWidth());
+- if (pos < (int)colX)
+- {
+- replaceWithOptimizedSpace(line, col, pos, config()->configFlags());
+- break;
+- }
+- }
+- }
+- if (y < 0) {
+- // FIXME: what shoud we do in this case?
+- removeText(line, 0, line, col+complement);
+- }
++ indent( view, line, -1);
+ }
+ else
+ removeText(line, col-1, line, col+complement);
+--- kate/data/progress.xml (revision 523640)
++++ kate/data/progress.xml (revision 526316)
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+-<language name="progress" version="1.08" kateversion="2.4" section="Database" extensions="*.p;*.w;*.i" author="Rares Stanciulescu (rstanciu at operamail.com)" license="GPL">
++<language name="progress" version="1.09" kateversion="2.4" section="Database" extensions="*.p;*.w;*.i;*.cls" author="Rares Stanciulescu (rstanciu at operamail.com)" license="GPL">
+
+ <highlighting>
+
+@@ -31,20 +31,11 @@
+ <item> TEMP-TABLE </item>
+ <item> BUFFER </item>
+ <item> STREAM </item>
++ <item> SAX-WRITER </item>
+ <item> MEMPTR </item>
+ </list>
+
+ <list name="operators">
+- <item> + </item>
+- <item> - </item>
+- <item> * </item>
+- <item> / </item>
+- <item> = </item>
+- <item> < </item>
+- <item> > </item>
+- <item> <= </item>
+- <item> >= </item>
+- <item> <> </item>
+ <item> AND </item>
+ <item> OR </item>
+ <item> NOT </item>
+@@ -82,6 +73,8 @@
+
+ <list name="phrases">
+ <item> AS </item>
++ <item> WORD-INDEX </item>
++ <item> LIKE </item>
+ <item> ALERT-BOX </item>
+ <item> AT </item>
+ <item> COLOR </item>
+@@ -148,9 +141,17 @@
+ <item> NO-ECHO </item>
+ <item> NO-MAP </item>
+ <item> PRIVATE </item>
++ <item> PUBLIC </item>
++ <item> PROTECTED </item>
+ </list>
+
+ <list name="functions">
++ <item> output-content-type </item>
++ <item> get-value </item>
++ <item> get-cgi </item>
++ <item> get-field </item>
++ <item> html-encode </item>
++ <item> url-encode </item>
+ <item> ABSOLUTE </item>
+ <item> ACCUM </item>
+ <item> ADD-INTERVAL </item>
+@@ -577,6 +578,7 @@
+ <item> DEFAULT-WINDOW </item>
+ <item> ERROR-STATUS </item>
+ <item> FILE-INFO </item>
++ <item> FIELD </item>
+ <item> FOCUS </item>
+ <item> FONT-TABLE </item>
+ <item> LAST-EVENT </item>
+@@ -611,7 +613,6 @@
+ <item> HONORPROKEYS </item>
+ <item> HONORRETURNKEY </item>
+ <item> LEFT </item>
+- <item> NAME </item>
+ <item> TOP </item>
+ <item> WIDTH </item>
+ <item> TAG </item>
+@@ -934,7 +935,6 @@
+ <item> MULTIPLE </item>
+ <item> MULTITASKING-INTERVAL </item>
+ <item> MUST-UNDERSTAND </item>
+- <item> NAME </item>
+ <item> NAMESPACE-PREFIX </item>
+ <item> NAMESPACE-URI </item>
+ <item> NEEDS-APPSERVER-PROMPT </item>
+@@ -1163,6 +1163,22 @@
+ <item> XML-SUPPRESS-NAMESPACE-PROCESSING </item>
+ <item> Y </item>
+ <item> YEAR-OFFSET </item>
++ <item> WRITE-XMLSCHEMA </item>
++ <item> WRITE-XML </item>
++ <item> READ-XML </item>
++ <item> NESTED </item>
++ <item> XML-DATA-TYPE </item>
++ <item> XML-NODE-TYPE </item>
++ <item> FORMATTED </item>
++ <item> SET-OUTPUT-DESTINATION </item>
++ <item> START-DOCUMENT </item>
++ <item> START-ELEMENT </item>
++ <item> WRITE-CHARACTERS </item>
++ <item> END-ELEMENT </item>
++ <item> END-DOCUMENT </item>
++ <item> WRITE-DATA-ELEMENT </item>
++ <item> INSERT-ATTRIBUTE </item>
++
+ </list>
+
+ <list name="methods">
+@@ -1489,7 +1505,7 @@
+ <DetectChar attribute="Comment" context="Identifier" char='"'/>
+ <DetectChar attribute="String" context="#stay" char='"'/>
+ <DetectChar attribute="String" context="#stay" char="'"/>
+- <AnyChar attribute="Symbol" context="#stay" String="{}[]()~:"/>
++ <AnyChar attribute="Symbol" context="#stay" String="+-*=/\?~{}[]():."/>
+
+ <StringDetect attribute="Region Marker" context="#stay"
+ String="PROCEDURE" insensitive="TRUE"
+@@ -1504,7 +1520,27 @@
+ <StringDetect attribute="Region Marker" context="#stay"
+ String="END FUNCTION" insensitive="TRUE"
+ endRegion="F1" firstNonSpace="TRUE"/>
++
++ <StringDetect attribute="Region Marker" context="#stay"
++ String="CLASS" insensitive="TRUE"
++ beginRegion="C1" firstNonSpace="TRUE"/>
++ <StringDetect attribute="Region Marker" context="#stay"
++ String="END CLASS" insensitive="TRUE"
++ endRegion="C1" firstNonSpace="TRUE"/>
+
++ <StringDetect attribute="Region Marker" context="#stay"
++ String="METHOD" insensitive="TRUE"
++ beginRegion="M1" firstNonSpace="TRUE"/>
++ <StringDetect attribute="Region Marker" context="#stay"
++ String="END METHOD" insensitive="TRUE"
++ endRegion="M1" firstNonSpace="TRUE"/>
++ <StringDetect attribute="Region Marker" context="#stay"
++ String="CONSTRUCTOR" insensitive="TRUE"
++ beginRegion="CN1" firstNonSpace="TRUE"/>
++ <StringDetect attribute="Region Marker" context="#stay"
++ String="END CONSTRUCTOR" insensitive="TRUE"
++ endRegion="CN1" firstNonSpace="TRUE"/>
++
+ <StringDetect attribute="Function" context="#stay"
+ String="DO:" insensitive="TRUE"
+ beginRegion="L1" firstNonSpace="FALSE"/>
+@@ -1521,6 +1557,7 @@
+ String="END" insensitive="TRUE"
+ endRegion="L1" firstNonSpace="TRUE"/>
+
++
+ </context>
+ <context name="String" attribute="String" lineEndContext="#stay">
+ <LineContinue attribute="String" context="#pop"/>
+--- kate/data/lua.xml (revision 523640)
++++ kate/data/lua.xml (revision 526316)
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+-<language name="Lua" version="0.22" kateversion="2.3" section="Scripts" extensions="*.lua" mimetype="text/x-lua">
++<language name="Lua" version="0.23" kateversion="2.3" section="Scripts" extensions="*.lua" mimetype="text/x-lua">
+ <highlighting>
+ <list name="keywords">
+ <item> and </item>
+@@ -19,7 +19,7 @@
+ <item> else </item>
+ <item> or </item>
+ <item> while </item>
+- <item> elsif </item>
++ <item> elseif </item>
+ <item> in </item>
+ <item> repeat </item>
+ </list>
+--- kate/data/ada.xml (revision 523640)
++++ kate/data/ada.xml (revision 526316)
+@@ -73,14 +73,16 @@
+ <context attribute="Normal Text" lineEndContext="#stay" name="Default">
+ <RegExpr attribute="Keyword" context="#stay" String="if " insensitive="TRUE" beginRegion="Region1" firstNonSpace="true"/>
+ <StringDetect attribute="Keyword" context="#stay" String="end if" insensitive="TRUE" endRegion="Region1"/>
+- <RegExpr attribute="Keyword" context="#stay" String="case " insensitive="TRUE" beginRegion="Region2" firstNonSpace="true"/>
+- <StringDetect attribute="Keyword" context="#stay" String="end case" insensitive="TRUE" endRegion="Region2"/>
+ <RegExpr attribute="Keyword" context="#stay" String="\sloop\s+" insensitive="TRUE" beginRegion="Region3"/>
+ <RegExpr attribute="Keyword" context="#stay" String="\sloop$" insensitive="TRUE" beginRegion="Region3"/>
+ <StringDetect attribute="Keyword" context="#stay" String="end loop;" insensitive="TRUE" endRegion="Region3"/>
+ <RegExpr attribute="Keyword" context="#stay" String="\sselect\s+" insensitive="TRUE" beginRegion="Region4"/>
+ <RegExpr attribute="Keyword" context="#stay" String="\sselect$" insensitive="TRUE" beginRegion="Region4"/>
+ <StringDetect attribute="Keyword" context="#stay" String="end select;" insensitive="TRUE" endRegion="Region4"/>
++ <RegExpr attribute="Keyword" context="#stay" String="\b(begin|case|record)\b" insensitive="true" beginRegion="Region5"/>
++ <RegExpr attribute="Keyword" context="#stay" String="\bend(?=((\{[^}]*(\}|$)|\(\*.*(\*\)|$))*)([.;\s]|$)|//|$)" insensitive="true" endRegion="Region5"/>
++ <StringDetect attribute="Region Marker" context="Region Marker" String="-- BEGIN" beginRegion="RegionMarker" firstNonSpace="true" />
++ <StringDetect attribute="Region Marker" context="Region Marker" String="-- END" endRegion="RegionMarker" firstNonSpace="true" />
+ <keyword attribute="Keyword" context="#stay" String="keywords"/>
+ <Float attribute="Float" context="#stay"/>
+ <Int attribute="Decimal" context="#stay"/>
+@@ -88,6 +90,7 @@
+ <DetectChar attribute="String" context="String" char="""/>
+ <Detect2Chars attribute="Comment" context="Comment" char="-" char1="-"/>
+ </context>
++ <context attribute="Region Marker" lineEndContext="#pop" name="Region Marker"/>
+ <context attribute="String" lineEndContext="#pop" name="String">
+ <DetectChar attribute="String" context="#pop" char="""/>
+ </context>
+@@ -102,6 +105,7 @@
+ <itemData name="Char" defStyleNum="dsChar" />
+ <itemData name="String" defStyleNum="dsString" />
+ <itemData name="Comment" defStyleNum="dsComment" />
++ <itemData name="Region Marker" defStyleNum="dsRegionMarker" />
+ </itemDatas>
+ </highlighting>
+ <general>
+--- kate/data/ruby.xml (revision 523640)
++++ kate/data/ruby.xml (revision 526316)
+@@ -34,7 +34,7 @@
+ -->
+
+ <!-- Hold the "language" opening tag on a single line, as mentioned in "language.dtd". -->
+-<language name="Ruby" version="1.17" kateversion="2.4" section="Scripts" extensions="*.rb;*.rxml" mimetype="application/x-ruby" author="Stefan Lang (langstefan at gmx.at), Sebastian Vuorinen (sebastian.vuorinen at helsinki.fi)" license="LGPL">
++<language name="Ruby" version="1.17" kateversion="2.4" section="Scripts" extensions="*.rb;*.rjs;*.rxml" mimetype="application/x-ruby" author="Stefan Lang (langstefan at gmx.at), Sebastian Vuorinen (sebastian.vuorinen at helsinki.fi)" license="LGPL">
+
+ <highlighting>
+
+--- kate/data/logtalk.xml (revision 523640)
++++ kate/data/logtalk.xml (revision 526316)
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+
+-<language name="Logtalk" version="1.40" kateversion="2.4" section="Sources" extensions="*.lgt;*.config" mimetype="text/x-logtalk" author="Paulo Moura (pmoura at logtalk.org)" license="Artistic License 2.0">
++<language name="Logtalk" version="1.51" kateversion="2.4" section="Sources" extensions="*.lgt;*.config" mimetype="text/x-logtalk" author="Paulo Moura (pmoura at logtalk.org)" license="Artistic License 2.0">
+
+ <highlighting>
+
+@@ -17,11 +17,11 @@
+ <!-- Reflection -->
+ <RegExpr String = "\b(current_predicate|predicate_property)(?=[(])" attribute = "Built-in" context = "#stay" />
+ <!-- DCGs -->
+- <RegExpr String = "\b(expand_term|phrase)(?=[(])" attribute = "Built-in" context = "#stay" />
++ <RegExpr String = "\b(expand_term|term_expansion|phrase)(?=[(])" attribute = "Built-in" context = "#stay" />
+ <!-- Entity -->
+ <RegExpr String = "\b(abolish|c(reate|urrent))_(object|protocol|category)(?=[(])" attribute = "Built-in" context = "#stay" />
+ <RegExpr String = "\b(object|protocol|category)_property(?=[(])" attribute = "Built-in" context = "#stay" />
+- <!-- Event handlers -->
++ <!-- Entity relations -->
+ <RegExpr String = "\bextends_(object|protocol)(?=[(])" attribute = "Built-in" context = "#stay" />
+ <RegExpr String = "\bimplements_protocol(?=[(])" attribute = "Built-in" context = "#stay" />
+ <RegExpr String = "\b(instantiates|specializes)_class(?=[(])" attribute = "Built-in" context = "#stay" />
+@@ -48,7 +48,7 @@
+ <RegExpr String = "\b(rem|mod|abs|sign)(?=[(])" attribute = "Built-in" context = "#stay" />
+ <RegExpr String = "\bfloat(_(integer|fractional)_part)?(?=[(])" attribute = "Built-in" context = "#stay" />
+ <RegExpr String = "\b(floor|truncate|round|ceiling)(?=[(])" attribute = "Built-in" context = "#stay" />
+- <!-- Other arithemtic functors -->
++ <!-- Other arithmetic functors -->
+ <RegExpr String = "\b(cos|atan|exp|log|s(in|qrt))(?=[(])" attribute = "Built-in" context = "#stay" />
+ <!-- Term testing -->
+ <RegExpr String = "\b(var|atom(ic)?|integer|float|compound|n(onvar|umber))(?=[(])" attribute = "Built-in" context = "#stay" />
+@@ -149,15 +149,16 @@
+ <!-- Entity directives -->
+ <RegExpr String = "\b(category|object|protocol)(?=[(])" attribute = "Directive" context = "entityrelations" beginRegion = "Entity"/>
+ <RegExpr String = "\bend_(category|object|protocol)[.]" attribute = "Directive" context = "#pop" endRegion = "Entity" />
++ <RegExpr String = "\bmodule(?=[(])" attribute = "Directive" context = "#pop"/>
+ <!-- Predicate scope directives -->
+ <RegExpr String = "\bp(ublic|r(otected|ivate))(?=[(])" attribute = "Directive" context = "#pop" />
+ <!-- Other directives -->
+- <RegExpr String = "\bencoding(?=[(])" attribute = "Directive" context = "#pop" />
++ <RegExpr String = "\be(ncoding|xport)(?=[(])" attribute = "Directive" context = "#pop" />
+ <RegExpr String = "\bin(fo|itialization)(?=[(])" attribute = "Directive" context = "#pop" />
+ <RegExpr String = "\bdynamic[.]" attribute = "Directive" context = "#pop" />
+- <RegExpr String = "\b(alias|d(ynamic|iscontiguous)|m(etapredicate|ode|ultifile))(?=[(])" attribute = "Directive" context = "#pop" />
++ <RegExpr String = "\b(alias|d(ynamic|iscontiguous)|meta_predicate|m(etapredicate|ode|ultifile))(?=[(])" attribute = "Directive" context = "#pop" />
+ <RegExpr String = "\bop(?=[(])" attribute = "Directive" context = "#pop" />
+- <RegExpr String = "\b(calls|uses)(?=[(])" attribute = "Directive" context = "#pop" />
++ <RegExpr String = "\b(calls|use(s|_module))(?=[(])" attribute = "Directive" context = "#pop" />
+ </context>
+
+ <context name = "entityrelations" attribute = "Normal" lineEndContext = "#stay" >
+--- kate/data/php.xml (revision 523640)
++++ kate/data/php.xml (revision 526316)
+@@ -1,6 +1,12 @@
+ <?xml version="1.0" encoding="UTF-8"?>
++<!--
++ Changes: version 1.25 -> 1.26
++ Date: 26/01/2006
++ Change author: Nicola Gigante
++ Added alternative syntax control structures and named logical operators (and or xor)
++-->
+ <!DOCTYPE language SYSTEM "language.dtd">
+-<language name="PHP/PHP" version="1.25" kateversion="2.4" section="Scripts" extensions="" priority="5" mimetype="" hidden="true">
++<language name="PHP/PHP" version="1.26" kateversion="2.4" section="Scripts" extensions="" priority="5" mimetype="" hidden="true">
+ <highlighting>
+ <list name="control structures">
+ <item>as</item>
+@@ -21,6 +27,11 @@
+ <item>include</item>
+ <item>require_once</item>
+ <item>include_once</item>
++ <item>endif</item>
++ <item>endwhile</item>
++ <item>endfor</item>
++ <item>endforeach</item>
++ <item>endswitch</item>
+ </list>
+ <list name="keywords">
+ <item> abstract </item>
+@@ -42,6 +53,9 @@
+ <item> public </item>
+ <item> throw </item>
+ <item> try </item>
++ <item> and </item>
++ <item> or </item>
++ <item> xor </item>
+ <item> var </item>
+ <item> __FILE__ </item>
+ <item> __LINE__ </item>
+--- kate/data/cpp.xml (revision 523640)
++++ kate/data/cpp.xml (revision 526316)
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+-<language name="C++" version="1.34" kateversion="2.4" section="Sources" extensions="*.cxx;*.cpp;*.cc;*.C;*.h;*.hh;*.H;*.hxx;*.hpp;*.hcc;*.moc" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" priority="9">
++<language name="C++" version="1.36" kateversion="2.4" section="Sources" extensions="*.c++;*.cxx;*.cpp;*.cc;*.C;*.h;*.H;*.h++;*.hxx;*.hpp;*.hcc;*.moc" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" priority="9">
+ <highlighting>
+ <list name="keywords">
+ <item> asm </item>
+@@ -31,6 +31,7 @@
+ <item> private </item>
+ <item> protected </item>
+ <item> public </item>
++ <item> qobject_cast </item>
+ <item> reinterpret_cast </item>
+ <item> return </item>
+ <item> sizeof </item>
+@@ -79,6 +80,33 @@
+ <item> Q_OVERRIDE </item>
+ <item> Q_PROPERTY </item>
+ <item> Q_SETS </item>
++ <item> Q_SIGNALS </item>
++ <item> Q_SLOTS </item>
++ <item> Q_FOREACH </item>
++ <item> Q_DECLARE_FLAGS </item>
++ <item> Q_INIT_RESOURCE </item>
++ <item> Q_CLEANUP_RESOURCE </item>
++ <item> Q_GLOBAL_STATIC </item>
++ <item> Q_GLOBAL_STATIC_WITH_ARGS </item>
++ <item> Q_DECLARE_TYPEINFO </item>
++ <item> Q_DECLARE_SHARED </item>
++ <item> Q_DECLARE_FLAGS </item>
++ <item> Q_DECLARE_OPERATORS_FOR_FLAGS </item>
++ <item> Q_FOREVER </item>
++ <item> Q_DECLARE_PRIVATE </item>
++ <item> Q_DECLARE_PUBLIC </item>
++ <item> Q_D </item>
++ <item> Q_Q </item>
++ <item> Q_DISABLE_COPY </item>
++ <item> Q_INTERFACES </item>
++ <item> Q_FLAGS </item>
++ <item> Q_SCRIPTABLE </item>
++ <item> Q_INVOKABLE </item>
++ <item> Q_GADGET </item>
++ <item> Q_ARG </item>
++ <item> Q_RETURN_ARG </item>
++ <item> Q_ASSERT </item>
++ <item> Q_ASSERT_X </item>
+ <item> TRUE </item>
+ <item> FALSE </item>
+ <item> connect </item>
+@@ -87,6 +115,7 @@
+ <item> signals </item>
+ <item> slots </item>
+ <item> foreach </item>
++ <item> forever </item>
+ </list>
+ <list name="types">
+ <item> auto </item>
+--- mimetypes/image/x-raw.desktop (revision 523640)
++++ mimetypes/image/x-raw.desktop (revision 526316)
+@@ -13,6 +13,7 @@
+ Comment[es]=Imagen RAW de cámara
+ Comment[et]=Kaamera toorpilt
+ Comment[eu]=RAW kamara fitxategia
++Comment[fi]=RAW-kameratiedosto
+ Comment[fr]=Image RAW d'appareil photo
+ Comment[fy]=RAW-fototastelôfbylding
+ Comment[hu]=RAW-képfájl
+--- mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop (revision 523640)
++++ mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop (revision 526316)
+@@ -53,6 +53,7 @@
+ Comment[tr]=OASIS OpenDocument Grafik Şablonu
+ Comment[tt]=OASIS OpenDocument Sızımı öçen Ürçetmä
+ Comment[uk]=Шаблон графічного зображення OASIS OpenDocument
++Comment[uz]=OASIS OpenDocument графика намунаси
+ Comment[zh_CN]=OASIS OpenDocument 图形模板
+ Comment[zh_HK]=OASIS OpenDocument 繪圖範本
+ [Property::X-KDE-NativeExtension]
+--- mimetypes/application/mbox.desktop (revision 523640)
++++ mimetypes/application/mbox.desktop (revision 526316)
+@@ -39,6 +39,7 @@
+ Comment[sv]=Mbox-brevkorg
+ Comment[tg]=MBOX Феҳристи Почта
+ Comment[uk]=Поштова тека MBOX
++Comment[uz]=MBOX хат қутиси
+ Comment[zh_CN]=MBOX 邮件文件夹
+
+ [Property::X-KDE-text]
+--- kinit/setproctitle.h (revision 523640)
++++ kinit/setproctitle.h (revision 526316)
+@@ -71,8 +71,8 @@
+ # define SPT_PADCHAR '\0' /* pad process title with nulls */
+ #endif
+
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+-# if defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++# if defined(__NetBSD__) || defined(__DragonFly__)
+ # undef SPT_TYPE
+ # define SPT_TYPE SPT_BUILTIN /* setproctitle is in libc */
+ # endif
+--- kio/kio/global.cpp (revision 523640)
++++ kio/kio/global.cpp (revision 526316)
+@@ -1438,7 +1438,11 @@
+
+ #ifdef HAVE_GETMNTINFO
+
++#ifdef HAVE_STATFS
+ struct statfs *mounted;
++#elif defined(HAVE_STATVFS)
++ struct statvfs *mounted;
++#endif
+
+ int num_fs = getmntinfo(&mounted, MNT_NOWAIT);
+
+@@ -1704,7 +1708,12 @@
+
+ #ifdef HAVE_GETMNTINFO
+
++#ifdef HAVE_STATFS
+ struct statfs *mounted;
++#elif defined(HAVE_STATVFS)
++ struct statvfs *mounted;
++#endif
++
+ char realpath_buffer[MAXPATHLEN];
+
+ int num_fs = getmntinfo(&mounted, MNT_NOWAIT);
+--- kio/kio/yacc.y (revision 523640)
++++ kio/kio/yacc.y (revision 526316)
+@@ -116,7 +116,7 @@
+
+ void yyerror ( const char *s ) /* Called by yyparse on error */
+ {
+- printf ("ERROR: %s\n", s);
++ KTraderParse_error( s );
+ }
+
+ void KTraderParse_mainParse( const char *_code )
+--- kio/kio/ktraderparse.h (revision 523640)
++++ kio/kio/ktraderparse.h (revision 526316)
+@@ -1,21 +1,21 @@
+ /* This file is part of the KDE project
+ Copyright (C) 1998, 1999 Torben Weis <weis at kde.org>
+-
++
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+-
++
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+-
++
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+-*/
++*/
+
+ #ifndef __parse_h__
+ #define __parse_h__
+@@ -23,7 +23,9 @@
+ /*
+ * Functions definition for yacc
+ */
++void KTraderParse_mainParse( const char *_code );
+ void KTraderParse_setParseTree( void *_ptr1 );
++void KTraderParse_error( const char* err );
+ void* KTraderParse_newOR( void *_ptr1, void *_ptr2 );
+ void* KTraderParse_newAND( void *_ptr1, void *_ptr2 );
+ void* KTraderParse_newCMP( void *_ptr1, void *_ptr2, int _i );
+--- kio/kio/ktraderparse.cpp (revision 523640)
++++ kio/kio/ktraderparse.cpp (revision 526316)
+@@ -25,26 +25,32 @@
+ extern "C"
+ {
+ #include "ktraderparse.h"
+-
+-void KTraderParse_mainParse( const char *_code );
+ }
+
+ #include "ktraderparsetree.h"
++#include <kdebug.h>
+
+ using namespace KIO;
+
+ static ParseTreeBase::Ptr *pTree = 0;
++static const char* sCode = 0;
+
+ ParseTreeBase::Ptr KIO::parseConstraints( const QString& _constr )
+ {
+- KTraderParse_mainParse( _constr.ascii() );
++ QCString str = _constr.utf8();
++ sCode = str.data();
++ KTraderParse_mainParse( sCode );
++ sCode = 0;
+ assert( pTree );
+ return *pTree;
+ }
+
+ ParseTreeBase::Ptr KIO::parsePreferences( const QString& _prefs )
+ {
+- KTraderParse_mainParse( _prefs.ascii() );
++ QCString str = _prefs.utf8();
++ sCode = str.data();
++ KTraderParse_mainParse( sCode );
++ sCode = 0;
+ assert( pTree );
+ return *pTree;
+ }
+@@ -52,10 +58,16 @@
+ void KTraderParse_setParseTree( void *_ptr1 )
+ {
+ if ( !pTree )
+- pTree = new ParseTreeBase::Ptr; // ### leak
++ pTree = new ParseTreeBase::Ptr; // ### leak; should use KStaticDeleter
+ *pTree = static_cast<ParseTreeBase*>( _ptr1 );
+ }
+
++
++void KTraderParse_error( const char* err )
++{
++ kdWarning(7014) << "Parsing '" << sCode << "' gave " << err << endl;
++}
++
+ void* KTraderParse_newOR( void *_ptr1, void *_ptr2 )
+ {
+ return new ParseTreeOR( (ParseTreeBase*)_ptr1, (ParseTreeBase*)_ptr2 );
+--- kio/kio/yacc.c (revision 523640)
++++ kio/kio/yacc.c (revision 526316)
+@@ -1,7 +1,7 @@
+-/* A Bison parser, made by GNU Bison 1.875. */
++/* A Bison parser, made by GNU Bison 2.0. */
+
+ /* Skeleton parser for Yacc-like parsing with Bison,
+- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
++ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -15,8 +15,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 51 Franklin Street, Fifth Floor,
+- Boston, MA 02110-1301, USA. */
++ Foundation, Inc., 59 Temple Place - Suite 330,
++ Boston, MA 02111-1307, USA. */
+
+ /* As a special exception, when this file is copied by Bison into a
+ Bison output file, you may use that output file without restriction.
+@@ -45,8 +45,7 @@
+ /* Using locations. */
+ #define YYLSP_NEEDED 0
+
+-/* If NAME_PREFIX is specified substitute the variables and functions
+- names. */
++/* Substitute the variable and function names. */
+ #define yyparse kiotraderparse
+ #define yylex kiotraderlex
+ #define yyerror kiotradererror
+@@ -139,7 +138,7 @@
+ char *name;
+ void *ptr;
+ } YYSTYPE;
+-/* Line 191 of yacc.c. */
++/* Line 190 of yacc.c. */
+ #line 143 "yacc.tab.c"
+ # define yystype YYSTYPE /* obsolescent; will be withdrawn */
+ # define YYSTYPE_IS_DECLARED 1
+@@ -151,23 +150,26 @@
+ /* Copy the second part of user declarations. */
+
+
+-/* Line 214 of yacc.c. */
++/* Line 213 of yacc.c. */
+ #line 155 "yacc.tab.c"
+
+ #if ! defined (yyoverflow) || YYERROR_VERBOSE
+
++# ifndef YYFREE
++# define YYFREE free
++# endif
++# ifndef YYMALLOC
++# define YYMALLOC malloc
++# endif
++
+ /* The parser invokes alloca or malloc; define the necessary symbols. */
+
+-# if YYSTACK_USE_ALLOCA
+-# define YYSTACK_ALLOC alloca
+-# else
+-# ifndef YYSTACK_USE_ALLOCA
+-# if defined (alloca) || defined (_ALLOCA_H)
++# ifdef YYSTACK_USE_ALLOCA
++# if YYSTACK_USE_ALLOCA
++# ifdef __GNUC__
++# define YYSTACK_ALLOC __builtin_alloca
++# else
+ # define YYSTACK_ALLOC alloca
+-# else
+-# ifdef __GNUC__
+-# define YYSTACK_ALLOC __builtin_alloca
+-# endif
+ # endif
+ # endif
+ # endif
+@@ -180,20 +182,20 @@
+ # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+ # define YYSIZE_T size_t
+ # endif
+-# define YYSTACK_ALLOC malloc
+-# define YYSTACK_FREE free
++# define YYSTACK_ALLOC YYMALLOC
++# define YYSTACK_FREE YYFREE
+ # endif
+ #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
+
+
+ #if (! defined (yyoverflow) \
+ && (! defined (__cplusplus) \
+- || (YYSTYPE_IS_TRIVIAL)))
++ || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
+
+ /* A type that is properly aligned for any stack member. */
+ union yyalloc
+ {
+- short yyss;
++ short int yyss;
+ YYSTYPE yyvs;
+ };
+
+@@ -203,13 +205,13 @@
+ /* The size of an array large to enough to hold all stacks, each with
+ N elements. */
+ # define YYSTACK_BYTES(N) \
+- ((N) * (sizeof (short) + sizeof (YYSTYPE)) \
++ ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \
+ + YYSTACK_GAP_MAXIMUM)
+
+ /* Copy COUNT objects from FROM to TO. The source and destination do
+ not overlap. */
+ # ifndef YYCOPY
+-# if 1 < __GNUC__
++# if defined (__GNUC__) && 1 < __GNUC__
+ # define YYCOPY(To, From, Count) \
+ __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+ # else
+@@ -245,7 +247,7 @@
+ #if defined (__STDC__) || defined (__cplusplus)
+ typedef signed char yysigned_char;
+ #else
+- typedef short yysigned_char;
++ typedef short int yysigned_char;
+ #endif
+
+ /* YYFINAL -- State number of the termination state. */
+@@ -344,11 +346,11 @@
+ First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+ static const char *const yytname[] =
+ {
+- "$end", "error", "$undefined", "NOT", "EQ", "NEQ", "LEQ", "GEQ", "LE",
+- "GR", "OR", "AND", "TOKEN_IN", "EXIST", "MAX", "MIN", "VAL_BOOL",
+- "VAL_STRING", "VAL_ID", "VAL_NUM", "VAL_FLOAT", "'~'", "'+'", "'-'",
+- "'*'", "'/'", "'('", "')'", "$accept", "constraint", "bool", "bool_or",
+- "bool_and", "bool_compare", "expr_in", "expr_twiddle", "expr", "term",
++ "$end", "error", "$undefined", "NOT", "EQ", "NEQ", "LEQ", "GEQ", "LE",
++ "GR", "OR", "AND", "TOKEN_IN", "EXIST", "MAX", "MIN", "VAL_BOOL",
++ "VAL_STRING", "VAL_ID", "VAL_NUM", "VAL_FLOAT", "'~'", "'+'", "'-'",
++ "'*'", "'/'", "'('", "')'", "$accept", "constraint", "bool", "bool_or",
++ "bool_and", "bool_compare", "expr_in", "expr_twiddle", "expr", "term",
+ "factor_non", "factor", 0
+ };
+ #endif
+@@ -356,7 +358,7 @@
+ # ifdef YYPRINT
+ /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+ token YYLEX-NUM. */
+-static const unsigned short yytoknum[] =
++static const unsigned short int yytoknum[] =
+ {
+ 0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
+ 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
+@@ -482,7 +484,7 @@
+
+ #define YYACCEPT goto yyacceptlab
+ #define YYABORT goto yyabortlab
+-#define YYERROR goto yyerrlab1
++#define YYERROR goto yyerrorlab
+
+
+ /* Like YYERROR except do call yyerror. This remains here temporarily
+@@ -510,20 +512,53 @@
+ } \
+ while (0)
+
++
+ #define YYTERROR 1
+ #define YYERRCODE 256
+
+-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
+- are run). */
+
++/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
++ If N is 0, then set CURRENT to the empty location which ends
++ the previous symbol: RHS[0] (always defined). */
++
++#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+ #ifndef YYLLOC_DEFAULT
+-# define YYLLOC_DEFAULT(Current, Rhs, N) \
+- Current.first_line = Rhs[1].first_line; \
+- Current.first_column = Rhs[1].first_column; \
+- Current.last_line = Rhs[N].last_line; \
+- Current.last_column = Rhs[N].last_column;
++# define YYLLOC_DEFAULT(Current, Rhs, N) \
++ do \
++ if (N) \
++ { \
++ (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
++ (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
++ (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
++ (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
++ } \
++ else \
++ { \
++ (Current).first_line = (Current).last_line = \
++ YYRHSLOC (Rhs, 0).last_line; \
++ (Current).first_column = (Current).last_column = \
++ YYRHSLOC (Rhs, 0).last_column; \
++ } \
++ while (0)
+ #endif
+
++
++/* YY_LOCATION_PRINT -- Print the location on the stream.
++ This macro was not mandated originally: define only if we know
++ we won't break user code: when these are the locations we know. */
++
++#ifndef YY_LOCATION_PRINT
++# if YYLTYPE_IS_TRIVIAL
++# define YY_LOCATION_PRINT(File, Loc) \
++ fprintf (File, "%d.%d-%d.%d", \
++ (Loc).first_line, (Loc).first_column, \
++ (Loc).last_line, (Loc).last_column)
++# else
++# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
++# endif
++#endif
++
++
+ /* YYLEX -- calling `yylex' with the right arguments. */
+
+ #ifdef YYLEX_PARAM
+@@ -546,36 +581,30 @@
+ YYFPRINTF Args; \
+ } while (0)
+
+-# define YYDSYMPRINT(Args) \
+-do { \
+- if (yydebug) \
+- yysymprint Args; \
+-} while (0)
+-
+-# define YYDSYMPRINTF(Title, Token, Value, Location) \
++# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
+ do { \
+ if (yydebug) \
+ { \
+ YYFPRINTF (stderr, "%s ", Title); \
+ yysymprint (stderr, \
+- Token, Value); \
++ Type, Value); \
+ YYFPRINTF (stderr, "\n"); \
+ } \
+ } while (0)
+
+ /*------------------------------------------------------------------.
+ | yy_stack_print -- Print the state stack from its BOTTOM up to its |
+-| TOP (cinluded). |
++| TOP (included). |
+ `------------------------------------------------------------------*/
+
+ #if defined (__STDC__) || defined (__cplusplus)
+ static void
+-yy_stack_print (short *bottom, short *top)
++yy_stack_print (short int *bottom, short int *top)
+ #else
+ static void
+ yy_stack_print (bottom, top)
+- short *bottom;
+- short *top;
++ short int *bottom;
++ short int *top;
+ #endif
+ {
+ YYFPRINTF (stderr, "Stack now");
+@@ -605,9 +634,9 @@
+ #endif
+ {
+ int yyi;
+- unsigned int yylineno = yyrline[yyrule];
++ unsigned int yylno = yyrline[yyrule];
+ YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
+- yyrule - 1, yylineno);
++ yyrule - 1, yylno);
+ /* Print the symbols being reduced, and their result. */
+ for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
+ YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
+@@ -625,8 +654,7 @@
+ int yydebug;
+ #else /* !YYDEBUG */
+ # define YYDPRINTF(Args)
+-# define YYDSYMPRINT(Args)
+-# define YYDSYMPRINTF(Title, Token, Value, Location)
++# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+ # define YY_STACK_PRINT(Bottom, Top)
+ # define YY_REDUCE_PRINT(Rule)
+ #endif /* !YYDEBUG */
+@@ -644,10 +672,6 @@
+ SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+ evaluated with infinite-precision integer arithmetic. */
+
+-#if YYMAXDEPTH == 0
+-# undef YYMAXDEPTH
+-#endif
+-
+ #ifndef YYMAXDEPTH
+ # define YYMAXDEPTH 10000
+ #endif
+@@ -729,15 +753,15 @@
+ (void) yyvaluep;
+
+ if (yytype < YYNTOKENS)
+- {
+- YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+-# ifdef YYPRINT
+- YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+-# endif
+- }
++ YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+ else
+ YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
++
++# ifdef YYPRINT
++ if (yytype < YYNTOKENS)
++ YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
++# endif
+ switch (yytype)
+ {
+ default:
+@@ -753,10 +777,11 @@
+
+ #if defined (__STDC__) || defined (__cplusplus)
+ static void
+-yydestruct (int yytype, YYSTYPE *yyvaluep)
++yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+ #else
+ static void
+-yydestruct (yytype, yyvaluep)
++yydestruct (yymsg, yytype, yyvaluep)
++ const char *yymsg;
+ int yytype;
+ YYSTYPE *yyvaluep;
+ #endif
+@@ -764,6 +789,10 @@
+ /* Pacify ``unused variable'' warnings. */
+ (void) yyvaluep;
+
++ if (!yymsg)
++ yymsg = "Deleting";
++ YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
++
+ switch (yytype)
+ {
+
+@@ -791,10 +820,10 @@
+
+
+
+-/* The lookahead symbol. */
++/* The look-ahead symbol. */
+ int yychar;
+
+-/* The semantic value of the lookahead symbol. */
++/* The semantic value of the look-ahead symbol. */
+ YYSTYPE yylval;
+
+ /* Number of syntax errors so far. */
+@@ -830,7 +859,7 @@
+ int yyresult;
+ /* Number of tokens to shift before error messages enabled. */
+ int yyerrstatus;
+- /* Lookahead token as an internal (translated) token number. */
++ /* Look-ahead token as an internal (translated) token number. */
+ int yytoken = 0;
+
+ /* Three stacks and their tools:
+@@ -842,9 +871,9 @@
+ to reallocate them elsewhere. */
+
+ /* The state stack. */
+- short yyssa[YYINITDEPTH];
+- short *yyss = yyssa;
+- register short *yyssp;
++ short int yyssa[YYINITDEPTH];
++ short int *yyss = yyssa;
++ register short int *yyssp;
+
+ /* The semantic value stack. */
+ YYSTYPE yyvsa[YYINITDEPTH];
+@@ -881,6 +910,9 @@
+ yyssp = yyss;
+ yyvsp = yyvs;
+
++
++ yyvsp[0] = yylval;
++
+ goto yysetstate;
+
+ /*------------------------------------------------------------.
+@@ -906,7 +938,7 @@
+ these so that the &'s don't force the real ones into
+ memory. */
+ YYSTYPE *yyvs1 = yyvs;
+- short *yyss1 = yyss;
++ short int *yyss1 = yyss;
+
+
+ /* Each stack pointer address is followed by the size of the
+@@ -934,7 +966,7 @@
+ yystacksize = YYMAXDEPTH;
+
+ {
+- short *yyss1 = yyss;
++ short int *yyss1 = yyss;
+ union yyalloc *yyptr =
+ (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+ if (! yyptr)
+@@ -970,18 +1002,18 @@
+ yybackup:
+
+ /* Do appropriate processing given the current state. */
+-/* Read a lookahead token if we need one and don't already have one. */
++/* Read a look-ahead token if we need one and don't already have one. */
+ /* yyresume: */
+
+- /* First try to decide what to do without reference to lookahead token. */
++ /* First try to decide what to do without reference to look-ahead token. */
+
+ yyn = yypact[yystate];
+ if (yyn == YYPACT_NINF)
+ goto yydefault;
+
+- /* Not known => get a lookahead token if don't already have one. */
++ /* Not known => get a look-ahead token if don't already have one. */
+
+- /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
++ /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */
+ if (yychar == YYEMPTY)
+ {
+ YYDPRINTF ((stderr, "Reading a token: "));
+@@ -996,7 +1028,7 @@
+ else
+ {
+ yytoken = YYTRANSLATE (yychar);
+- YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
++ YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+ }
+
+ /* If the proper action on seeing token YYTOKEN is to reduce or to
+@@ -1016,8 +1048,8 @@
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
+- /* Shift the lookahead token. */
+- YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
++ /* Shift the look-ahead token. */
++ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+ /* Discard the token being shifted unless it is eof. */
+ if (yychar != YYEOF)
+@@ -1073,179 +1105,179 @@
+
+ case 3:
+ #line 57 "yacc.y"
+- { KTraderParse_setParseTree( yyvsp[0].ptr ); ;}
++ { KTraderParse_setParseTree( (yyvsp[0].ptr) ); ;}
+ break;
+
+ case 4:
+ #line 60 "yacc.y"
+- { yyval.ptr = yyvsp[0].ptr; ;}
++ { (yyval.ptr) = (yyvsp[0].ptr); ;}
+ break;
+
+ case 5:
+ #line 63 "yacc.y"
+- { yyval.ptr = KTraderParse_newOR( yyvsp[-2].ptr, yyvsp[0].ptr ); ;}
++ { (yyval.ptr) = KTraderParse_newOR( (yyvsp[-2].ptr), (yyvsp[0].ptr) ); ;}
+ break;
+
+ case 6:
+ #line 64 "yacc.y"
+- { yyval.ptr = yyvsp[0].ptr; ;}
++ { (yyval.ptr) = (yyvsp[0].ptr); ;}
+ break;
+
+ case 7:
+ #line 67 "yacc.y"
+- { yyval.ptr = KTraderParse_newAND( yyvsp[-2].ptr, yyvsp[0].ptr ); ;}
++ { (yyval.ptr) = KTraderParse_newAND( (yyvsp[-2].ptr), (yyvsp[0].ptr) ); ;}
+ break;
+
+ case 8:
+ #line 68 "yacc.y"
+- { yyval.ptr = yyvsp[0].ptr; ;}
++ { (yyval.ptr) = (yyvsp[0].ptr); ;}
+ break;
+
+ case 9:
+ #line 71 "yacc.y"
+- { yyval.ptr = KTraderParse_newCMP( yyvsp[-2].ptr, yyvsp[0].ptr, 1 ); ;}
++ { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 1 ); ;}
+ break;
+
+ case 10:
+ #line 72 "yacc.y"
+- { yyval.ptr = KTraderParse_newCMP( yyvsp[-2].ptr, yyvsp[0].ptr, 2 ); ;}
++ { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 2 ); ;}
+ break;
+
+ case 11:
+ #line 73 "yacc.y"
+- { yyval.ptr = KTraderParse_newCMP( yyvsp[-2].ptr, yyvsp[0].ptr, 3 ); ;}
++ { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 3 ); ;}
+ break;
+
+ case 12:
+ #line 74 "yacc.y"
+- { yyval.ptr = KTraderParse_newCMP( yyvsp[-2].ptr, yyvsp[0].ptr, 4 ); ;}
++ { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 4 ); ;}
+ break;
+
+ case 13:
+ #line 75 "yacc.y"
+- { yyval.ptr = KTraderParse_newCMP( yyvsp[-2].ptr, yyvsp[0].ptr, 5 ); ;}
++ { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 5 ); ;}
+ break;
+
+ case 14:
+ #line 76 "yacc.y"
+- { yyval.ptr = KTraderParse_newCMP( yyvsp[-2].ptr, yyvsp[0].ptr, 6 ); ;}
++ { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 6 ); ;}
+ break;
+
+ case 15:
+ #line 77 "yacc.y"
+- { yyval.ptr = yyvsp[0].ptr; ;}
++ { (yyval.ptr) = (yyvsp[0].ptr); ;}
+ break;
+
+ case 16:
+ #line 80 "yacc.y"
+- { yyval.ptr = KTraderParse_newIN( yyvsp[-2].ptr, KTraderParse_newID( yyvsp[0].name ) ); ;}
++ { (yyval.ptr) = KTraderParse_newIN( (yyvsp[-2].ptr), KTraderParse_newID( (yyvsp[0].name) ) ); ;}
+ break;
+
+ case 17:
+ #line 81 "yacc.y"
+- { yyval.ptr = yyvsp[0].ptr; ;}
++ { (yyval.ptr) = (yyvsp[0].ptr); ;}
+ break;
+
+ case 18:
+ #line 84 "yacc.y"
+- { yyval.ptr = KTraderParse_newMATCH( yyvsp[-2].ptr, yyvsp[0].ptr ); ;}
++ { (yyval.ptr) = KTraderParse_newMATCH( (yyvsp[-2].ptr), (yyvsp[0].ptr) ); ;}
+ break;
+
+ case 19:
+ #line 85 "yacc.y"
+- { yyval.ptr = yyvsp[0].ptr; ;}
++ { (yyval.ptr) = (yyvsp[0].ptr); ;}
+ break;
+
+ case 20:
+ #line 88 "yacc.y"
+- { yyval.ptr = KTraderParse_newCALC( yyvsp[-2].ptr, yyvsp[0].ptr, 1 ); ;}
++ { (yyval.ptr) = KTraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 1 ); ;}
+ break;
+
+ case 21:
+ #line 89 "yacc.y"
+- { yyval.ptr = KTraderParse_newCALC( yyvsp[-2].ptr, yyvsp[0].ptr, 2 ); ;}
++ { (yyval.ptr) = KTraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 2 ); ;}
+ break;
+
+ case 22:
+ #line 90 "yacc.y"
+- { yyval.ptr = yyvsp[0].ptr; ;}
++ { (yyval.ptr) = (yyvsp[0].ptr); ;}
+ break;
+
+ case 23:
+ #line 93 "yacc.y"
+- { yyval.ptr = KTraderParse_newCALC( yyvsp[-2].ptr, yyvsp[0].ptr, 3 ); ;}
++ { (yyval.ptr) = KTraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 3 ); ;}
+ break;
+
+ case 24:
+ #line 94 "yacc.y"
+- { yyval.ptr = KTraderParse_newCALC( yyvsp[-2].ptr, yyvsp[0].ptr, 4 ); ;}
++ { (yyval.ptr) = KTraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 4 ); ;}
+ break;
+
+ case 25:
+ #line 95 "yacc.y"
+- { yyval.ptr = yyvsp[0].ptr; ;}
++ { (yyval.ptr) = (yyvsp[0].ptr); ;}
+ break;
+
+ case 26:
+ #line 98 "yacc.y"
+- { yyval.ptr = KTraderParse_newNOT( yyvsp[0].ptr ); ;}
++ { (yyval.ptr) = KTraderParse_newNOT( (yyvsp[0].ptr) ); ;}
+ break;
+
+ case 27:
+ #line 99 "yacc.y"
+- { yyval.ptr = yyvsp[0].ptr; ;}
++ { (yyval.ptr) = (yyvsp[0].ptr); ;}
+ break;
+
+ case 28:
+ #line 102 "yacc.y"
+- { yyval.ptr = KTraderParse_newBRACKETS( yyvsp[-1].ptr ); ;}
++ { (yyval.ptr) = KTraderParse_newBRACKETS( (yyvsp[-1].ptr) ); ;}
+ break;
+
+ case 29:
+ #line 103 "yacc.y"
+- { yyval.ptr = KTraderParse_newEXIST( yyvsp[0].name ); ;}
++ { (yyval.ptr) = KTraderParse_newEXIST( (yyvsp[0].name) ); ;}
+ break;
+
+ case 30:
+ #line 104 "yacc.y"
+- { yyval.ptr = KTraderParse_newID( yyvsp[0].name ); ;}
++ { (yyval.ptr) = KTraderParse_newID( (yyvsp[0].name) ); ;}
+ break;
+
+ case 31:
+ #line 105 "yacc.y"
+- { yyval.ptr = KTraderParse_newNUM( yyvsp[0].vali ); ;}
++ { (yyval.ptr) = KTraderParse_newNUM( (yyvsp[0].vali) ); ;}
+ break;
+
+ case 32:
+ #line 106 "yacc.y"
+- { yyval.ptr = KTraderParse_newFLOAT( yyvsp[0].vald ); ;}
++ { (yyval.ptr) = KTraderParse_newFLOAT( (yyvsp[0].vald) ); ;}
+ break;
+
+ case 33:
+ #line 107 "yacc.y"
+- { yyval.ptr = KTraderParse_newSTRING( yyvsp[0].name ); ;}
++ { (yyval.ptr) = KTraderParse_newSTRING( (yyvsp[0].name) ); ;}
+ break;
+
+ case 34:
+ #line 108 "yacc.y"
+- { yyval.ptr = KTraderParse_newBOOL( yyvsp[0].valb ); ;}
++ { (yyval.ptr) = KTraderParse_newBOOL( (yyvsp[0].valb) ); ;}
+ break;
+
+ case 35:
+ #line 109 "yacc.y"
+- { yyval.ptr = KTraderParse_newMAX2( yyvsp[0].name ); ;}
++ { (yyval.ptr) = KTraderParse_newMAX2( (yyvsp[0].name) ); ;}
+ break;
+
+ case 36:
+ #line 110 "yacc.y"
+- { yyval.ptr = KTraderParse_newMIN2( yyvsp[0].name ); ;}
++ { (yyval.ptr) = KTraderParse_newMIN2( (yyvsp[0].name) ); ;}
+ break;
+
+
+ }
+
+-/* Line 999 of yacc.c. */
+-#line 1248 "yacc.tab.c"
++/* Line 1037 of yacc.c. */
++#line 1281 "yacc.tab.c"
+
+ yyvsp -= yylen;
+ yyssp -= yylen;
+@@ -1286,18 +1318,33 @@
+ {
+ YYSIZE_T yysize = 0;
+ int yytype = YYTRANSLATE (yychar);
++ const char* yyprefix;
+ char *yymsg;
+- int yyx, yycount;
++ int yyx;
+
+- yycount = 0;
+ /* Start YYX at -YYN if negative to avoid negative indexes in
+ YYCHECK. */
+- for (yyx = yyn < 0 ? -yyn : 0;
+- yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
++ int yyxbegin = yyn < 0 ? -yyn : 0;
++
++ /* Stay within bounds of both yycheck and yytname. */
++ int yychecklim = YYLAST - yyn;
++ int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
++ int yycount = 0;
++
++ yyprefix = ", expecting ";
++ for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+- yysize += yystrlen (yytname[yyx]) + 15, yycount++;
+- yysize += yystrlen ("syntax error, unexpected ") + 1;
+- yysize += yystrlen (yytname[yytype]);
++ {
++ yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
++ yycount += 1;
++ if (yycount == 5)
++ {
++ yysize = 0;
++ break;
++ }
++ }
++ yysize += (sizeof ("syntax error, unexpected ")
++ + yystrlen (yytname[yytype]));
+ yymsg = (char *) YYSTACK_ALLOC (yysize);
+ if (yymsg != 0)
+ {
+@@ -1306,16 +1353,13 @@
+
+ if (yycount < 5)
+ {
+- yycount = 0;
+- for (yyx = yyn < 0 ? -yyn : 0;
+- yyx < (int) (sizeof (yytname) / sizeof (char *));
+- yyx++)
++ yyprefix = ", expecting ";
++ for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+ {
+- const char *yyq = ! yycount ? ", expecting " : " or ";
+- yyp = yystpcpy (yyp, yyq);
++ yyp = yystpcpy (yyp, yyprefix);
+ yyp = yystpcpy (yyp, yytname[yyx]);
+- yycount++;
++ yyprefix = " or ";
+ }
+ }
+ yyerror (yymsg);
+@@ -1333,38 +1377,57 @@
+
+ if (yyerrstatus == 3)
+ {
+- /* If just tried and failed to reuse lookahead token after an
++ /* If just tried and failed to reuse look-ahead token after an
+ error, discard it. */
+
+- /* Return failure if at end of input. */
+- if (yychar == YYEOF)
++ if (yychar <= YYEOF)
+ {
+- /* Pop the error token. */
+- YYPOPSTACK;
+- /* Pop the rest of the stack. */
+- while (yyss < yyssp)
+- {
+- YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+- yydestruct (yystos[*yyssp], yyvsp);
+- YYPOPSTACK;
+- }
+- YYABORT;
++ /* If at end of input, pop the error token,
++ then the rest of the stack, then return failure. */
++ if (yychar == YYEOF)
++ for (;;)
++ {
++
++ YYPOPSTACK;
++ if (yyssp == yyss)
++ YYABORT;
++ yydestruct ("Error: popping",
++ yystos[*yyssp], yyvsp);
++ }
+ }
+-
+- YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
+- yydestruct (yytoken, &yylval);
+- yychar = YYEMPTY;
+-
++ else
++ {
++ yydestruct ("Error: discarding", yytoken, &yylval);
++ yychar = YYEMPTY;
++ }
+ }
+
+- /* Else will try to reuse lookahead token after shifting the error
++ /* Else will try to reuse look-ahead token after shifting the error
+ token. */
+ goto yyerrlab1;
+
+
+-/*----------------------------------------------------.
+-| yyerrlab1 -- error raised explicitly by an action. |
+-`----------------------------------------------------*/
++/*---------------------------------------------------.
++| yyerrorlab -- error raised explicitly by YYERROR. |
++`---------------------------------------------------*/
++yyerrorlab:
++
++#ifdef __GNUC__
++ /* Pacify GCC when the user code never invokes YYERROR and the label
++ yyerrorlab therefore never appears in user code. */
++ if (0)
++ goto yyerrorlab;
++#endif
++
++yyvsp -= yylen;
++ yyssp -= yylen;
++ yystate = *yyssp;
++ goto yyerrlab1;
++
++
++/*-------------------------------------------------------------.
++| yyerrlab1 -- common code for both syntax error and YYERROR. |
++`-------------------------------------------------------------*/
+ yyerrlab1:
+ yyerrstatus = 3; /* Each real token shifted decrements this. */
+
+@@ -1386,22 +1449,22 @@
+ if (yyssp == yyss)
+ YYABORT;
+
+- YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+- yydestruct (yystos[yystate], yyvsp);
+- yyvsp--;
+- yystate = *--yyssp;
+
++ yydestruct ("Error: popping", yystos[yystate], yyvsp);
++ YYPOPSTACK;
++ yystate = *yyssp;
+ YY_STACK_PRINT (yyss, yyssp);
+ }
+
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
+- YYDPRINTF ((stderr, "Shifting error token, "));
+-
+ *++yyvsp = yylval;
+
+
++ /* Shift the error token. */
++ YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
++
+ yystate = yyn;
+ goto yynewstate;
+
+@@ -1417,6 +1480,9 @@
+ | yyabortlab -- YYABORT comes here. |
+ `-----------------------------------*/
+ yyabortlab:
++ yydestruct ("Error: discarding lookahead",
++ yytoken, &yylval);
++ yychar = YYEMPTY;
+ yyresult = 1;
+ goto yyreturn;
+
+@@ -1439,12 +1505,12 @@
+ }
+
+
+-#line 56 "yacc.y"
++#line 115 "yacc.y"
+
+
+ void yyerror ( const char *s ) /* Called by yyparse on error */
+ {
+- printf ("ERROR: %s\n", s);
++ KTraderParse_error( s );
+ }
+
+ void KTraderParse_mainParse( const char *_code )
+--- kio/tests/kdirwatchunittest.cpp (revision 523640)
++++ kio/tests/kdirwatchunittest.cpp (revision 526316)
+@@ -88,6 +88,17 @@
+ m_lastSignal == alert);
+ }
+
++void KDirWatchTest::remove_file (const QString& file)
++{
++ ::unlink (QFile::encodeName(file));
++}
++
++void KDirWatchTest::touch_file (const QString& file)
++{
++ QFile f(file);
++ f.open(IO_WriteOnly);
++}
++
+ KUNITTEST_MODULE ( kunittest_kdirwatch, "KDirWatchTest" )
+ KUNITTEST_MODULE_REGISTER_TESTER (KDirWatchTest)
+
+@@ -112,6 +123,10 @@
+ VERIFY_NOTHING();
+ dir->mkdir ("does");
+ VERIFY_DIRTY (m_workingDir);
++ touch_file (m_workingDir + "/file");
++ VERIFY_DIRTY (m_workingDir + "/file");
++ VERIFY_NOTHING ();
++ remove_file (m_workingDir + "/file");
+ d->addDir (m_workingDir + "/does/not/exist");
+ d->removeDir (m_workingDir);
+ VERIFY_NOTHING();
+--- kio/tests/kdirwatchunittest.h (revision 523640)
++++ kio/tests/kdirwatchunittest.h (revision 526316)
+@@ -54,6 +54,9 @@
+ /* verify that deleted got emitted */
+ void VERIFY_DELETED (const QString&);
+
++ void touch_file (const QString& file);
++ void remove_file (const QString& file);
++
+ QString m_lastSignal;
+ QString m_workingDir;
+ KDirWatch* d;
+--- kabc/Makefile.am (revision 523640)
++++ kabc/Makefile.am (revision 526316)
+@@ -2,7 +2,7 @@
+
+ # Make sure $(all_includes) remains last!
+ INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc -I$(top_srcdir)/kab \
+- -I$(srcdir)/vcardparser/ -I$(srcdir)/vcard/include \
++ -I$(srcdir)/vcard/include -I$(srcdir)/vcardparser/ \
+ -I$(srcdir)/vcard/include/generated \
+ -I$(srcdir)/vcardparser $(all_includes)
+
+--- kwallet/backend/sha1.cc (revision 523640)
++++ kwallet/backend/sha1.cc (revision 526316)
+@@ -23,6 +23,9 @@
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
++#ifdef HAVE_STDINT_H
++#include <stdint.h> /* For uintXX_t on OSX */
++#endif
+ #ifdef HAVE_SYS_BITYPES_H
+ #include <sys/bitypes.h> /* For uintXX_t on Tru64 */
+ #endif
+--- kdesu/su.cpp (revision 523640)
++++ kdesu/su.cpp (revision 526316)
+@@ -75,6 +75,11 @@
+
+ QCStringList args;
+
++#ifdef Q_OS_DARWIN
++ args += "-c";
++ args += "staff";
++#endif
++
+ if ((m_Scheduler != SchedNormal) || (m_Priority > 50))
+ args += "root";
+ else
+@@ -82,7 +87,9 @@
+
+ args += "-c";
+ args += QCString(__KDE_BINDIR) + "/kdesu_stub";
++#ifndef Q_OS_DARWIN
+ args += "-";
++#endif
+
+ QCString command = __PATH_SU;
+ if (::access(__PATH_SU, X_OK) != 0)
+--- kdecore/kmountpoint.cpp (revision 523640)
++++ kdecore/kmountpoint.cpp (revision 526316)
+@@ -226,7 +226,11 @@
+
+ #ifdef HAVE_GETMNTINFO
+
++#ifdef HAVE_STATFS
+ struct statfs *mounted;
++#elif defined(HAVE_STATVFS)
++ struct statvfs *mounted;
++#endif
+
+ int num_fs = getmntinfo(&mounted, MNT_NOWAIT);
+
+--- kdecore/kprocess.cpp (revision 523640)
++++ kdecore/kprocess.cpp (revision 526316)
+@@ -355,8 +355,6 @@
+ if (pipe(fd))
+ fd[0] = fd[1] = -1; // Pipe failed.. continue
+
+- QApplication::flushX();
+-
+ // we don't use vfork() because
+ // - it has unclear semantics and is not standardized
+ // - we do way too much magic in the child
+@@ -768,7 +766,7 @@
+ d->shell = shell;
+ else
+ // #ifdef NON_FREE // ... as they ship non-POSIX /bin/sh
+-#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__GNU__)
++#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__GNU__) && !defined(__DragonFly__)
+ // Solaris POSIX ...
+ if (!access( "/usr/xpg4/bin/sh", X_OK ))
+ d->shell = "/usr/xpg4/bin/sh";
+--- kdecore/all_languages.desktop (revision 523640)
++++ kdecore/all_languages.desktop (revision 526316)
+@@ -2895,6 +2895,7 @@
+ Name[tr]=Galik
+ Name[tt]=Galça
+ Name[uk]=Гальська
++Name[uz]=Галикча
+ Name[wa]=Gayel
+ Name[zh_CN]=盖尔语
+ Name[zh_HK]=蓋爾語
+@@ -8444,6 +8445,7 @@
+ Name[sv]=Latinsk serbiska
+ Name[tg]=Сербӣ (Лотинӣ)
+ Name[uk]=Сербська (латинь)
++Name[uz]=Сербча (Лотин)
+ Name[zh_CN]=塞尔维亚语(拉丁)
+ [ss]
+ Name=Swati
+@@ -10303,6 +10305,7 @@
+ Name[sv]=Kinesiska (Hong Kong)
+ Name[tg]=Хитоӣ (Гонконг)
+ Name[uk]=Китайська (Гонконг)
++Name[uz]=Хитойча (Гонгконг)
+ Name[zh_CN]=繁体中文(香港)
+ [zh_TW]
+ Name=Chinese Traditional
+--- kdecore/kapplication.cpp (revision 523640)
++++ kdecore/kapplication.cpp (revision 526316)
+@@ -960,14 +960,13 @@
+ static int my_system (const char *command) {
+ int pid, status;
+
+- QApplication::flushX();
+ pid = fork();
+ if (pid == -1)
+ return -1;
+ if (pid == 0) {
+ const char* shell = "/bin/sh";
+ execl(shell, shell, "-c", command, (void *)0);
+- ::exit(127);
++ ::_exit(127);
+ }
+ do {
+ if (waitpid(pid, &status, 0) == -1) {
+--- kdecore/kpty.cpp (revision 523640)
++++ kdecore/kpty.cpp (revision 526316)
+@@ -95,7 +95,7 @@
+ # endif
+ #endif
+
+-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__)
++#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
+ # define _tcgetattr(fd, ttmode) ioctl(fd, TIOCGETA, (char *)ttmode)
+ #else
+ # if defined(_HPUX_SOURCE) || defined(__Lynx__) || defined (__CYGWIN__)
+@@ -105,7 +105,7 @@
+ # endif
+ #endif
+
+-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__)
++#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
+ # define _tcsetattr(fd, ttmode) ioctl(fd, TIOCSETA, (char *)ttmode)
+ #else
+ # if defined(_HPUX_SOURCE) || defined(__CYGWIN__)
+--- khtml/khtml_part.cpp (revision 523640)
++++ khtml/khtml_part.cpp (revision 526316)
+@@ -5961,9 +5961,9 @@
+ if (n->isText()) {
+ khtml::RenderText* const textRenderer = static_cast<khtml::RenderText *>(n);
+ const khtml::InlineTextBoxArray &runs = textRenderer->inlineTextBoxes();
+- const unsigned lim = runs.count();
++ const unsigned lim = runs.count();
+ for (unsigned i = 0; i != lim; ++i) {
+- if (runs[i]->m_y == y) {
++ if (runs[i]->m_y == y && textRenderer->element()) {
+ startNode = textRenderer->element();
+ startOffset = runs[i]->m_start;
+ return true;
+@@ -6004,7 +6004,7 @@
+ khtml::RenderText* const textRenderer = static_cast<khtml::RenderText *>(n);
+ const khtml::InlineTextBoxArray &runs = textRenderer->inlineTextBoxes();
+ for (int i = (int)runs.count()-1; i >= 0; --i) {
+- if (runs[i]->m_y == y) {
++ if (runs[i]->m_y == y && textRenderer->element()) {
+ endNode = textRenderer->element();
+ endOffset = runs[i]->m_start + runs[i]->m_len;
+ return true;
+--- khtml/html/htmltokenizer.cpp (revision 523640)
++++ khtml/html/htmltokenizer.cpp (revision 526316)
+@@ -1739,10 +1739,11 @@
+ // scriptHandler(). In that case scriptHandler() will take care
+ // of 'scriptOutput'.
+ if ( !script ) {
+- if (!done && pendingQueue.count() > 1) {
++ if (pendingQueue.count() > 1) {
+ TokenizerString t = pendingQueue.pop();
+ pendingQueue.top().prepend( t );
+- } else if (done) {
++ }
++ if (done) {
+ write(pendingQueue.pop(), false);
+ }
+ // we might be deleted at this point, do not
+--- khtml/html/html_formimpl.cpp (revision 523640)
++++ khtml/html/html_formimpl.cpp (revision 526316)
+@@ -630,7 +630,9 @@
+ // otherwise we might have a potential security problem
+ // by saving passwords under wrong lookup key.
+
+- getDocument()->view()->part()->saveToWallet(key, m_walletMap);
++ if (view->part()) {
++ view->part()->saveToWallet(key, m_walletMap);
++ }
+ } else if ( savePassword == KDialogBase::No ) {
+ view->addNonPasswordStorableSite(formUrl.host());
+ }
+--- khtml/kjserrordlg.ui (revision 523640)
++++ khtml/kjserrordlg.ui (revision 526316)
+@@ -86,7 +86,7 @@
+ <enum>RichText</enum>
+ </property>
+ </widget>
+- <widget class="KActiveLabel" row="0" column="0" rowspan="1" colspan="3">
++ <widget class="KSqueezedTextLabel" row="0" column="0" rowspan="1" colspan="3">
+ <property name="name">
+ <cstring>_url</cstring>
+ </property>
+@@ -117,7 +117,7 @@
+ </tabstops>
+ <includes>
+ <include location="global" impldecl="in declaration">kdialog.h</include>
+- <include location="global" impldecl="in declaration">kactivelabel.h</include>
++ <include location="global" impldecl="in declaration">ksqueezedtextlabel.h</include>
+ </includes>
+ <slots>
+ <slot>init()</slot>
+--- khtml/rendering/render_text.cpp (revision 523640)
++++ khtml/rendering/render_text.cpp (revision 526316)
+@@ -307,12 +307,12 @@
+ }
+ if ( _x > _tx + m_x + m_width ) {
+ // to the right
+- return m_reversed ? SelectionPointBeforeInLine : SelectionPointAfterInLine;
++ return SelectionPointAfterInLine;
+ }
+
+ // The Y matches, check if we're on the left
+ if ( _x < _tx + m_x ) {
+- return m_reversed ? SelectionPointAfterInLine : SelectionPointBeforeInLine;
++ return SelectionPointBeforeInLine;
+ }
+
+ // consider spacing for justified text
+--- khtml/rendering/render_box.cpp (revision 523640)
++++ khtml/rendering/render_box.cpp (revision 526316)
+@@ -687,16 +687,12 @@
+ Q_ASSERT(p);
+ while( p->isInline() && !p->isReplaced() )
+ p = p->parent();
+- int off = 0;
+- if (!p->hasOverflowClip());
+- off = p->negativeOverflowWidth();
++ int off = p->hasOverflowClip() ? 0 : p->negativeOverflowWidth();
+ p->repaintRectangle( -ow - off, -ow, p->effectiveWidth()+ow*2, p->effectiveHeight()+ow*2, immediate);
+ }
+ else
+ {
+- int off = 0;
+- if (!hasOverflowClip());
+- off = negativeOverflowWidth();
++ int off = hasOverflowClip() ? 0 : negativeOverflowWidth();
+ repaintRectangle( -ow - off, -ow, effectiveWidth()+ow*2, effectiveHeight()+ow*2, immediate);
+ }
+ }
+--- pics/hicolor/index.theme (revision 523640)
++++ pics/hicolor/index.theme (revision 526316)
+@@ -100,6 +100,7 @@
+ Comment[uk]=Основна тема піктограм
+ Comment[zh_CN]=默认图标主题
+ Comment[zh_HK]=後備高彩圖示主題
++Inherits=kdeclassic,crystalsvg
+ DisplayDepth=32
+ Example=exec
+ LinkOverlay=link
+@@ -115,7 +116,7 @@
+ SmallSizes=16
+ PanelDefault=32
+ PanelSizes=16,22,32,48
+-Hidden=true
++Hidden=false
+ Directories=192x192/apps,128x128/actions,128x128/apps,128x128/devices,128x128/filesystems,128x128/mimetypes,96x96/actions,96x96/apps,96x96/devices,96x96/filesystems,96x96/mimetypes,72x72/apps,64x64/actions,64x64/apps,64x64/devices,64x64/filesystems,64x64/mimetypes,48x48/actions,48x48/apps,48x48/devices,48x48/filesystems,48x48/mimetypes,36x36/apps,32x32/actions,32x32/apps,32x32/devices,32x32/filesystems,32x32/mimetypes,24x24/apps,22x22/actions,22x22/apps,22x22/devices,22x22/filesystems,22x22/mimetypes,16x16/actions,16x16/apps,16x16/devices,16x16/filesystems,16x16/mimetypes,scalable/actions,scalable/apps,scalable/devices,scalable/filesystems,scalable/mimetypes,16x16/stock/chart,16x16/stock/code,16x16/stock/data,16x16/stock/document,16x16/stock/form,16x16/stock/generic,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/document,24x24/stock/form,24x24/stock/generic,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,32x32/stock/chart,32x32/stock/code,32x32/stock/data,32x32/stock/document,32x32/stock/form,32x32/stock/generic,32x32/stock/image,32x32/stock/io,32x32/stock/media,32x32/stock/navigation,32x32/stock/net,32x32/stock/object,32x32/stock/table,32x32/stock/text,36x36/stock/chart,36x36/stock/code,36x36/stock/data,36x36/stock/document,36x36/stock/form,36x36/stock/generic,36x36/stock/image,36x36/stock/io,36x36/stock/media,36x36/stock/navigation,36x36/stock/net,36x36/stock/object,36x36/stock/table,36x36/stock/text,48x48/stock/chart,48x48/stock/code,48x48/stock/data,48x48/stock/document,48x48/stock/form,48x48/stock/generic,48x48/stock/image,48x48/stock/io,48x48/stock/media,48x48/stock/navigation,48x48/stock/net,48x48/stock/object,48x48/stock/table,48x48/stock/text
+
+ [16x16/actions]
+--- kdoctools/customization/ca/user.entities (revision 523640)
++++ kdoctools/customization/ca/user.entities (revision 526316)
+@@ -29,8 +29,17 @@
+ <!ENTITY kmenu "Menú <guimenu>K</guimenu>">
+ <!ENTITY BER "botó <mousebutton>esquerra</mousebutton> del ratolí"><!-- English: &LMB; -->
+ <!ENTITY BMR "botó <mousebutton>mig</mousebutton> del ratolí"><!-- English: &MMB; -->
+-<!ENTITY SO "sistema operatiu"><!-- English: &OS; -->
++<!ENTITY SO "sistema operatiu"><!-- English: &OS; -->
+ <!ENTITY BDR "botó <mousebutton>dret</mousebutton> del ratolí"><!-- English: &RMB; -->
+ <!ENTITY Maj "<keycap>Majús.</keycap>"><!-- English: &Shift; -->
+ <!ENTITY safatasistema "<application>safata del sistema</application>"><!-- English: &systemtray; -->
+ <!ENTITY Tab "<keycap>Tabulador</keycap>">
++
++<!-- ROLES OF TRANSLATORS -->
++<!ENTITY traductor.Antoni.Bella '<othercredit role="translator"><firstname>Antoni</firstname><surname>Bella</surname><affiliation><address><email>bella5 at teleline.es</email></address></affiliation><contrib>Traductor</contrib></othercredit>'>
++<!ENTITY revisor.Antoni.Bella '<othercredit role="reviewer"><firstname>Antoni</firstname><surname>Bella</surname><affiliation><address><email>bella5 at teleline.es</email></address></affiliation><contrib>Revisor</contrib></othercredit>'>
++
++<!-- CREDITS FOR TRANSLATORS -->
++<!-- Seguir el següent format '<para>Traductor/Revisor de la documentació: &credits.Nom.Cognom;</para>' -->
++<!ENTITY credits.Antoni.Bella 'Antoni Bella <email>bella5 at teleline.es</email>'>
++
+--- kdeprint/filters/enscript.desktop (revision 523640)
++++ kdeprint/filters/enscript.desktop (revision 526316)
+@@ -23,7 +23,7 @@
+ Comment[bn]=enscript টেক্সট ফিল্টার
+ Comment[br]=Sil skrid Enscript
+ Comment[bs]=Enscript tekst filter
+-Comment[ca]=Filtre de texts enscript
++Comment[ca]=Filtre de text enscript
+ Comment[cs]=Textový filtr Enscript
+ Comment[cy]=Hidl Testun Enscript
+ Comment[da]=Enscript-tekstfilter
+--- kdeprint/ext/ext.print (revision 523640)
++++ kdeprint/ext/ext.print (revision 526316)
+@@ -6,7 +6,7 @@
+ Comment[az]=Xarici Proqram Vasitəsilə Çap Et (ümumi)
+ Comment[bn]=বহিঃস্থ প্রোগ্রামের (generic) সাহায্যে ছাপানো হোক
+ Comment[bs]=Štampajte pomoću eksternog programa (generic)
+-Comment[ca]=Imprimeix mitjançant un programa extern (genèric)
++Comment[ca]=Impressió mitjançant un programa extern (genèric)
+ Comment[cs]=Tisk pomocí externího programu (obecné)
+ Comment[cy]=Argraffu drwy Raglen Allanol (cyffredinol)
+ Comment[da]=Udskriv gennem et eksternt program (generisk)
+--- configure.in.in (revision 523640)
++++ configure.in.in (revision 526316)
+@@ -162,7 +162,7 @@
+ AC_CHECK_MKSTEMPS
+ AC_CHECK_MKSTEMP
+ AC_CHECK_MKDTEMP
+-AC_CHECK_FUNCS(strtoll socket seteuid setegid strfmon stpcpy gettimeofday readdir_r setpriority)
++AC_CHECK_FUNCS(strtoll socket seteuid setegid strfmon stpcpy gettimeofday readdir_r setpriority statvfs statfs)
+
+ AH_BOTTOM([
+ /* provide a definition for a 32 bit entity, usable as a typedef, possibly
+--- kdeui/kprogress.cpp (revision 523640)
++++ kdeui/kprogress.cpp (revision 526316)
+@@ -216,7 +216,6 @@
+
+ show();
+ kapp->processEvents();
+- mShown = true;
+ }
+
+ void KProgressDialog::slotCancel()
+@@ -394,6 +393,13 @@
+ }
+ }
+
++void KProgressDialog::show()
++{
++ KDialogBase::show();
++ mShown = true;
++}
++
++
+ void KProgress::virtual_hook( int, void* )
+ { /*BASE::virtual_hook( id, data );*/ }
+
+--- kdeui/kprogress.h (revision 523640)
++++ kdeui/kprogress.h (revision 526316)
+@@ -361,6 +361,11 @@
+ */
+ int minimumDuration() const;
+
++ /**
++ * Reimplemented for internal reasons, the API is not affected.
++ */
++ virtual void show();
++
+ protected slots:
+ void slotAutoShow();
+ void slotAutoActions(int percentage);
+--- libkmid/sndcard.h (revision 523640)
++++ libkmid/sndcard.h (revision 526316)
+@@ -31,9 +31,12 @@
+
+ #ifdef HAVE_SYS_SOUNDCARD_H
+ #include <sys/soundcard.h>
+- #define HAVE_OSS_SUPPORT
+ #elif defined(HAVE_MACHINE_SOUNDCARD_H)
+ #include <machine/soundcard.h>
++#endif
++
++/* Check for OSS MIDI API */
++#if defined(SNDCTL_SEQ_NRSYNTHS) && defined(CTL_MAIN_VOLUME)
+ #define HAVE_OSS_SUPPORT
+ #else
+ #undef HAVE_OSS_SUPPORT
More information about the pkg-kde-commits
mailing list