Hello community, here is the log from the commit of package kdepimlibs4 checked in at Wed Oct 22 18:07:57 CEST 2008. -------- --- KDE/kdepimlibs4/kdepimlibs4.changes 2008-09-25 19:00:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdepimlibs4/kdepimlibs4.changes 2008-10-21 10:20:26.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Oct 21 10:15:09 CEST 2008 - stbinner@suse.de + +- 4_1_BRANCH.diff update: + * don't require < count match > count to consider string as HTML + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.h16841/_old 2008-10-22 18:07:22.000000000 +0200 +++ /var/tmp/diff_new_pack.h16841/_new 2008-10-22 18:07:22.000000000 +0200 @@ -24,7 +24,7 @@ Summary: KDE PIM Libraries Url: http://www.kde.org Version: 4.1.2 -Release: 1 +Release: 2 Source0: kdepimlibs-%version.tar.bz2 Source1: _upstream Patch0: 4_1_BRANCH.diff @@ -189,6 +189,9 @@ %_kde_share_dir/config.kcfg/mailtransport.kcfg %changelog +* Tue Oct 21 2008 stbinner@suse.de +- 4_1_BRANCH.diff update: + * don't require < count match > count to consider string as HTML * Thu Sep 25 2008 dmueller@suse.de - update to 4.1.2 * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php ++++++ 4_1_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.h16841/_old 2008-10-22 18:07:22.000000000 +0200 +++ /var/tmp/diff_new_pack.h16841/_new 2008-10-22 18:07:22.000000000 +0200 @@ -3,10 +3,281 @@ --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: ++current HEAD: 874289 +svn di between //tags/KDE/4.1.2/kdepimlibs and //branches/KDE/4.1/kdepimlibs +--- syndication/tools.cpp ++++ syndication/tools.cpp +@@ -150,8 +150,10 @@ + return str.trimmed(); + } + +-static QRegExp tagRegExp; +-static bool tagRegExpSet = false; ++namespace { ++ static QRegExp tagRegExp; ++ static bool tagRegExpSet = false; ++} + + bool stringContainsMarkup(const QString& str) + { +@@ -159,8 +161,8 @@ + if (str.contains(QRegExp("&[a-zA-Z0-9#]+;"))) + return true; + +- int ltc = str.count('<'); +- if (ltc == 0 || ltc != str.count('>')) ++ const int ltc = str.count('<'); ++ if (ltc == 0) + return false; + + if (!tagRegExpSet) +@@ -177,8 +179,8 @@ + if (str.contains(QRegExp("&[a-zA-Z0-9#]+;"))) + return true; + +- int ltc = str.count('<'); +- if (ltc == 0 || ltc != str.count('>')) ++ const int ltc = str.count('<'); ++ if (ltc == 0) + return false; + + if (!tagRegExpSet) +--- kresources/kresources_manager.desktop ++++ kresources/kresources_manager.desktop +@@ -24,6 +24,8 @@ + Name[pt]=Gestor do KResources + Name[pt_BR]=Gerenciador do KResource + Name[ro]=Administrator KResurse ++Name[ru]=Администратор KResources ++Name[sl]=Upravnik KResources + Name[sr]=Менаџер к‑ресурса + Name[sr@latin]=Menadžer k‑resursa + Name[sv]=Resurshantering +@@ -59,6 +61,8 @@ + Comment[pl]=Menadżer zasobów KDE (KResource) + Comment[pt]=Gestor do KResources + Comment[pt_BR]=Gerenciador do KResource ++Comment[ru]=Администратор KResources ++Comment[sl]=Upravnik KResources + Comment[sr]=Менаџер к‑ресурса + Comment[sr@latin]=Menadžer k‑resursa + Comment[sv]=Resurshantering +--- kresources/kresources.desktop ++++ kresources/kresources.desktop +@@ -21,6 +21,7 @@ + Name[gl]=Recursos de KDE + Name[hr]=KDE resursi + Name[hu]=KDE-erőforrások ++Name[is]=KDE auðlindir + Name[it]=Risorse di KDE + Name[ja]=KDE リソース + Name[km]=ធនធានរបស់ KDE +@@ -61,6 +62,7 @@ + Comment[gl]=Configurar os recursos de KDE + Comment[hr]=Konfiguriranje KDE resursa + Comment[hu]=A KDE-erőforrások beállítása ++Comment[is]=Stilla KDE auðlindir + Comment[it]=Configura le risorse di KDE + Comment[ja]=KDE リソースの設定 + Comment[km]=កំណត់រចនាសម្ព័ន្ធធនធាន KDE +--- kresources/kresources_plugin.desktop ++++ kresources/kresources_plugin.desktop +@@ -24,6 +24,8 @@ + Name[pt]='Plugin' do KResources + Name[pt_BR]=Plug-in do KResource + Name[ro]=Modul KResurse ++Name[ru]=Модуль KResources ++Name[sl]=Vstavek KResources + Name[sr]=Прикључак радног оквира к‑ресурса + Name[sr@latin]=Priključak radnog okvira k‑resursa + Name[sv]=Insticksprogram för resurser +--- kcal/localdir.desktop ++++ kcal/localdir.desktop +@@ -13,6 +13,7 @@ + Name[gl]=Axenda nun cartafol local + Name[hr]=Kalendar u lokalnoj mapi + Name[hu]=Naptár helyi könyvtárban ++Name[is]=Dagatal í staðbundinni möppu + Name[it]=Calendario nella cartella locale + Name[ja]=ローカルディレクトリのカレンダー + Name[km]=ប្រតិទិនក្នុងថតមូលដ្ឋាន +--- kcal/local.desktop ++++ kcal/local.desktop +@@ -13,6 +13,7 @@ + Name[gl]=Axenda nun ficheiro local + Name[hr]=Kalendar u lokalnoj datoteci + Name[hu]=Helyi naptárfájl ++Name[is]=Dagatal í staðbundinni skrá + Name[it]=Calendario in file locale + Name[ja]=ローカルファイルのカレンダー + Name[km]=ប្រតិទិនក្នុងឯកសារមូលដ្ឋាន +--- kcal/kcal_manager.desktop ++++ kcal/kcal_manager.desktop +@@ -14,6 +14,7 @@ + Name[gl]=Axenda + Name[hr]=Kalendar + Name[hu]=Naptár ++Name[is]=Dagatal + Name[it]=Calendario + Name[ja]=カレンダー + Name[km]=ប្រតិទិន +--- kcal/icalformat_p.cpp ++++ kcal/icalformat_p.cpp +@@ -2220,20 +2220,31 @@ + if ( value < 0 ) { + value = -value; + } ++ // RFC2445 states that an ical duration value must be ++ // EITHER weeks OR days/time, not both. + if ( duration.isDaily() ) { +- d.weeks = value / 7; +- d.days = value % 7; +- d.hours = d.minutes = d.seconds = 0; ++ if ( !( value % 7 ) ) { ++ d.weeks = value / 7; ++ d.days = 0; ++ } else { ++ d.weeks = 0; ++ d.days = value; ++ d.hours = d.minutes = d.seconds = 0; ++ } + } else { +- d.weeks = value / gSecondsPerWeek; +- value %= gSecondsPerWeek; +- d.days = value / gSecondsPerDay; +- value %= gSecondsPerDay; +- d.hours = value / gSecondsPerHour; +- value %= gSecondsPerHour; +- d.minutes = value / gSecondsPerMinute; +- value %= gSecondsPerMinute; +- d.seconds = value; ++ if ( !( value % gSecondsPerWeek ) ) { ++ d.weeks = value / gSecondsPerWeek; ++ d.days = d.hours = d.minutes = d.seconds = 0; ++ } else { ++ d.weeks = 0; ++ d.days = value / gSecondsPerDay; ++ value %= gSecondsPerDay; ++ d.hours = value / gSecondsPerHour; ++ value %= gSecondsPerHour; ++ d.minutes = value / gSecondsPerMinute; ++ value %= gSecondsPerMinute; ++ d.seconds = value; ++ } + } + + return d; +--- kcal/incidenceformatter.cpp ++++ kcal/incidenceformatter.cpp +@@ -1371,10 +1371,10 @@ + { + if ( incidence && incidence->revision() > 0 && ( existingIncidence || !helper->calendar() ) ) { + if ( incBase->type() == "Todo" ) { +- html += "