SOURCES: kdelibs-branch.diff, kdebase-branch.diff, kdepim-branch.d...
arekm
arekm at pld-linux.org
Wed Sep 20 18:33:46 CEST 2006
Author: arekm Date: Wed Sep 20 16:33:46 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kdelibs-branch.diff (1.32 -> 1.33) , kdebase-branch.diff (1.36 -> 1.37) , kdepim-branch.diff (1.21 -> 1.22)
---- Diffs:
================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.32 SOURCES/kdelibs-branch.diff:1.33
--- SOURCES/kdelibs-branch.diff:1.32 Wed Sep 20 13:07:28 2006
+++ SOURCES/kdelibs-branch.diff Wed Sep 20 18:33:40 2006
@@ -1,7 +1,7 @@
Index: interfaces/kscript/sample/shellscript.desktop
===================================================================
---- interfaces/kscript/sample/shellscript.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ interfaces/kscript/sample/shellscript.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- interfaces/kscript/sample/shellscript.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ interfaces/kscript/sample/shellscript.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -15,7 +15,7 @@
Name[es]=Ejecutor de script para intĂŠrprete de comandos de bash
Name[et]=Bash shelli skripti käivitaja
@@ -40,8 +40,8 @@
Comment[pa]=ŕ¨‡ŕŠąŕ¨• ŕ¨•ŕ¨žŕ¨°ŕ¨œ ਵਿੱਹ ŕ¨ŹŕŠˆŕ¨ś ŕ¨śŕŠˆŕ¨˛ ਸਕŕŠŕ¨°ŕ¨żŕ¨Şŕ¨Ÿŕ¨žŕ¨‚ ਚਲਞਉਣ ŕ¨˛ŕ¨ˆ ਸਚਞਇਕ ŕ¨šŕŠˆ
Index: interfaces/kscript/scriptinterface.desktop
===================================================================
---- interfaces/kscript/scriptinterface.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ interfaces/kscript/scriptinterface.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- interfaces/kscript/scriptinterface.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ interfaces/kscript/scriptinterface.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Este es un motor de script genĂŠrico para probar el interfaz de script.
Comment[et]=Ăœldise skriptimootori testskript liidese testimiseks.
@@ -53,8 +53,8 @@
Comment[fr]=Ceci est un moteur de script de test gĂŠnĂŠrique pour expĂŠrimenter l'interface de script.
Index: interfaces/kimproxy/interface/dcopinstantmessenger.desktop
===================================================================
---- interfaces/kimproxy/interface/dcopinstantmessenger.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- interfaces/kimproxy/interface/dcopinstantmessenger.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,6 +17,7 @@
Comment[es]=Instant Messenger con un interfaz DCOP
Comment[et]=Kiirsuhtlemisrakendus DCOP-liidesega
@@ -65,8 +65,8 @@
Comment[fy]=Instant Messenger mei in DCOP-interface
Index: interfaces/kimproxy/interface/kcm_instantmessenger.desktop
===================================================================
---- interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -10,6 +10,7 @@
Name[eo]=TujmesaÄilo
Name[et]=Kiirsuhtlus
@@ -85,8 +85,8 @@
Comment[fy]=Mei de instant messenger kinne jo twaspraak hâlde mei in yndividu en groepen.
Index: interfaces/kspeech/dcoptexttospeech.desktop
===================================================================
---- interfaces/kspeech/dcoptexttospeech.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ interfaces/kspeech/dcoptexttospeech.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- interfaces/kspeech/dcoptexttospeech.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ interfaces/kspeech/dcoptexttospeech.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -16,6 +16,7 @@
Comment[es]=Texto a servicio de voz con un interfaz DCOP
Comment[et]=Teksti kĂľneks muutmise teenus DCOP-liidesega
@@ -97,8 +97,8 @@
Comment[fy]=tekst-ta-prate mei in DCOP-ynterface
Index: interfaces/ktexteditor/ktexteditoreditor.desktop
===================================================================
---- interfaces/ktexteditor/ktexteditoreditor.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ interfaces/ktexteditor/ktexteditoreditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- interfaces/ktexteditor/ktexteditoreditor.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ interfaces/ktexteditor/ktexteditoreditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Componente incrustable de editor de textos (sin separaciĂłn Doc/Vista)
Comment[et]=PĂľimitav tekstiredaktori komponent
@@ -110,8 +110,8 @@
Comment[fy]=Yn te sluten tekstbewurkerkomponint (sĂťnder skieding fan tekst/werjefte)
Index: interfaces/ktexteditor/kcm_ktexteditor.desktop
===================================================================
---- interfaces/ktexteditor/kcm_ktexteditor.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ interfaces/ktexteditor/kcm_ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- interfaces/ktexteditor/kcm_ktexteditor.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ interfaces/ktexteditor/kcm_ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -90,7 +90,7 @@
Comment[es]=El servicio del editor de texto proporciona aplicaciones con un visor de textos y un editor de textos. Las aplicaciones KDE que suministran propiedades de ediciĂłn deberĂan utilizar este servicio.
Comment[et]=Tekstiredaktori teenus annab rakendustele komponendi teksti vaatamiseks ja redigeerimiseks. Seda kasutavad kĂľik KDE rakendused, mis tegelevad teksti redigeerimisega.
@@ -123,8 +123,8 @@
Comment[fr]=Le service d'ĂŠdition de texte fournit des applications comportant un afficheur de texte et un ĂŠditeur. Les applications KDE qui fournissent des fonctions d'ĂŠdition de texte devraient utiliser ce service.
Index: interfaces/ktexteditor/ktexteditor.desktop
===================================================================
---- interfaces/ktexteditor/ktexteditor.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ interfaces/ktexteditor/ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- interfaces/ktexteditor/ktexteditor.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ interfaces/ktexteditor/ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Componente incrustable de editor de textos (con separaciĂłn Doc/Vista)
Comment[et]=PĂľimitav tekstiredaktori komponent (dokument/vaade eraldamisega)
@@ -136,8 +136,8 @@
Comment[fy]=Yn te sluten tekstbewurkerkomponint (mei skieding fan tekst/werjefte)
Index: interfaces/ktexteditor/ktexteditorplugin.desktop
===================================================================
---- interfaces/ktexteditor/ktexteditorplugin.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ interfaces/ktexteditor/ktexteditorplugin.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- interfaces/ktexteditor/ktexteditorplugin.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ interfaces/ktexteditor/ktexteditorplugin.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Plugin de KTextEditor
Comment[et]=KTextEditori plugin
@@ -149,8 +149,8 @@
Comment[fy]=KTextFerwurker-plugin
Index: kate/plugins/kdatatool/ktexteditor_kdatatool.desktop
===================================================================
---- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,7 +17,7 @@
Name[es]=Plugin KDataTool de KTextEditor
Name[et]=KTextEditori KDataTool plugin
@@ -171,8 +171,8 @@
Comment[fy]=Aktivearjen fan dataprogramma's, lykas de tesaurus en stavering (wannear't dy ynstallearre binne)
Index: kate/plugins/insertfile/ktexteditor_insertfile.desktop
===================================================================
---- kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,7 +17,7 @@
Name[es]=Plugin de inserciĂłn de archivos de KTextEditor
Name[et]=KTextEditori faili lisamise plugin
@@ -192,8 +192,8 @@
Comment[fy]=Els lĂŞsber Triem by it rinnerke ynfoegje
Index: kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
===================================================================
---- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -14,6 +14,7 @@
Name[es]=Automarcadores de KTextEditor
Name[et]=KTextEditori järjehoidjate märkija
@@ -212,8 +212,8 @@
Comment[fy]=BlĂŞdwizer ynstelle om by it laden fan dokuminten oerienkomstige patroanen
Index: kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
===================================================================
---- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -13,6 +13,7 @@
Name[es]=Plugin de completado de palabras de KTextEditor
Name[et]=KTextEditori sĂľna lĂľpetamise plugin
@@ -241,8 +241,8 @@
Comment[fy]=kompleet meitsje fan wurden yn it dokumint op Direktsjeneel of popup-basearje
Index: kate/plugins/isearch/ktexteditor_isearch.desktop
===================================================================
---- kate/plugins/isearch/ktexteditor_isearch.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/plugins/isearch/ktexteditor_isearch.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/plugins/isearch/ktexteditor_isearch.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/plugins/isearch/ktexteditor_isearch.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -16,7 +16,7 @@
Name[es]=Plugin de bĂşsqueda incremental de KTextEditor
Name[et]=KTextEditori täpsustava otsingu plugin
@@ -262,8 +262,8 @@
Comment[fy]=Ek bekend as"Ăťnder it typen sykje"
Index: kate/part/katecodecompletion.cpp
===================================================================
---- kate/part/katecodecompletion.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/katecodecompletion.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/katecodecompletion.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/katecodecompletion.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -137,6 +137,11 @@
this, SLOT(slotCursorPosChanged()) );
}
@@ -278,8 +278,8 @@
}
Index: kate/part/kateconfig.h
===================================================================
---- kate/part/kateconfig.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/kateconfig.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/kateconfig.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/kateconfig.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -178,7 +178,8 @@
cfReplaceTabsDyn= 0x2000000,
cfRemoveTrailingDyn=0x4000000,
@@ -292,8 +292,8 @@
uint configFlags () const;
Index: kate/part/katedocument.h
===================================================================
---- kate/part/katedocument.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/katedocument.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/katedocument.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/katedocument.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -993,7 +993,12 @@
*/
static bool checkColorValue( QString value, QColor &col );
@@ -309,8 +309,8 @@
KIO::TransferJob *m_job;
Index: kate/part/kateview.cpp
===================================================================
---- kate/part/kateview.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/kateview.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/kateview.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/kateview.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -173,7 +173,6 @@
m_doc->removeView( this );
@@ -321,8 +321,8 @@
Index: kate/part/katedocument.cpp
===================================================================
---- kate/part/katedocument.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/katedocument.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/katedocument.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/katedocument.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -2895,8 +2895,8 @@
{
QChar end_ch;
@@ -643,8 +643,8 @@
}
Index: kate/part/kateautoindent.h
===================================================================
---- kate/part/kateautoindent.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/kateautoindent.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/kateautoindent.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/kateautoindent.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -67,8 +67,10 @@
* This baseclass is a real dummy, does nothing beside remembering the document it belongs too,
* only to have the object around
@@ -770,7 +770,7 @@
Index: kate/part/test_regression.h
===================================================================
--- kate/part/test_regression.h (.../tags/KDE/3.5.4/kdelibs) (revision 0)
-+++ kate/part/test_regression.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
++++ kate/part/test_regression.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -0,0 +1,186 @@
+/**
+ * This file is part of the KDE project
@@ -960,8 +960,8 @@
+#endif
Index: kate/part/katedialogs.h
===================================================================
---- kate/part/katedialogs.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/katedialogs.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/katedialogs.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/katedialogs.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -122,7 +122,7 @@
void indenterSelected (int);
@@ -973,8 +973,8 @@
KIntNumInput *indentationWidth;
Index: kate/part/kateviewhelpers.cpp
===================================================================
---- kate/part/kateviewhelpers.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/kateviewhelpers.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/kateviewhelpers.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/kateviewhelpers.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -583,7 +583,7 @@
".+++++++++.",
"..........."};
@@ -1004,10 +1004,42 @@
uint h = m_view->renderer()->config()->fontStruct()->fontHeight;
uint startz = (y / h);
uint endz = startz + 1 + (height / h);
+Index: kate/part/configure.in.in
+===================================================================
+--- kate/part/configure.in.in (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/configure.in.in (.../branches/KDE/3.5/kdelibs) (revision 586795)
+@@ -4,6 +4,9 @@
+
+ HAVE_LUA=""
+
++ AC_ARG_WITH([lua],
++ AC_HELP_STRING([--without-lua], [Build without Lua libraries (default: check)]))
++
+ AC_ARG_WITH(lua-dir,
+ AC_HELP_STRING([--with-lua-dir=DIR],[where the root of Lua 5.x is installed]),
+ [
+@@ -21,6 +24,9 @@
+ LUA_LIBS="-L$withval" ])
+
+
++ if test "x$with_lua" = "xno"; then
++ AC_MSG_RESULT([Not using Lua])
++ else
+ if ! test "x$LUA" = "x"; then
+ AC_MSG_RESULT(using Lua from $LUA)
+ fi
+@@ -76,6 +82,7 @@
+ AC_SUBST(LUA)
+ AC_SUBST(LUA_INCLUDES)
+ AC_SUBST(LUA_LIBS)
++ fi
+
+ ])
+
Index: kate/part/kateconfig.cpp
===================================================================
---- kate/part/kateconfig.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/kateconfig.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/kateconfig.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/kateconfig.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -168,7 +168,8 @@
| KateDocumentConfig::cfKeepIndentProfile
| KateDocumentConfig::cfWrapCursor
@@ -1020,8 +1052,8 @@
Index: kate/part/kateviewinternal.cpp
===================================================================
---- kate/part/kateviewinternal.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/kateviewinternal.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/kateviewinternal.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/kateviewinternal.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -870,7 +870,10 @@
void KateViewInternal::updateMicroFocusHint()
{
@@ -1124,8 +1156,8 @@
}
Index: kate/part/katecodecompletion.h
===================================================================
---- kate/part/katecodecompletion.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/katecodecompletion.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/katecodecompletion.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/katecodecompletion.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -72,6 +72,7 @@
public:
@@ -1136,8 +1168,8 @@
Index: kate/part/kateautoindent.cpp
===================================================================
---- kate/part/kateautoindent.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/kateautoindent.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/kateautoindent.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/kateautoindent.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -31,6 +31,8 @@
#include <kdebug.h>
#include <kpopupmenu.h>
@@ -1481,7 +1513,7 @@
Index: kate/part/test_regression.cpp
===================================================================
--- kate/part/test_regression.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 0)
-+++ kate/part/test_regression.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
++++ kate/part/test_regression.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -0,0 +1,1127 @@
+/**
+ * This file is part of the KDE project
@@ -2612,8 +2644,8 @@
+// kate: indent-width 4
Index: kate/part/katedialogs.cpp
===================================================================
---- kate/part/katedialogs.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/katedialogs.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/katedialogs.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/katedialogs.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -140,7 +140,8 @@
KateDocument::cfTabIndents,
KateDocument::cfBackspaceIndents,
@@ -2669,8 +2701,8 @@
Index: kate/part/Makefile.am
===================================================================
---- kate/part/Makefile.am (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/Makefile.am (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/Makefile.am (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/Makefile.am (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -1,6 +1,8 @@
kde_module_LTLIBRARIES = libkatepart.la
@@ -2713,8 +2745,8 @@
+testkateregression_LDADD = $(libkatepart_la_LIBADD)
Index: kate/scripts/jstest.desktop
===================================================================
---- kate/scripts/jstest.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/scripts/jstest.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/scripts/jstest.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/scripts/jstest.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -9,6 +9,7 @@
Name[es]=Prueba JavaScript de Kate Part
Name[et]=Kate komponendi JavaScripti test
@@ -2731,10 +2763,256 @@
Comment[fi]=Skripti kate partin skriptien testaukseen
Comment[fr]=Script testant le module de scripting de Kate
Comment[fy]=Skript foar it testen fan Kate-part's skriptmooglikheid
+Index: kate/README.testing
+===================================================================
+--- kate/README.testing (.../tags/KDE/3.5.4/kdelibs) (revision 0)
++++ kate/README.testing (.../branches/KDE/3.5/kdelibs) (revision 586795)
+@@ -0,0 +1,241 @@
++ Testing Kate
++==============
++
++Author: Leo Savernik
++
++Kate contains regression tests to ensure that fixed bugs do not reappear in
++newer versions. To facilitate regression testing, a dedicated application
++testkateregression will execute the regression tests and compare them to the
++expecting results, indicating passed as well as failed testcases.
++
++
++1. Using testkateregression
++ --------------------------
++
++We tried to make regression testing for Kate as easy as possible such that you
++can run it before each commit and find out regressions caused by your changes
++before they are shipped as part of a release.
++
++Running all regression tests works by simply invoking
++
++ > make check
++
++in your kate build directory. While executing, testkateregression prints a line
++for each executed testcase, prefixed with "PASS" if it passed, and "FAIL" if it
++failed. Furthermore, testkateregression stores a comprehensive output log under
++<katetests-directory>/output/index.html. The output log is invaluable for
++determining why a certain testcase failed.
++
++If you invoke testkateregression the first time, it will print instructions on
++how to fetch the testsuite and pointing testkateregression to it. This setup
++has only to be done once per branch.
++
++
++2. Discriminating your regressions against existing regressions
++ --------------------------------------------------------------
++
++In an ideal universe, all testcases always pass. In this universe, however,
++some testcases fail, be it because of anticipating future features not
++implemented yet, be it because of nasty bugs which cannot be repaired easily.
++
++This means if you've hacked on kate for quite some while and then fire up
++"make check", you are likely to see many failed tests pass by, most of them
++*not* caused by your very changes, as they failed already before.
++
++To discriminate the failed tests caused by your changes against the unaffected
++failures, testkateregression provides the option --save-failures=<name>, which
++runs the regression tests and stores all failures under a failure snapshot
++identified by <name>.
++
++The next time you run "make check", testkateregression automatically picks up
++the most recently stored failure snapshot and compares the failures and passes
++with the one stored in the snapshot. Each failure not listed in the failure
++snapshot will be prefixed with "FAIL (new)", indicating that this is a new
++failure. Testcases which failed in the snapshot but do pass now are prefixed
++with "PASS (new)", indicating that this testcase seems to be fixed now.
++
++
++3. Using testkateregression efficiently
++ --------------------------------------
++
++Therefore, to get the most out of regression testing, we suggest the following
++development approach:
++
++ 1. Before you change Kate, update and run testkateregression in the part-
++ subdirectory.
++
++ > make testkateregression && ./testkateregression --save-failures=last
++
++ This will produce a failure snapshot called "last".
++
++ 2. Hack on Kate.
++
++ 3. Before you commit, run
++
++ > make check
++
++ It will automatically pick up the failure snapshot "last" (provided you
++ didn't generate a newer one in the meantime) and compare all results with
++ the previously stored ones.
++
++ If you inspect <katetests-directory>/output/index.html, the new failures
++ are marked red. Those are of interest to you, because they have been
++ caused by your changes.
++
++ New passes are marked green. These were former failures which started
++ working due to your changes.
++
++ Goto 2 while there are any new failures.
++
++ 4. Commit.
++
++
++4. Invoking testkateregression directly
++ --------------------------------------
++
++While make check is handy and simple enough for the common case, you might
++sometimes need more control over regression testing.
++
++testkateregression features a broad range of options, enabling you to run
++dedicated testcases only, specifying an alternate output directory for the
++logs, etc.
++
++ > ./testregression --help
++
++will provide you with a complete list of options.
++
++
++5. Structure of the regression test suite
++ ----------------------------------------
++
++Kate's regression testsuite is located in the KDE repository under
++
++ trunk/tests/katetests/regression
++
++and consists of two subdirectories
++
++ baseline
++ tests
++
++The latter, tests, contains a directory hierarchy for all testcases to be run
++by testkateregression. The former, baseline, contains results as they are
++expected by correct operation. Mismatch between the output of a test and its
++baseline is considered to be a failure.
++
++Each directory under tests may optionally contain one of the following files.
++
++ .kateconfig
++ .kateconfig-commands
++ ignore
++ KNOWN_FAILURES
++
++.kateconfig: This file works exactly like .kateconfig as supported by the kate
++and kwrite editors. It may contain any kate line variable necessary to set up
++the testcases proper. Note that .kateconfig files from parent directories are
++not merged with .kateconfig files from child directories.
++
++.kateconfig-commands: This file may contain all commands that can be entered by
++kate's command line (F7). Each line will be interpreted as one command. To the
++contrary of .kateconfig, .kateconfig-commands files are merged with
++.kateconfig-commands files from parent directories. Nearer ancestors' commands
++take precedence over farther ancestors'.
++
++ignore: This file specifies on each line a file to be ignored in the directory
++the ignore-file is located. This enables you to mark any helper files which
++otherwise would be interpreted as testcases. Note that hidden files (.*) are
++ignored by default, and cannot be "unignored".
++
++KNOWN_FAILURES: This file specifies on each line a file name of a testcase
++which is known to fail. Such known failures are counted towards the total count
++of failures but they don't cause testkateregression to return a failure code.
++
++
++6. Structure of a testcase
++ -------------------------
++
++A testcase is comprised of a simple plain text file <testcase>.txt which may
++be located in any subdirectory under tests. This file contains the *initial*
++content the testcase operates on.
++
++Each <testcase>.txt must be accompanied with a <testcase>.txt-script which
++contains the actual tests to be performed on the testcase. It consists of
++simple JavaScript-statements for direct interfacing with Kate.
++
++Last but not least, a <testcase>.txt-result exists under the baseline
++subdirectory, which contains a mirrored directory hierarchy of tests. This very
++file contains the expected *result* of the performed tests.
++
++
++7. Writing a simple testcase
++ ---------------------------
++
++Writing your own testcases is easy once you know how to get started. Let's
++test how Kate's C-Style indenter fares with indenting after opening braces.
++
++First, we create the new initial content under tests/indent/csmart/openbrc.txt
++and fill it with (the dashed lines are not part of the content)
++---------------------------
++
++int main() {
++
++---------------------------
++
++Now, we need to write a script performing some actions. We therefore create
++a file tests/indent/csmart/openbrc.txt-script and fill it with
++---------------------------
++v.setCursorPosition(1,12);
++v.enter();
++v.type("good");
++---------------------------
++
++Here, we set the initial cursor position to line 2 (the coordinates are zero-
++based) and column 13 which happens to be just after the opening brace. Then
++v.enter() simulates pressing the return key in the editor, thus inserting a
++new line. v.type simulates typing of the word "good" at the current position
++of the cursor.
++
++The options under .kateconfig specify the C-Style indenter to be applied to the
++testcases and an indent width of two. With this information, we know what we
++expect as a result.
++
++What we are still missing is the expected result itself which we create under
++baseline/indent/csmart/openbrc.txt-result and fill it with
++---------------------------
++
++int main() {
++ good
++
++---------------------------
++
++You can see that "good" is indented by two spaces, even though we didn't
++specify those with v.type. We expect from the indenter to provide them for us.
++
++Last but not least we test the testcase by invoking in kate's part directory
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdelibs-branch.diff?r1=1.32&r2=1.33&f=u
http://cvs.pld-linux.org/SOURCES/kdebase-branch.diff?r1=1.36&r2=1.37&f=u
http://cvs.pld-linux.org/SOURCES/kdepim-branch.diff?r1=1.21&r2=1.22&f=u
More information about the pld-cvs-commit
mailing list