April 2014 - openSUSE Commits - openSUSE Mailing Lists

commit kfilemetadata for openSUSE:Factory
by root＠hilbert.suse.de 18 Apr '14

18 Apr '14

Hello community, here is the log from the commit of package kfilemetadata for openSUSE:Factory checked in at 2014-04-18 11:35:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kfilemetadata (Old) and /work/SRC/openSUSE:Factory/.kfilemetadata.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kfilemetadata" Changes: -------- --- /work/SRC/openSUSE:Factory/kfilemetadata/kfilemetadata.changes 2014-03-30 08:00:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kfilemetadata.new/kfilemetadata.changes 2014-04-18 12:37:53.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 11 16:43:04 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.0 + * KDE 4.13 release + * See http://www.kde.org/announcements/4.13/ + +------------------------------------------------------------------- Old: ---- kfilemetadata-4.12.97.tar.xz New: ---- kfilemetadata-4.13.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kfilemetadata.spec ++++++ --- /var/tmp/diff_new_pack.cssOkF/_old 2014-04-18 12:37:54.000000000 +0200 +++ /var/tmp/diff_new_pack.cssOkF/_new 2014-04-18 12:37:54.000000000 +0200 @@ -17,7 +17,7 @@ Name: kfilemetadata -Version: 4.12.97 +Version: 4.13.0 Release: 0 Summary: Extract Metadata License: GPL-2.0+ and LGPL-2.1+ and LGPL-3.0 ++++++ kfilemetadata-4.12.97.tar.xz -> kfilemetadata-4.13.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.12.97/src/extractors/kfilemetadata_epubextractor.desktop new/kfilemetadata-4.13.0/src/extractors/kfilemetadata_epubextractor.desktop --- old/kfilemetadata-4.12.97/src/extractors/kfilemetadata_epubextractor.desktop 2014-03-24 05:33:37.000000000 +0100 +++ new/kfilemetadata-4.13.0/src/extractors/kfilemetadata_epubextractor.desktop 2014-04-09 09:58:41.000000000 +0200 @@ -14,6 +14,7 @@ Name[fi]=KFileMetaDatan EPub-lukuohjelma Name[fr]=Extracteur EPub de KFileMetaData Name[hu]=KFileMetaData EPub kibontó +Name[ia]=Extractor de KFileMetaData EPub Name[it]=Estrattore EPub di KFileMetaData Name[ko]=KFileMetaData EPub 추출기 Name[lt]=KFileMetaData EPub ekstraktorius @@ -23,6 +24,7 @@ Name[pl]=Wydobywanie z EPub dla KFileMetaData Name[pt]=Extracção de EPub do KFileMetaData Name[pt_BR]=Extrator de EPub do KFileMetaData +Name[ru]=Модуль извлечения метаданных из файлов EPub Name[sk]=Extraktor KFileMetaData EPub Name[sl]=Program za izvleko EPub za KFileMetaData Name[sr]=Издвајач ЕПУБ‑а (KFileMetaData) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.12.97/src/extractors/kfilemetadata_exiv2extractor.desktop new/kfilemetadata-4.13.0/src/extractors/kfilemetadata_exiv2extractor.desktop --- old/kfilemetadata-4.12.97/src/extractors/kfilemetadata_exiv2extractor.desktop 2014-03-24 05:33:37.000000000 +0100 +++ new/kfilemetadata-4.13.0/src/extractors/kfilemetadata_exiv2extractor.desktop 2014-04-09 09:58:41.000000000 +0200 @@ -14,6 +14,7 @@ Name[fi]=KFileMetaDatan Exiv2-lukuohjelma Name[fr]=Extracteur Exiv2 de KFileMetaData Name[hu]=KFileMetaData Exiv2 kibontó +Name[ia]=Extractor de KFileMetaData Exiv2 Name[it]=Estrattore Exiv2 di KFileMetaData Name[ko]=KFileMetaData Exiv2 추출기 Name[lt]=KFileMetaData Exiv2 ekstraktorius @@ -23,6 +24,7 @@ Name[pl]=Wydobywanie z Exiv2 dla KFileMetaData Name[pt]=Extracção de Exiv2 do KFileMetaData Name[pt_BR]=Extrator de Exiv2 do KFileMetaData +Name[ru]=Модуль извлечения метаданных изображений с помощью Exiv2 Name[sk]=Extraktor KFileMetaData Exiv2 Name[sl]=Program za izvleko Exiv2 za KFileMetaData Name[sr]=Издвајач Ексивом 2 (KFileMetaData) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.12.97/src/extractors/kfilemetadata_ffmpegextractor.desktop new/kfilemetadata-4.13.0/src/extractors/kfilemetadata_ffmpegextractor.desktop --- old/kfilemetadata-4.12.97/src/extractors/kfilemetadata_ffmpegextractor.desktop 2014-03-24 05:33:37.000000000 +0100 +++ new/kfilemetadata-4.13.0/src/extractors/kfilemetadata_ffmpegextractor.desktop 2014-04-09 09:58:41.000000000 +0200 @@ -14,6 +14,7 @@ Name[fi]=KFileMetaDatan FFmpeg-lukuohjelma Name[fr]=Extracteur FFmpeg de KFileMetaData Name[hu]=KFileMetaData FFmpeg kibontó +Name[ia]=Extractor de KFileMetaData FFmpeg Name[it]=Estrattore FFmpeg di KFileMetaData Name[ko]=KFileMetaData FFmpeg 추출기 Name[lt]=KFileMetaData FFmpeg ekstraktorius @@ -23,6 +24,7 @@ Name[pl]=Wydobywanie z FFmpeg dla KFileMetaData Name[pt]=Extracção de FFmpeg do KFileMetaData Name[pt_BR]=Extrator de FFmpeg do KFileMetaData +Name[ru]=Модуль извлечения метаданных видеофайлов с помощью FFmpeg Name[sk]=Extraktor KFileMetaData FFmpeg Name[sl]=Program za izvleko FFmpeg za KFileMetaData Name[sr]=Издвајач ФФмпегом (KFileMetaData) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.12.97/src/extractors/kfilemetadata_mobiextractor.desktop new/kfilemetadata-4.13.0/src/extractors/kfilemetadata_mobiextractor.desktop --- old/kfilemetadata-4.12.97/src/extractors/kfilemetadata_mobiextractor.desktop 2014-03-24 05:33:37.000000000 +0100 +++ new/kfilemetadata-4.13.0/src/extractors/kfilemetadata_mobiextractor.desktop 2014-04-09 09:58:41.000000000 +0200 @@ -14,6 +14,7 @@ Name[fi]=KFileMetaDatan Mobi-lukuohjelma Name[fr]=Extracteur Mobi de KFileMetaData Name[hu]=KFileMetaData Mobi kibontó +Name[ia]=Extractor de KFileMetaData Mobi Name[it]=Estrattore Mobi di KFileMetaData Name[ko]=KFileMetaData Mobi 추출기 Name[lt]=KFileMetaData Mobi ekstraktorius @@ -23,6 +24,7 @@ Name[pl]=Wydobywanie z Mobi dla KFileMetaData Name[pt]=Extracção de Mobi do KFileMetaData Name[pt_BR]=Extrator de Mobi do KFileMetaData +Name[ru]=Модуль извлечения метаданных из файлов Mobi Name[sk]=Extraktor KFileMetaData Mobi Name[sl]=Program za izvleko Mobi za KFileMetaData Name[sr]=Издвајач Мобипокета (KFileMetaData) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.12.97/src/extractors/kfilemetadata_odfextractor.desktop new/kfilemetadata-4.13.0/src/extractors/kfilemetadata_odfextractor.desktop --- old/kfilemetadata-4.12.97/src/extractors/kfilemetadata_odfextractor.desktop 2014-03-24 05:33:37.000000000 +0100 +++ new/kfilemetadata-4.13.0/src/extractors/kfilemetadata_odfextractor.desktop 2014-04-09 09:58:41.000000000 +0200 @@ -14,6 +14,7 @@ Name[fi]=KFileMetaDatan Odf-lukuohjelma Name[fr]=Extracteur Odf de KFileMetaData Name[hu]=KFileMetaData Odf kibontó +Name[ia]=Extractor de KFileMetaData Odf Name[it]=Estrattore Odf di KFileMetaData Name[ko]=KFileMetaData Odf 추출기 Name[lt]=KFileMetaData Odf ekstraktorius @@ -23,6 +24,7 @@ Name[pl]=Wydobywanie z Odf dla KFileMetaData Name[pt]=Extracção de ODF do KFileMetaData Name[pt_BR]=Extrator de ODF do KFileMetaData +Name[ru]=Модуль извлечения метаданных из файлов OpenDocument Format Name[sk]=Extraktor KFileMetaData Odf Name[sl]=Program za izvleko Odf za KFileMetaData Name[sr]=Издвајач ОДФ‑а (KFileMetaData) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.12.97/src/extractors/kfilemetadata_office2007extractor.desktop new/kfilemetadata-4.13.0/src/extractors/kfilemetadata_office2007extractor.desktop --- old/kfilemetadata-4.12.97/src/extractors/kfilemetadata_office2007extractor.desktop 2014-03-24 05:33:37.000000000 +0100 +++ new/kfilemetadata-4.13.0/src/extractors/kfilemetadata_office2007extractor.desktop 2014-04-09 09:58:41.000000000 +0200 @@ -14,6 +14,7 @@ Name[fi]=KFileMetaDatan Office2007-lukuohjelma Name[fr]=Extracteur Office2007 de KFileMetaData Name[hu]=KFileMetaData Office2007 kibontó +Name[ia]=Extractor de KFileMetaData Office2007 Name[it]=Estrattore Office2007 di KFileMetaData Name[ko]=KFileMetaData Office2007 추출기 Name[lt]=KFileMetaData Office2007 ekstraktorius @@ -23,6 +24,7 @@ Name[pl]=Wydobywanie z Office2007 dla KFileMetaData Name[pt]=Extracção de Office2007 do KFileMetaData Name[pt_BR]=Extrator de Office 2007 do KFileMetaData +Name[ru]=Модуль извлечения метаданных из файлов Office2007 Name[sk]=Extraktor KFileMetaData Office2007 Name[sl]=Program za izvleko Office2007 za KFileMetaData Name[sr]=Издвајач МС Офиса 2007 (KFileMetaData) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.12.97/src/extractors/kfilemetadata_officeextractor.desktop new/kfilemetadata-4.13.0/src/extractors/kfilemetadata_officeextractor.desktop --- old/kfilemetadata-4.12.97/src/extractors/kfilemetadata_officeextractor.desktop 2014-03-24 05:33:37.000000000 +0100 +++ new/kfilemetadata-4.13.0/src/extractors/kfilemetadata_officeextractor.desktop 2014-04-09 09:58:41.000000000 +0200 @@ -14,6 +14,7 @@ Name[fi]=KFileMetaDatan Office-lukuohjelma Name[fr]=Extracteur Office de KFileMetaData Name[hu]=KFileMetaData Office kibontó +Name[ia]=Extractor de KFileMetaData Office Name[it]=Estrattore Office di KFileMetaData Name[ko]=KFileMetaData Office 추출기 Name[lt]=KFileMetaData Office ekstraktorius @@ -23,6 +24,7 @@ Name[pl]=Wydobywanie z Office dla KFileMetaData Name[pt]=Extracção de Office do KFileMetaData Name[pt_BR]=Extrator de Office do KFileMetaData +Name[ru]=Модуль извлечения метаданных из файлов Office Name[sk]=Extraktor KFileMetaData Office Name[sl]=Program za izvleko Office za KFileMetaData Name[sr]=Издвајач МС Офиса (KFileMetaData) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.12.97/src/extractors/kfilemetadata_plaintextextractor.desktop new/kfilemetadata-4.13.0/src/extractors/kfilemetadata_plaintextextractor.desktop --- old/kfilemetadata-4.12.97/src/extractors/kfilemetadata_plaintextextractor.desktop 2014-03-24 05:33:37.000000000 +0100 +++ new/kfilemetadata-4.13.0/src/extractors/kfilemetadata_plaintextextractor.desktop 2014-04-09 09:58:41.000000000 +0200 @@ -14,6 +14,7 @@ Name[fi]=KFileMetaDatan muotoilemattoman tekstin lukuohjelma Name[fr]=Extracteur texte brut de KFileMetaData Name[hu]=KFileMetaData egyszerű szöveg kibontó +Name[ia]=Extractor de KFileMetaData Texto Plan Name[it]=Estrattore per testo semplice di KFileMetaData Name[ko]=KFileMetaData 일반 텍스트 추출기 Name[lt]=KFileMetaData Paprastojo teksti ekstraktorius @@ -23,6 +24,7 @@ Name[pl]=Wydobywanie zwykłego tekstu dla KFileMetaData Name[pt]=Extracção de Texto Simples do KFileMetaData Name[pt_BR]=Extrator de Texto Simples do KFileMetaData +Name[ru]=Модуль извлечения метаданных из простых текстовых файлов Name[sk]=Extraktor KFileMetaData Plain Text Name[sl]=Program za izvleko golega besedila za KFileMetaData Name[sr]=Издвајач обичног текста (KFileMetaData) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.12.97/src/extractors/kfilemetadata_popplerextractor.desktop new/kfilemetadata-4.13.0/src/extractors/kfilemetadata_popplerextractor.desktop --- old/kfilemetadata-4.12.97/src/extractors/kfilemetadata_popplerextractor.desktop 2014-03-24 05:33:37.000000000 +0100 +++ new/kfilemetadata-4.13.0/src/extractors/kfilemetadata_popplerextractor.desktop 2014-04-09 09:58:41.000000000 +0200 @@ -14,6 +14,7 @@ Name[fi]=KFileMetaDatan Poppler-lukuohjelma Name[fr]=Extracteur Poppler de KFileMetaData Name[hu]=KFileMetaData Poppler kibontó +Name[ia]=Extractor de KFileMetaData Poppler Name[it]=Estrattore Poppler di KFileMetaData Name[ko]=KFileMetaData Poppler 추출기 Name[lt]=KFileMetaData Poppler ekstraktorius @@ -23,6 +24,7 @@ Name[pl]=Wydobywanie z Poppler dla KFileMetaData Name[pt]=Extracção de Poppler do KFileMetaData Name[pt_BR]=Extrator de Poppler do KFileMetaData +Name[ru]=Модуль извлечения метаданных из файлов PDF с помощью Poppler Name[sk]=Extraktor KFileMetaData Poppler Name[sl]=Program za izvleko Poppler za KFileMetaData Name[sr]=Издвајач Поплером (KFileMetaData) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.12.97/src/extractors/kfilemetadata_taglibextractor.desktop new/kfilemetadata-4.13.0/src/extractors/kfilemetadata_taglibextractor.desktop --- old/kfilemetadata-4.12.97/src/extractors/kfilemetadata_taglibextractor.desktop 2014-03-24 05:33:37.000000000 +0100 +++ new/kfilemetadata-4.13.0/src/extractors/kfilemetadata_taglibextractor.desktop 2014-04-09 09:58:41.000000000 +0200 @@ -14,6 +14,7 @@ Name[fi]=KFileMetaDatan TagLib-lukuohjelma Name[fr]=Extracteur TagLib de KFileMetaData Name[hu]=KFileMetaData TagLib kibontó +Name[ia]=Extractor de KFileMetaData TagLib Name[it]=Estrattore TagLib di KFileMetaData Name[ko]=KFileMetaData TagLib 추출기 Name[lt]=KFileMetaData TagLib ekstraktorius @@ -23,6 +24,7 @@ Name[pl]=Wydobywanie z TagLib dla KFileMetaData Name[pt]=Extracção de TagLib do KFileMetaData Name[pt_BR]=Extrator de TagLib do KFileMetaData +Name[ru]=Модуль извлечения метаданных из аудиофайлов с помощью TagLib Name[sk]=Extraktor KFileMetaData TagLib Name[sl]=Program za izvleko TagLib za KFileMetaData Name[sr]=Издвајач Таглибом (KFileMetaData) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.12.97/src/kfilemetadataextractor.desktop new/kfilemetadata-4.13.0/src/kfilemetadataextractor.desktop --- old/kfilemetadata-4.12.97/src/kfilemetadataextractor.desktop 2014-03-24 05:33:37.000000000 +0100 +++ new/kfilemetadata-4.13.0/src/kfilemetadataextractor.desktop 2014-04-09 09:58:41.000000000 +0200 @@ -13,6 +13,7 @@ Comment[fi]=KFileMetaDatan lukuohjelma Comment[fr]=Extracteur de KFileMetaData Comment[hu]=KFileMetaData kibontó +Comment[ia]=Extractor de KFileMetaData Comment[it]=Estrattore di KFileMetaData Comment[ko]=KFileMetaData 추출기 Comment[lt]=KFileMetaData ekstraktorius @@ -23,6 +24,7 @@ Comment[pl]=Wydobywanie KFileMetaData Comment[pt]=Extracção do KFileMetaData Comment[pt_BR]=Extrator do KFileMetaData +Comment[ru]=Модуль извлечения метаданных из файлов Comment[sk]=Extraktor KFileMetaData Comment[sl]=Program za izvleko za KFileMetaData Comment[sr]=Издвајач на основу KFileMetaData -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit baloo for openSUSE:Factory
by root＠hilbert.suse.de 18 Apr '14

18 Apr '14

Hello community, here is the log from the commit of package baloo for openSUSE:Factory checked in at 2014-04-18 11:35:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/baloo (Old) and /work/SRC/openSUSE:Factory/.baloo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "baloo" Changes: -------- --- /work/SRC/openSUSE:Factory/baloo/baloo.changes 2014-03-30 08:03:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.baloo.new/baloo.changes 2014-04-18 12:37:51.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 11 16:43:12 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.0 + * KDE 4.13 release + * See http://www.kde.org/announcements/4.13/ + +------------------------------------------------------------------- Old: ---- baloo-4.12.97.tar.xz New: ---- baloo-4.13.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ baloo.spec ++++++ --- /var/tmp/diff_new_pack.w9rBSn/_old 2014-04-18 12:37:52.000000000 +0200 +++ /var/tmp/diff_new_pack.w9rBSn/_new 2014-04-18 12:37:52.000000000 +0200 @@ -17,7 +17,7 @@ Name: baloo -Version: 4.12.97 +Version: 4.13.0 Release: 0 Summary: Framework for searching and managing metadata License: GPL-2.0+ and LGPL-2.1+ @@ -40,6 +40,7 @@ Group: System/GUI/KDE Requires: %{name}-kioslaves = %{version} Requires: %{name}-tools = %{version} +Requires: libxapian22 >= 1.2.17 %description core Baloo is a framework for searching and managing metadata. This ++++++ baloo-4.12.97.tar.xz -> baloo-4.13.0.tar.xz ++++++ ++++ 3181 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libbaloowidgets for openSUSE:Factory
by root＠hilbert.suse.de 18 Apr '14

18 Apr '14

Hello community, here is the log from the commit of package libbaloowidgets for openSUSE:Factory checked in at 2014-04-18 11:35:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libbaloowidgets (Old) and /work/SRC/openSUSE:Factory/.libbaloowidgets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libbaloowidgets" Changes: -------- --- /work/SRC/openSUSE:Factory/libbaloowidgets/libbaloowidgets.changes 2014-03-30 08:06:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libbaloowidgets.new/libbaloowidgets.changes 2014-04-18 12:37:48.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 11 16:43:17 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.0 + * KDE 4.13 release + * See http://www.kde.org/announcements/4.13/ + +------------------------------------------------------------------- Old: ---- baloo-widgets-4.12.97.tar.xz New: ---- baloo-widgets-4.13.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libbaloowidgets.spec ++++++ --- /var/tmp/diff_new_pack.bcTpcp/_old 2014-04-18 12:37:50.000000000 +0200 +++ /var/tmp/diff_new_pack.bcTpcp/_new 2014-04-18 12:37:50.000000000 +0200 @@ -19,7 +19,7 @@ %define rname baloo-widgets Name: libbaloowidgets -Version: 4.12.97 +Version: 4.13.0 Release: 0 Summary: Framework for searching and managing metadata License: GPL-2.0+ and LGPL-2.1+ ++++++ baloo-widgets-4.12.97.tar.xz -> baloo-widgets-4.13.0.tar.xz ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kactivities4 for openSUSE:Factory
by root＠hilbert.suse.de 18 Apr '14

18 Apr '14

Hello community, here is the log from the commit of package kactivities4 for openSUSE:Factory checked in at 2014-04-18 11:35:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kactivities4 (Old) and /work/SRC/openSUSE:Factory/.kactivities4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kactivities4" Changes: -------- --- /work/SRC/openSUSE:Factory/kactivities4/kactivities4.changes 2014-03-30 08:09:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kactivities4.new/kactivities4.changes 2014-04-18 12:37:46.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 11 16:43:23 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.0 + * KDE 4.13 release + * See http://www.kde.org/announcements/4.13/ + +------------------------------------------------------------------- Old: ---- kactivities-4.12.97.tar.xz New: ---- kactivities-4.13.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kactivities4.spec ++++++ --- /var/tmp/diff_new_pack.c54qiB/_old 2014-04-18 12:37:48.000000000 +0200 +++ /var/tmp/diff_new_pack.c54qiB/_new 2014-04-18 12:37:48.000000000 +0200 @@ -18,7 +18,7 @@ Name: kactivities4 -Version: 4.12.97 +Version: 4.13.0 Release: 0 Summary: KDE Plasma Activities support License: GPL-2.0+ and LGPL-2.1+ ++++++ kactivities-4.12.97.tar.xz -> kactivities-4.13.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-4.12.97/src/lib/core/manager_p.cpp new/kactivities-4.13.0/src/lib/core/manager_p.cpp --- old/kactivities-4.12.97/src/lib/core/manager_p.cpp 2014-03-04 06:57:58.000000000 +0100 +++ new/kactivities-4.13.0/src/lib/core/manager_p.cpp 2014-04-04 19:38:42.000000000 +0200 @@ -79,6 +79,7 @@ int ret = KToolInvocation::startServiceByDesktopPath("kactivitymanagerd.desktop", QStringList(), &error); if (ret > 0) { qDebug() << "Activity: Couldn't start kactivitymanagerd: " << error << endl; + QProcess::startDetached("kactivitymanagerd"); } if (!KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(ACTIVITY_MANAGER_DBUS_PATH)) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit analitza for openSUSE:Factory
by root＠hilbert.suse.de 18 Apr '14

18 Apr '14

Hello community, here is the log from the commit of package analitza for openSUSE:Factory checked in at 2014-04-18 11:35:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/analitza (Old) and /work/SRC/openSUSE:Factory/.analitza.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "analitza" Changes: -------- --- /work/SRC/openSUSE:Factory/analitza/analitza.changes 2014-03-30 08:13:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.analitza.new/analitza.changes 2014-04-18 12:37:45.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 11 16:43:29 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.0 + * KDE 4.13 release + * See http://www.kde.org/announcements/4.13/ + +------------------------------------------------------------------- Old: ---- analitza-4.12.97.tar.xz New: ---- analitza-4.13.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ analitza.spec ++++++ --- /var/tmp/diff_new_pack.Oi0YBf/_old 2014-04-18 12:37:46.000000000 +0200 +++ /var/tmp/diff_new_pack.Oi0YBf/_new 2014-04-18 12:37:46.000000000 +0200 @@ -17,7 +17,7 @@ Name: analitza -Version: 4.12.97 +Version: 4.13.0 Release: 0 Summary: A library to add mathematical features to programs License: LGPL-2.1+ ++++++ analitza-4.12.97.tar.xz -> analitza-4.13.0.tar.xz ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepimlibs4 for openSUSE:Factory
by root＠hilbert.suse.de 18 Apr '14

18 Apr '14

Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at 2014-04-18 11:35:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepimlibs4 (Old) and /work/SRC/openSUSE:Factory/.kdepimlibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepimlibs4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepimlibs4/kdepimlibs4.changes 2014-03-30 08:17:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepimlibs4.new/kdepimlibs4.changes 2014-04-18 12:37:41.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 11 16:43:37 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.0 + * KDE 4.13 release + * See http://www.kde.org/announcements/4.13/ + +------------------------------------------------------------------- Old: ---- kdepimlibs-4.12.97.tar.xz New: ---- kdepimlibs-4.13.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.j5amgi/_old 2014-04-18 12:37:42.000000000 +0200 +++ /var/tmp/diff_new_pack.j5amgi/_new 2014-04-18 12:37:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdepimlibs4 -Version: 4.12.97 +Version: 4.13.0 Release: 0 Summary: KDE PIM Libraries License: LGPL-2.1+ ++++++ kdepimlibs-4.12.97.tar.xz -> kdepimlibs-4.13.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/CMakeLists.txt new/kdepimlibs-4.13.0/CMakeLists.txt --- old/kdepimlibs-4.12.97/CMakeLists.txt 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/CMakeLists.txt 2014-04-09 12:18:48.000000000 +0200 @@ -6,8 +6,8 @@ ############### The kdepimlibs version (used e.g. in KdepimLibsConfig.cmake) ############### set(KDEPIMLIBS_VERSION_MAJOR 4) -set(KDEPIMLIBS_VERSION_MINOR 12) -set(KDEPIMLIBS_VERSION_PATCH 97) +set(KDEPIMLIBS_VERSION_MINOR 13) +set(KDEPIMLIBS_VERSION_PATCH 0) set(KDEPIMLIBS_VERSION ${KDEPIMLIBS_VERSION_MAJOR}.${KDEPIMLIBS_VERSION_MINOR}.${KDEPIMLIBS_VERSION_PATCH}) @@ -79,7 +79,7 @@ if (NOT KDEPIM_ONLY_KLEO) #FindAkonadi.cmake is only there for compatibility reasons, but we don't want to use that. - set(Akonadi_MIN_VERSION "1.11.80") + set(Akonadi_MIN_VERSION "1.12.1") find_package(Akonadi ${Akonadi_MIN_VERSION} QUIET NO_MODULE) set_package_properties(Akonadi PROPERTIES DESCRIPTION "Akonadi server libraries" URL "http://pim.kde.org/akonadi" TYPE REQUIRED PURPOSE "Access to PIM storage and services") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/collectionfetchjob.cpp new/kdepimlibs-4.13.0/akonadi/collectionfetchjob.cpp --- old/kdepimlibs-4.12.97/akonadi/collectionfetchjob.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/collectionfetchjob.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -51,7 +51,6 @@ mEmitTimer->setSingleShot( true ); mEmitTimer->setInterval( 100 ); q_ptr->connect( mEmitTimer, SIGNAL(timeout()), q_ptr, SLOT(timeout()) ); - q_ptr->connect( q_ptr, SIGNAL(result(KJob*)), q_ptr, SLOT(timeout()) ); } Q_DECLARE_PUBLIC( CollectionFetchJob ) @@ -66,6 +65,11 @@ bool mBasePrefetch; Collection::List mPrefetchList; + void aboutToFinish() + { + timeout(); + } + void timeout() { Q_Q( CollectionFetchJob ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/collectionrequester.cpp new/kdepimlibs-4.13.0/akonadi/collectionrequester.cpp --- old/kdepimlibs-4.12.97/akonadi/collectionrequester.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/collectionrequester.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -49,12 +49,14 @@ { } - QString fetchCollection(const Collection &collection); + void fetchCollection(const Collection &collection); void init(); // slots void _k_slotOpenDialog(); + void _k_collectionReceived( KJob *job ); + void _k_collectionsNamesReceived( KJob *job ); CollectionRequester *q; Collection collection; @@ -63,25 +65,53 @@ CollectionDialog *collectionDialog; }; -QString CollectionRequester::Private::fetchCollection(const Collection &collection) +void CollectionRequester::Private::fetchCollection(const Collection &collection) { - QString result; - Akonadi::CollectionFetchJob *job = new Akonadi::CollectionFetchJob( collection, Akonadi::CollectionFetchJob::Base, q ); - job->fetchScope().setAncestorRetrieval( Akonadi::CollectionFetchScope::Parent ); - if (job->exec()) { - if (job->collections().size() == 1) { - Akonadi::Collection col = job->collections().at(0); - if (col != Akonadi::Collection::root()) { - const QString tmp = fetchCollection(Akonadi::Collection(col.parent())); - if (tmp.isEmpty()) { - result = col.displayName(); - } else { - result = fetchCollection(Akonadi::Collection(col.parent())) + QLatin1Char('/') + col.displayName(); - } - } - } + Akonadi::CollectionFetchJob *job = new Akonadi::CollectionFetchJob( collection, Akonadi::CollectionFetchJob::Base, q ); + job->setProperty( "OriginalCollectionId", collection.id() ); + job->fetchScope().setAncestorRetrieval( CollectionFetchScope::All ); + connect( job, SIGNAL(finished(KJob*)), + q, SLOT(_k_collectionReceived(KJob*)) ); +} + +void CollectionRequester::Private::_k_collectionReceived( KJob *job ) +{ + CollectionFetchJob *fetch = qobject_cast<CollectionFetchJob*>( job ); + Collection::List chain; + if ( fetch->collections().size() == 1 ) { + Collection currentCollection = fetch->collections().first(); + while ( currentCollection.isValid() ) { + chain << currentCollection; + currentCollection = Collection( currentCollection.parentCollection() ); } - return result; + + CollectionFetchJob *namesFetch = new CollectionFetchJob( chain, CollectionFetchJob::Base, q ); + namesFetch->setProperty( "OriginalCollectionId", job->property( "OriginalCollectionId" ) ); + namesFetch->fetchScope().setAncestorRetrieval( CollectionFetchScope::Parent ); + connect( namesFetch, SIGNAL(finished(KJob*)), + q, SLOT(_k_collectionsNamesReceived(KJob *)) ); + } else { + _k_collectionsNamesReceived( job ); + } +} + +void CollectionRequester::Private::_k_collectionsNamesReceived( KJob *job ) +{ + CollectionFetchJob *fetch = qobject_cast<CollectionFetchJob*>( job ); + const qint64 originalId = fetch->property( "OriginalCollectionId" ).toLongLong(); + + QMap<qint64, Collection> names; + Q_FOREACH ( const Collection &collection, fetch->collections() ) { + names.insert( collection.id(), collection ); + } + + QStringList namesList; + Collection currentCollection = names.take( originalId ); + while ( currentCollection.isValid() ) { + namesList.prepend( currentCollection.displayName() ); + currentCollection = names.take( currentCollection.parent() ); + } + edit->setText( namesList.join( QLatin1String( "/" ) ) ); } void CollectionRequester::Private::init() @@ -167,8 +197,8 @@ d->edit->setText( name ); emit collectionChanged( collection ); - const QString result = d->fetchCollection(collection); - d->edit->setText( result ); + d->edit->setText( collection.displayName() ); + d->fetchCollection( collection ); } void CollectionRequester::setMimeTypeFilter( const QStringList &mimeTypes ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/collectionrequester.h new/kdepimlibs-4.13.0/akonadi/collectionrequester.h --- old/kdepimlibs-4.12.97/akonadi/collectionrequester.h 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/collectionrequester.h 2014-04-09 12:18:48.000000000 +0200 @@ -136,6 +136,8 @@ Private * const d; Q_PRIVATE_SLOT( d, void _k_slotOpenDialog() ) + Q_PRIVATE_SLOT( d, void _k_collectionReceived( KJob *job ) ) + Q_PRIVATE_SLOT( d, void _k_collectionsNamesReceived( KJob *job ) ); }; } // namespace Akonadi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/collectionsync.cpp new/kdepimlibs-4.13.0/akonadi/collectionsync.cpp --- old/kdepimlibs-4.12.97/akonadi/collectionsync.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/collectionsync.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -643,7 +643,7 @@ void execute() { kDebug() << Q_FUNC_INFO << "localListDone: " << localListDone << " deliveryDone: " << deliveryDone; - if ( !localListDone ) { + if ( !localListDone || !deliveryDone ) { return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/entityannotationsattribute.h new/kdepimlibs-4.13.0/akonadi/entityannotationsattribute.h --- old/kdepimlibs-4.12.97/akonadi/entityannotationsattribute.h 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/entityannotationsattribute.h 2014-04-09 12:18:48.000000000 +0200 @@ -34,7 +34,7 @@ * The attribute is inspired by RFC5257(IMAP ANNOTATION) and RFC5464(IMAP METADATA), but serves * the purpose of RFC5257. * - * For a private note annoation the entry name is: + * For a private note annotation the entry name is: * /private/comment * for a shared note: * /shared/comment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/entitytreemodel_p.cpp new/kdepimlibs-4.13.0/akonadi/entitytreemodel_p.cpp --- old/kdepimlibs-4.12.97/akonadi/entitytreemodel_p.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/entitytreemodel_p.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -182,7 +182,6 @@ itemJob->setFetchScope( scope ); itemJob->fetchScope().setAncestorRetrieval( ItemFetchScope::All ); itemJob->fetchScope().setIgnoreRetrievalErrors( true ); - itemJob->setDeliveryOption( ItemFetchJob::EmitItemsInBatches ); return itemJob; } @@ -1137,7 +1136,10 @@ return; } - m_items[ item.id() ].apply( item ); + //otherwise this overwrites the copy of the real collection with one of the virtual collectoin + if (!item.parentCollection().isVirtual()) { + m_items[ item.id() ].apply( item ); + } const QModelIndexList indexes = indexesForItem( item ); foreach ( const QModelIndex &index, indexes ) { @@ -1698,6 +1700,9 @@ end = childEntities.end(); } m_populatedCols.remove(id); + //if an empty collection is purged and we leave it in here, itemAdded will be ignored for the collection + //and the collection is never populated by fetchMore (but maybe by statistics changed?) + m_collectionsWithoutItems.remove(id); } void EntityTreeModelPrivate::dataChanged( const QModelIndex &top, const QModelIndex &bottom ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/itemfetchjob.cpp new/kdepimlibs-4.13.0/akonadi/itemfetchjob.cpp --- old/kdepimlibs-4.12.97/akonadi/itemfetchjob.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/itemfetchjob.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -61,14 +61,18 @@ mEmitTimer->setSingleShot( true ); mEmitTimer->setInterval( 100 ); q->connect( mEmitTimer, SIGNAL(timeout()), q, SLOT(timeout()) ); - q->connect( q, SIGNAL(result(KJob*)), q, SLOT(timeout()) ); + } + + void aboutToFinish() + { + timeout(); } void timeout() { Q_Q( ItemFetchJob ); - mEmitTimer->stop(); // in case we are called by result() + mEmitTimer->stop(); // in case we are called by aboutToFinish() if ( !mPendingItems.isEmpty() ) { if ( !q->error() ) emit q->itemsReceived( mPendingItems ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/itemfetchscope.cpp new/kdepimlibs-4.13.0/akonadi/itemfetchscope.cpp --- old/kdepimlibs-4.12.97/akonadi/itemfetchscope.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/itemfetchscope.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -95,7 +95,7 @@ bool ItemFetchScope::isEmpty() const { - return d->mPayloadParts.isEmpty() && d->mAttributes.isEmpty() && !d->mFullPayload && !d->mAllAttributes; + return d->mPayloadParts.isEmpty() && d->mAttributes.isEmpty() && !d->mFullPayload && !d->mAllAttributes && !d->mFetchTags; } bool ItemFetchScope::cacheOnly() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/itemsearchjob.cpp new/kdepimlibs-4.13.0/akonadi/itemsearchjob.cpp --- old/kdepimlibs-4.12.97/akonadi/itemsearchjob.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/itemsearchjob.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -34,7 +34,7 @@ { public: ItemSearchJobPrivate( ItemSearchJob *parent, const SearchQuery &query ) - : JobPrivate( parent ), mQuery( query ), mRecursive( false ), mRemote( true ), mEmitTimer( 0 ) + : JobPrivate( parent ), mQuery( query ), mRecursive( false ), mRemote( false ), mEmitTimer( 0 ) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/itemsearchjob.h new/kdepimlibs-4.13.0/akonadi/itemsearchjob.h --- old/kdepimlibs-4.12.97/akonadi/itemsearchjob.h 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/itemsearchjob.h 2014-04-09 12:18:48.000000000 +0200 @@ -223,7 +223,7 @@ * be searched. With remote search, even those emails can be included in search * results. * - * This feature is enabled by default. + * This feature is disabled by default. * * Results are streamed back to client as they are received from queried sources, * so this job can take some time to finish, but will deliver initial results diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/itemsync.cpp new/kdepimlibs-4.13.0/akonadi/itemsync.cpp --- old/kdepimlibs-4.12.97/akonadi/itemsync.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/itemsync.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -20,6 +20,7 @@ #include "itemsync.h" +#include "job_p.h" #include "collection.h" #include "item.h" #include "item_p.h" @@ -39,12 +40,12 @@ /** * @internal */ -class ItemSync::Private +class Akonadi::ItemSyncPrivate : public JobPrivate { public: - Private( ItemSync *parent ) : - q( parent ), - mTransactionMode( SingleTransaction ), + ItemSyncPrivate( ItemSync *parent ) : + JobPrivate( parent ), + mTransactionMode( ItemSync::SingleTransaction ), mCurrentTransaction( 0 ), mTransactionJobs( 0 ), mPendingJobs( 0 ), @@ -72,8 +73,9 @@ void deleteItems( const Item::List &items ); void slotTransactionResult( KJob *job ); Job* subjobParent() const; + QString jobDebuggingString() const /*Q_DECL_OVERRIDE*/; - ItemSync *q; + Q_DECLARE_PUBLIC( ItemSync ) Collection mSyncCollection; QHash<Item::Id, Akonadi::Item> mLocalItemsById; QHash<QString, Akonadi::Item> mLocalItemsByRemoteId; @@ -105,8 +107,9 @@ bool mFinished; }; -void ItemSync::Private::createLocalItem( const Item & item ) +void ItemSyncPrivate::createLocalItem( const Item & item ) { + Q_Q( ItemSync ); // don't try to do anything in error state if ( q->error() ) return; @@ -115,8 +118,9 @@ q->connect( create, SIGNAL(result(KJob*)), q, SLOT(slotLocalChangeDone(KJob*)) ); } -void ItemSync::Private::checkDone() +void ItemSyncPrivate::checkDone() { + Q_Q( ItemSync ); q->setProcessedAmount( KJob::Bytes, mProgress ); if ( mPendingJobs > 0 || !mDeliveryDone || mTransactionJobs > 0 ) return; @@ -128,19 +132,19 @@ } ItemSync::ItemSync( const Collection &collection, QObject *parent ) : - Job( parent ), - d( new Private( this ) ) + Job( new ItemSyncPrivate( this ), parent ) { + Q_D( ItemSync ); d->mSyncCollection = collection; } ItemSync::~ItemSync() { - delete d; } void ItemSync::setFullSyncItems( const Item::List &items ) { + Q_D( ItemSync ); Q_ASSERT( !d->mIncremental ); if ( !d->mStreaming ) d->mDeliveryDone = true; @@ -155,6 +159,7 @@ void ItemSync::setTotalItems( int amount ) { + Q_D( ItemSync ); Q_ASSERT( !d->mIncremental ); Q_ASSERT( amount >= 0 ); setStreamingEnabled( true ); @@ -169,6 +174,7 @@ void ItemSync::setIncrementalSyncItems( const Item::List &changedItems, const Item::List &removedItems ) { + Q_D( ItemSync ); d->mIncremental = true; if ( !d->mStreaming ) d->mDeliveryDone = true; @@ -183,16 +189,19 @@ void ItemSync::setFetchScope( ItemFetchScope &fetchScope ) { + Q_D( ItemSync ); d->mFetchScope = fetchScope; } ItemFetchScope &ItemSync::fetchScope() { + Q_D( ItemSync ); return d->mFetchScope; } void ItemSync::doStart() { + Q_D( ItemSync ); ItemFetchJob* job = new ItemFetchJob( d->mSyncCollection, this ); job->setFetchScope( d->mFetchScope ); @@ -204,6 +213,7 @@ bool ItemSync::updateItem( const Item &storedItem, Item &newItem ) { + Q_D( ItemSync ); // we are in error state, better not change anything at all anymore if ( error() ) return false; @@ -254,7 +264,7 @@ return false; } -void ItemSync::Private::slotLocalListDone( KJob * job ) +void ItemSyncPrivate::slotLocalListDone( KJob * job ) { if ( !job->error() ) { const Item::List list = static_cast<ItemFetchJob*>( job )->items(); @@ -271,8 +281,16 @@ execute(); } -void ItemSync::Private::execute() +QString ItemSyncPrivate::jobDebuggingString() const /*Q_DECL_OVERRIDE*/ { + // TODO: also print out mIncremental and mTotalItemsProcessed, but they are set after the job + // started, so this requires passing jobDebuggingString to jobEnded(). + return QString::fromLatin1("Collection %1 (%2)").arg( mSyncCollection.id() ).arg( mSyncCollection.name() ); +} + +void ItemSyncPrivate::execute() +{ + Q_Q( ItemSync ); if ( !mLocalListDone ) return; @@ -281,16 +299,16 @@ if ( !mDeliveryDone && mRemoteItems.isEmpty() ) return; - if ( (mTransactionMode == SingleTransaction && !mCurrentTransaction) || mTransactionMode == MultipleTransactions) { + if ( (mTransactionMode == ItemSync::SingleTransaction && !mCurrentTransaction) || mTransactionMode == ItemSync::MultipleTransactions) { ++mTransactionJobs; mCurrentTransaction = new TransactionSequence( q ); mCurrentTransaction->setAutomaticCommittingEnabled( false ); - connect( mCurrentTransaction, SIGNAL(result(KJob*)), q, SLOT(slotTransactionResult(KJob*)) ); + QObject::connect( mCurrentTransaction, SIGNAL(result(KJob*)), q, SLOT(slotTransactionResult(KJob*)) ); } processItems(); if ( !mDeliveryDone ) { - if ( mTransactionMode == MultipleTransactions && mCurrentTransaction ) { + if ( mTransactionMode == ItemSync::MultipleTransactions && mCurrentTransaction ) { mCurrentTransaction->commit(); mCurrentTransaction = 0; } @@ -316,8 +334,9 @@ checkDone(); } -void ItemSync::Private::processItems() +void ItemSyncPrivate::processItems() { + Q_Q( ItemSync ); // added / updated foreach ( Item remoteItem, mRemoteItems ) { //krazy:exclude=foreach non-const is needed here #ifndef NDEBUG @@ -353,8 +372,9 @@ mRemoteItems.clear(); } -void ItemSync::Private::deleteItems( const Item::List &items ) +void ItemSyncPrivate::deleteItems( const Item::List &items ) { + Q_Q( ItemSync ); // if in error state, better not change anything anymore if ( q->error() ) return; @@ -398,7 +418,7 @@ } } -void ItemSync::Private::slotLocalDeleteDone( KJob* ) +void ItemSyncPrivate::slotLocalDeleteDone( KJob* ) { mPendingJobs--; mProgress++; @@ -406,7 +426,7 @@ checkDone(); } -void ItemSync::Private::slotLocalChangeDone( KJob * job ) +void ItemSyncPrivate::slotLocalChangeDone( KJob * job ) { Q_UNUSED( job ); mPendingJobs--; @@ -415,7 +435,7 @@ checkDone(); } -void ItemSync::Private::slotTransactionResult( KJob *job ) +void ItemSyncPrivate::slotTransactionResult( KJob *job ) { --mTransactionJobs; if ( mCurrentTransaction == job ) @@ -424,20 +444,23 @@ checkDone(); } -Job * ItemSync::Private::subjobParent() const +Job * ItemSyncPrivate::subjobParent() const { - if ( mCurrentTransaction && mTransactionMode != NoTransaction ) + Q_Q( const ItemSync ); + if ( mCurrentTransaction && mTransactionMode != ItemSync::NoTransaction ) return mCurrentTransaction; - return q; + return const_cast<ItemSync *>( q ); } void ItemSync::setStreamingEnabled(bool enable) { + Q_D( ItemSync ); d->mStreaming = enable; } void ItemSync::deliveryDone() { + Q_D( ItemSync ); Q_ASSERT( d->mStreaming ); d->mDeliveryDone = true; d->execute(); @@ -460,6 +483,7 @@ void ItemSync::rollback() { + Q_D( ItemSync ); setError( UserCanceled ); if ( d->mCurrentTransaction ) d->mCurrentTransaction->rollback(); @@ -469,6 +493,7 @@ void ItemSync::setTransactionMode(ItemSync::TransactionMode mode) { + Q_D( ItemSync ); d->mTransactionMode = mode; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/itemsync.h new/kdepimlibs-4.13.0/akonadi/itemsync.h --- old/kdepimlibs-4.12.97/akonadi/itemsync.h 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/itemsync.h 2014-04-09 12:18:48.000000000 +0200 @@ -29,6 +29,7 @@ class Collection; class ItemFetchScope; +class ItemSyncPrivate; /** * @short Syncs between items known to a client (usually a resource) and the Akonadi storage. @@ -184,13 +185,13 @@ private: //@cond PRIVATE - class Private; - Private* const d; + Q_DECLARE_PRIVATE( ItemSync ) + ItemSyncPrivate * dummy; // for BC. KF5 TODO: REMOVE. - Q_PRIVATE_SLOT( d, void slotLocalListDone( KJob* ) ) - Q_PRIVATE_SLOT( d, void slotLocalDeleteDone( KJob* ) ) - Q_PRIVATE_SLOT( d, void slotLocalChangeDone( KJob* ) ) - Q_PRIVATE_SLOT( d, void slotTransactionResult( KJob* ) ) + Q_PRIVATE_SLOT( d_func(), void slotLocalListDone( KJob* ) ) + Q_PRIVATE_SLOT( d_func(), void slotLocalDeleteDone( KJob* ) ) + Q_PRIVATE_SLOT( d_func(), void slotLocalChangeDone( KJob* ) ) + Q_PRIVATE_SLOT( d_func(), void slotTransactionResult( KJob* ) ) //@endcond }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/job.cpp new/kdepimlibs-4.13.0/akonadi/job.cpp --- old/kdepimlibs-4.12.97/akonadi/job.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/job.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -149,9 +149,15 @@ } } +void JobPrivate::aboutToFinish() +{ + // Dummy +} + void JobPrivate::delayedEmitResult() { Q_Q( Job ); + aboutToFinish(); q->emitResult(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/job_p.h new/kdepimlibs-4.13.0/akonadi/job_p.h --- old/kdepimlibs-4.12.97/akonadi/job_p.h 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/job_p.h 2014-04-09 12:18:48.000000000 +0200 @@ -93,6 +93,15 @@ */ virtual void doUpdateItemRevision( Akonadi::Item::Id, int oldRevision, int newRevision ); + /** + * This method is called right before result() and finished() signals are emitted. + * Overwrite this method in your job if you need to emit some signals or process + * some data before the job finishes. + * + * Default implementation does nothing. + */ + virtual void aboutToFinish(); + int protocolVersion() const; Job *q_ptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/searchcreatejob.cpp new/kdepimlibs-4.13.0/akonadi/searchcreatejob.cpp --- old/kdepimlibs-4.12.97/akonadi/searchcreatejob.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/searchcreatejob.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -38,7 +38,7 @@ , mName( name ) , mQuery( query ) , mRecursive( false ) - , mRemote( true ) + , mRemote( false ) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/searchcreatejob.h new/kdepimlibs-4.13.0/akonadi/searchcreatejob.h --- old/kdepimlibs-4.12.97/akonadi/searchcreatejob.h 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/searchcreatejob.h 2014-04-09 12:18:48.000000000 +0200 @@ -141,7 +141,7 @@ * be searched. With remote search, even those emails can be included in search * results. * - * This feature is enabled by default. + * This feature is disabled by default. * * @param enabled Whether remote search is enabled * @since 4.13 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/servermanager.cpp new/kdepimlibs-4.13.0/akonadi/servermanager.cpp --- old/kdepimlibs-4.12.97/akonadi/servermanager.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/servermanager.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -66,8 +66,19 @@ delete instance; } - void serviceOwnerChanged( const QString&, const QString&, const QString& ) + void serviceOwnerChanged( const QString &name, const QString &oldOwner, const QString &newOwner ) { + if ( name == ServerManager::serviceName( ServerManager::ControlLock ) && !oldOwner.isEmpty() && newOwner.isEmpty() ) { + // Control.Lock has disappeared during startup, which means that akonadi_control + // has terminated, most probably because it was not able to start akonadiserver + // process. Don't wait 30 seconds for sefetyTimeout, but go into Broken state + // immediately. + if ( mState == ServerManager::Starting ) { + setState( ServerManager::Broken ); + return; + } + } + serverProtocolVersion = -1, checkStatusChanged(); } @@ -129,6 +140,7 @@ DBusConnectionPool::threadConnection(), QDBusServiceWatcher::WatchForOwnerChange, this ); watcher->addWatchedService( ServerManager::serviceName( ServerManager::Control ) ); + watcher->addWatchedService( ServerManager::serviceName( ServerManager::ControlLock ) ); watcher->addWatchedService( ServerManager::serviceName( ServerManager::UpgradeIndicator ) ); // this (and also the two connects below) are queued so that they trigger after AgentManager is done loading diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/session.cpp new/kdepimlibs-4.13.0/akonadi/session.cpp --- old/kdepimlibs-4.12.97/akonadi/session.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/session.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -358,8 +358,16 @@ void SessionPrivate::serverStateChanged( ServerManager::State state ) { - if ( state == ServerManager::Running && !connected ) + if ( state == ServerManager::Running && !connected ) { reconnect(); + } else if ( !connected && state == ServerManager::Broken ) { + // If the server is broken, cancel all pending jobs, otherwise they will be + // blocked forever and applications waiting for them to finish would be stuck + Q_FOREACH ( Job *job, queue ) { + job->setError( Job::ConnectionFailed ); + job->kill( KJob::EmitResult ); + } + } } void SessionPrivate::itemRevisionChanged( Akonadi::Item::Id itemId, int oldRevision, int newRevision ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/tagfetchjob.cpp new/kdepimlibs-4.13.0/akonadi/tagfetchjob.cpp --- old/kdepimlibs-4.12.97/akonadi/tagfetchjob.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/tagfetchjob.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -44,7 +44,11 @@ mEmitTimer->setSingleShot(true); mEmitTimer->setInterval(100); q->connect(mEmitTimer, SIGNAL(timeout()), q, SLOT(timeout())); - q->connect(q, SIGNAL(result(KJob*)), q, SLOT(timeout())); + } + + void aboutToFinish() + { + timeout(); } void timeout() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/tests/CMakeLists.txt new/kdepimlibs-4.13.0/akonadi/tests/CMakeLists.txt --- old/kdepimlibs-4.12.97/akonadi/tests/CMakeLists.txt 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/tests/CMakeLists.txt 2014-04-09 12:18:48.000000000 +0200 @@ -137,7 +137,9 @@ add_akonadi_isolated_test(itemsynctest.cpp) add_akonadi_isolated_test(linktest.cpp) add_akonadi_isolated_test(cachetest.cpp) -add_akonadi_isolated_test(servermanagertest.cpp) +# starting/stopping the server in the testenvironment doesn't seem to work, +# and the test is not very critical (we'll notice if we can't start the server), so we disable it for now. +# add_akonadi_isolated_test(servermanagertest.cpp) add_akonadi_isolated_test(collectioncreator.cpp) add_akonadi_isolated_test(itembenchmark.cpp) add_akonadi_isolated_test(gidtest.cpp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/tests/collectionsynctest.cpp new/kdepimlibs-4.13.0/akonadi/tests/collectionsynctest.cpp --- old/kdepimlibs-4.12.97/akonadi/tests/collectionsynctest.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/tests/collectionsynctest.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -127,7 +127,7 @@ QCOMPARE( spy.count(), 0 ); } syncer->retrievalDone(); - QTest::qWait( 1000 ); // let it finish its job + QTRY_COMPARE( spy.count(), 1 ); QCOMPARE( spy.count(), 1 ); KJob *job = spy.at( 0 ).at( 0 ).value<KJob*>(); QCOMPARE( job, syncer ); @@ -219,8 +219,7 @@ QCOMPARE( spy.count(), 0 ); } syncer->retrievalDone(); - QTest::qWait( 1000 ); // let it finish its job - QCOMPARE( spy.count(), 1 ); + QTRY_COMPARE(spy.count(), 1); KJob *job = spy.at( 0 ).at( 0 ).value<KJob*>(); QCOMPARE( job, syncer ); QCOMPARE( job->errorText(), QString() ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/tests/entitycachetest.cpp new/kdepimlibs-4.13.0/akonadi/tests/entitycachetest.cpp --- old/kdepimlibs-4.12.97/akonadi/tests/entitycachetest.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/tests/entitycachetest.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -48,8 +48,7 @@ QVERIFY( cache.isRequested( 1 ) ); QVERIFY( !cache.retrieve( 1 ).isValid() ); - QTest::qWait( 1000 ); - QCOMPARE( spy.count(), 1 ); + QTRY_COMPARE( spy.count(), 1 ); QVERIFY( cache.isCached( 1 ) ); QVERIFY( cache.isRequested( 1 ) ); const T e1 = cache.retrieve( 1 ); @@ -68,8 +67,7 @@ cache.invalidate( 2 ); - QTest::qWait( 1000 ); - QCOMPARE( spy.count(), 2 ); + QTRY_COMPARE( spy.count(), 2 ); QVERIFY( cache.isCached( 2 ) ); QVERIFY( cache.isCached( 3 ) ); @@ -99,8 +97,7 @@ QVERIFY( !cache.isCached( 3 ) ); QVERIFY( cache.isRequested( 3 ) ); - QTest::qWait( 1000 ); - QCOMPARE( spy.count(), 3 ); + QTRY_COMPARE( spy.count(), 3 ); QVERIFY( cache.isCached( 3 ) ); QVERIFY( cache.retrieve( 3 ).isValid() ); } @@ -143,8 +140,7 @@ scope.fetchFullPayload( true ); cache.request( 1, scope ); - QTest::qWait( 1000 ); - QCOMPARE( spy.count(), 1 ); + QTRY_COMPARE( spy.count(), 1 ); QVERIFY( cache.isCached( 1 ) ); QVERIFY( cache.isRequested( 1 ) ); const Item item = cache.retrieve( 1 ); @@ -161,13 +157,11 @@ QVERIFY( spy.isValid() ); cache.request( QList<Entity::Id>() << 1 << 2 << 3, scope ); - QTest::qWait( 1000 ); - QCOMPARE( spy.count(), 1 ); + QTRY_COMPARE( spy.count(), 1 ); QVERIFY( cache.isCached( QList<Entity::Id>() << 1 << 2 << 3 ) ); cache.ensureCached( QList<Entity::Id>() << 1 << 2 << 3 << 4, scope ); - QTest::qWait( 1000 ); - QCOMPARE( spy.count(), 2 ); + QTRY_COMPARE( spy.count(), 2 ); QVERIFY( cache.isCached( QList<Entity::Id>() << 1 << 2 << 3 << 4 ) ); } }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/tests/itemappendtest.cpp new/kdepimlibs-4.13.0/akonadi/tests/itemappendtest.cpp --- old/kdepimlibs-4.12.97/akonadi/tests/itemappendtest.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/tests/itemappendtest.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -134,8 +134,11 @@ AKVERIFYEXEC( fjob ); QCOMPARE( fjob->items().count(), 1 ); Item item2 = fjob->items().first(); - QVERIFY( item2.hasPayload() ); - QCOMPARE( item2.payload<QByteArray>(), data ); + //akonadi does not distinguish empty and no payload + QCOMPARE( item2.hasPayload(), !data.isEmpty() ); + if( item2.hasPayload() ) { + QCOMPARE( item2.payload<QByteArray>(), data ); + } ItemDeleteJob *djob = new ItemDeleteJob( ref, this ); AKVERIFYEXEC( djob ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/tests/itemsynctest.cpp new/kdepimlibs-4.13.0/akonadi/tests/itemsynctest.cpp --- old/kdepimlibs-4.12.97/akonadi/tests/itemsynctest.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/tests/itemsynctest.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -100,8 +100,7 @@ QCOMPARE( spy.count(), 0 ); } } - QTest::qWait( 1000 ); // let it finish its job - QCOMPARE( spy.count(), 1 ); + QTRY_COMPARE( spy.count(), 1 ); KJob *job = spy.at( 0 ).at( 0 ).value<KJob*>(); QCOMPARE( job, syncer ); QCOMPARE( job->error(), 0 ); @@ -168,8 +167,7 @@ QCOMPARE( spy.count(), 0 ); } syncer->deliveryDone(); - QTest::qWait( 1000 ); // let it finish its job - QCOMPARE( spy.count(), 1 ); + QTRY_COMPARE( spy.count(), 1 ); KJob *job = spy.at( 0 ).at( 0 ).value<KJob*>(); QCOMPARE( job, syncer ); QCOMPARE( job->error(), 0 ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/tests/lazypopulationtest.cpp new/kdepimlibs-4.13.0/akonadi/tests/lazypopulationtest.cpp --- old/kdepimlibs-4.12.97/akonadi/tests/lazypopulationtest.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/tests/lazypopulationtest.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -68,6 +68,15 @@ */ void testItemAddedBeforeFetch(); + /* + * We purge an empty collection and make sure it can be fetched later on. + * * reference collection to remember empty status + * * purge collection + * * add item (it should not be added since not monitored) + * * reference collection and make sure items are added + */ + void testPurgeEmptyCollection(); + private: Collection res3; static const int numberOfRootCollections = 4; @@ -78,6 +87,7 @@ void LazyPopulationTest::initTestCase() { + qRegisterMetaType<Akonadi::Collection::Id>("Akonadi::Collection::Id"); AkonadiTest::checkTestIsIsolated(); AkonadiTest::setAllResourcesOffline(); @@ -292,6 +302,66 @@ QVERIFY(waitForPopulation(monitorIndex, model, 2)); } +void LazyPopulationTest::testPurgeEmptyCollection() +{ + const QString mainCollectionName("main3"); + Collection monitorCol; + { + monitorCol.setParentCollection(res3); + monitorCol.setName(mainCollectionName); + CollectionCreateJob *create = new CollectionCreateJob(monitorCol, this); + AKVERIFYEXEC(create); + monitorCol = create->collection(); + } + //Monitor without referencing so we get all signals + Monitor *monitor = new Monitor(this); + monitor->setCollectionMonitored(Collection::root()); + + ChangeRecorder *changeRecorder = new ChangeRecorder(this); + changeRecorder->setCollectionMonitored(Collection::root()); + InspectableETM *model = new InspectableETM( changeRecorder, this ); + model->setItemPopulationStrategy(Akonadi::EntityTreeModel::LazyPopulation); + + //Wait for initial listing to complete + QVERIFY(waitForPopulation(QModelIndex(), model, numberOfRootCollections)); + + const QModelIndex res3Index = getIndex("res3", model); + QVERIFY(waitForPopulation(res3Index, model, bufferSize + 1)); + + QModelIndex monitorIndex = getIndex(mainCollectionName, model); + QVERIFY(monitorIndex.isValid()); + + //fetch the collection so we remember the empty status + QSignalSpy populatedSpy(model, SIGNAL(collectionPopulated(Akonadi::Collection::Id))); + model->setData(monitorIndex, QVariant(), EntityTreeModel::CollectionRefRole); + model->fetchMore(monitorIndex); + //Wait for collection to be fetched + QTRY_VERIFY(populatedSpy.count() >= 1); + + //get the collection purged + model->setData(monitorIndex, QVariant(), EntityTreeModel::CollectionDerefRole); + referenceCollections(model, bufferSize); + + //create an item + { + QSignalSpy addedSpy(monitor, SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection))); + QVERIFY(addedSpy.isValid()); + Item item1; + item1.setMimeType("application/octet-stream"); + ItemCreateJob *append = new ItemCreateJob(item1, monitorCol, this); + AKVERIFYEXEC(append); + QTRY_VERIFY(addedSpy.count() >= 1); + } + + //ensure it's not in the model + //fetch the collection + QVERIFY(model->etmPrivate()->canFetchMore(monitorIndex)); + + model->fetchMore(monitorIndex); + //Wait for collection to be fetched + QVERIFY(waitForPopulation(monitorIndex, model, 1)); +} + #include "lazypopulationtest.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/tests/linktest.cpp new/kdepimlibs-4.13.0/akonadi/tests/linktest.cpp --- old/kdepimlibs-4.12.97/akonadi/tests/linktest.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/tests/linktest.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -75,9 +75,9 @@ LinkJob *link = new LinkJob( col, items, this ); AKVERIFYEXEC( link ); - QTest::qWait( 1000 ); + QTRY_COMPARE( lspy.count(), 3 ); + QTest::qWait( 100 ); QVERIFY( uspy.isEmpty() ); - QCOMPARE( lspy.count(), 3 ); QList<QVariant> arg = lspy.takeFirst(); Item item = arg.at( 0 ).value<Item>(); @@ -96,9 +96,9 @@ UnlinkJob *unlink = new UnlinkJob( col, items, this ); AKVERIFYEXEC( unlink ); - QTest::qWait( 1000 ); + QTRY_COMPARE( uspy.count(), 3 ); + QTest::qWait( 100 ); QVERIFY( lspy.isEmpty() ); - QCOMPARE( uspy.count(), 3 ); fetch = new ItemFetchJob( col ); AKVERIFYEXEC( fetch ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/tests/resourcetest.cpp new/kdepimlibs-4.13.0/akonadi/tests/resourcetest.cpp --- old/kdepimlibs-4.12.97/akonadi/tests/resourcetest.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/tests/resourcetest.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -66,8 +66,7 @@ AgentManager::self()->removeInstance( instance ); AgentManager::self()->removeInstance( instance2 ); - QTest::qWait( 2000 ); - QCOMPARE( spyRemoveInstance.count(), 2 ); + QTRY_COMPARE( spyRemoveInstance.count(), 2 ); QVERIFY( !AgentManager::self()->instances().contains( instance ) ); QVERIFY( !AgentManager::self()->instances().contains( instance2 ) ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/tests/searchjobtest.cpp new/kdepimlibs-4.13.0/akonadi/tests/searchjobtest.cpp --- old/kdepimlibs-4.12.97/akonadi/tests/searchjobtest.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/tests/searchjobtest.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -55,6 +55,7 @@ // Create collection SearchCreateJob *create = new SearchCreateJob( "search123456", query, this ); + create->setRemoteSearchEnabled(false); AKVERIFYEXEC( create ); const Collection created = create->createdCollection(); QVERIFY( created.isValid() ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/tests/servermanagertest.cpp new/kdepimlibs-4.13.0/akonadi/tests/servermanagertest.cpp --- old/kdepimlibs-4.12.97/akonadi/tests/servermanagertest.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/tests/servermanagertest.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -57,15 +57,21 @@ QVERIFY( startSpy.isEmpty() ); QVERIFY( stopSpy.isEmpty() ); - QVERIFY( ServerManager::stop() ); - QVERIFY( QTest::kWaitForSignal( ServerManager::self(), SIGNAL(stopped()), 5000 ) ); + { + QSignalSpy spy(ServerManager::self(), SIGNAL(stopped())); + QVERIFY( ServerManager::stop() ); + QTRY_VERIFY(spy.count() >= 1); + } QVERIFY( !ServerManager::isRunning() ); QVERIFY( startSpy.isEmpty() ); QCOMPARE( stopSpy.count(), 1 ); QVERIFY( !ServerManager::stop() ); - QVERIFY( ServerManager::start() ); - QVERIFY( QTest::kWaitForSignal( ServerManager::self(), SIGNAL(started()), 5000 ) ); + { + QSignalSpy spy(ServerManager::self(), SIGNAL(started())); + QVERIFY( ServerManager::start() ); + QTRY_VERIFY(spy.count() >= 1); + } QVERIFY( ServerManager::isRunning() ); QCOMPARE( startSpy.count(), 1 ); QCOMPARE( stopSpy.count(), 1 ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/tests/tagtest.cpp new/kdepimlibs-4.13.0/akonadi/tests/tagtest.cpp --- old/kdepimlibs-4.12.97/akonadi/tests/tagtest.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/tests/tagtest.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -266,6 +266,7 @@ void TagTest::testTagItem() { Akonadi::Monitor monitor; + monitor.itemFetchScope().setFetchTags(true); monitor.setAllMonitored(true); const Collection res3 = Collection( collectionIdFromPath( "res3" ) ); Tag tag; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/akonadi/tests/testsearchplugin/akonaditestsearchplugin.desktop new/kdepimlibs-4.13.0/akonadi/tests/testsearchplugin/akonaditestsearchplugin.desktop --- old/kdepimlibs-4.12.97/akonadi/tests/testsearchplugin/akonaditestsearchplugin.desktop 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/akonadi/tests/testsearchplugin/akonaditestsearchplugin.desktop 2014-04-09 12:18:48.000000000 +0200 @@ -11,12 +11,16 @@ Name[fi]=Akonadin hakuliitännäinen testaustarkoituksiin Name[fr]=Module externe de test pour les recherches Akonadi Name[hu]=Akonadi teszt keresés bővítmény +Name[ia]=Plug-in de cerca de essayo de Akonadi +Name[it]=Plugin di ricerca di test per Akonadi Name[ko]=Akonadi 테스트 검색 플러그인 +Name[nb]=Akonadi test-tillegg for søk Name[nds]=Akonadi-Testsöökmoduul Name[nl]=Akonadi-plug-in voor test met zoeken Name[pl]=Wtyczka próbna znajdywania dla Akonadi Name[pt]='Plugin' de Testes de Pesquisa do Akonadi Name[pt_BR]=Plugin de teste de pesquisa do Akonadi +Name[ru]=Тестовый модуль поиска по данным Akonadi Name[sk]=Testovací plugin hľadania Akonadi Name[sr]=Пробни прикључак за претрагу над Аконадијем Name[sr@ijekavian]=Пробни прикључак за претрагу над Аконадијем diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/kabc/vcardparser/testroundtrip.qrc new/kdepimlibs-4.13.0/kabc/vcardparser/testroundtrip.qrc --- old/kdepimlibs-4.12.97/kabc/vcardparser/testroundtrip.qrc 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/kabc/vcardparser/testroundtrip.qrc 2014-04-09 12:18:48.000000000 +0200 @@ -10,6 +10,7 @@ <file>tests/vcard7.vcf</file> <file>tests/vcard8.vcf</file> <file>tests/vcard9.vcf</file> + <file>tests/vcard10.vcf</file> </qresource>  @@ -28,5 +29,6 @@ <file>tests/vcard7.vcf.ref</file> <file>tests/vcard8.vcf.ref</file> <file>tests/vcard9.vcf.ref</file> + <file>tests/vcard10.vcf.ref</file> </qresource> </RCC> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/kabc/vcardparser/tests/vcard10.vcf new/kdepimlibs-4.13.0/kabc/vcardparser/tests/vcard10.vcf --- old/kdepimlibs-4.12.97/kabc/vcardparser/tests/vcard10.vcf 1970-01-01 01:00:00.000000000 +0100 +++ new/kdepimlibs-4.13.0/kabc/vcardparser/tests/vcard10.vcf 2014-04-09 12:18:48.000000000 +0200 @@ -0,0 +1,56 @@ +BEGIN:VCARD +VERSION:2.1 +UID:bfa5fdc5-fbfc-4ce2-8196-29ca0deb3bd3 +ADR;WORK;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:;;=44=44=44=44=44=44=44=44=44=44=44=44=44=44=44=2D=53=74=61=C3=9F=65=20= +=32=0A=30=30=30=30=30=20=44=44=44=44=44=44=44=44=44=44;;;; +ORG:Bike Shop +Note:This one has a funny character at the end in the contact list +END:VCARD +BEGIN:VCARD +VERSION:2.1 +UID:f8361311-b25c-4237-a94e-3015d8fe19de +N:;Broken;;; +FN:Field after Address broken +ADR;HOME;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:;;=41=41=41=41=41=41=41=2D=41=C3=A4=41=41=41=41=41=20= +=31=31;=55=72=74;;=30=30=30=30=30; +URL:http://some-webseite.com +NOTE:This one's URL field is truncated (see contact's edit form). Remove the linebreak in the VCF's address field and the URL will will be correct. +END:VCARD +BEGIN:VCARD +VERSION:2.1 +UID:462269fd-607c-4284-998b-6771143b63a7 +N:;Broken;;; +FN:Field after Address not broken +ADR;HOME;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:;;=41=41=41=41=41=41=41=2D=41=C3=A4=41=41=41=41=41=20= +=31=31;=55=72=74;;=30=30=30=30=30; +NOTE:this is identical to "Website broken", but with Note and URL swapped. The Note field does not get truncated as the URL field does. +URL:http://some-webseite.com +END:VCARD +BEGIN:VCARD +VERSION:2.1 +UID:b4fc4930-043f-446a-9a76-cf0b548368d8 +N:Name;Surname;;Dr. med.; +FN:Dr. med. Surname Name +TITLE;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:=46=61=63=68=61=72=7A=74=20=66=C3=BC=72=20=41=6C=6C=67=65=6D=65=69=6E= +=6D=65=64=69=7A=69=6E +NOTE;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:=53=70=72=65=63=68=7A=65=69=74=65=6E=3A=0A=4D=6F=20=20=20=38=E2=80=93= +=31=32=2C=20=31=35=E2=80=93=31=38=0A=44=69=20=20=20=20=20=38=E2=80=93= +=31=32=0A=4D=69=20=20=20=20=38=E2=80=93=31=32=2C=20=31=34=E2=80=93=31= +=35=0A=44=6F=20=31=34=E2=80=93=31=39=0A=46=72=20=20=20=20=20=38=E2=80= +=93=31=32 +END:VCARD +BEGIN:VCARD +VERSION:2.1 +UID:941b057d-e959-4644-b41f-e122b26c3807 +N:Doctor;Second;;; +FN:Second Doctor +ADR;WORK;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:;;=44=44=44=44=44=44=44=44=44=44=44=73=74=72=61=C3=9F=65=20=32=36=0A=30= +=30=30=30=30=20=44=44=44=44=44=44=44=44=44=44=44=44=44=44=44=44=44;;;; +ORG: +TITLE:Dentist +NOTE;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:=53=70=72=65=63=68=7A=65=69=74=65=6E=3A=0A=4D=6F=20=20=20=38=E2=80=93= +=31=33=0A=44=69=20=20=20=31=30=E2=80=93=31=32=2C=20=31=33=E2=80=93=31= +=38=0A=4D=69=20=20=31=30=E2=80=93=31=32=2C=20=31=33=E2=80=93=31=38=0A= +=44=6F=20=20=31=33=E2=80=93=31=38=0A=46=72=20=20=20=20=20=20=38=E2=80= +=93=31=32 +END:VCARD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/kabc/vcardparser/tests/vcard10.vcf.ref new/kdepimlibs-4.13.0/kabc/vcardparser/tests/vcard10.vcf.ref --- old/kdepimlibs-4.12.97/kabc/vcardparser/tests/vcard10.vcf.ref 1970-01-01 01:00:00.000000000 +0100 +++ new/kdepimlibs-4.13.0/kabc/vcardparser/tests/vcard10.vcf.ref 2014-04-09 12:18:48.000000000 +0200 @@ -0,0 +1,52 @@ +BEGIN:VCARD +ADR;TYPE=work:;;DDDDDDDDDDDDDDD-Staße 2\n00000 DDDDDDDDDD;;;; +N:;;;; +NOTE:This one has a funny character at the end in the contact list +ORG:Bike Shop +UID:bfa5fdc5-fbfc-4ce2-8196-29ca0deb3bd3 +VERSION:3.0 +END:VCARD + +BEGIN:VCARD +ADR;TYPE=home:;;AAAAAAA-AäAAAAA 11;Urt;;00000; +FN:Field after Address broken +N:;Broken;;; +NOTE:This one's URL field is truncated (see contact's edit form). Remove th + e linebreak in the VCF's address field and the URL will will be correct. +UID:f8361311-b25c-4237-a94e-3015d8fe19de +URL:http://some-webseite.com +VERSION:3.0 +END:VCARD + +BEGIN:VCARD +ADR;TYPE=home:;;AAAAAAA-AäAAAAA 11;Urt;;00000; +FN:Field after Address not broken +N:;Broken;;; +NOTE:this is identical to "Website broken"\, but with Note and URL swapped. + The Note field does not get truncated as the URL field does. +UID:462269fd-607c-4284-998b-6771143b63a7 +URL:http://some-webseite.com +VERSION:3.0 +END:VCARD + +BEGIN:VCARD +FN:Dr. med. Surname Name +N:Name;Surname;;Dr. med.; +NOTE:Sprechzeiten:\nMo 8–12\, 15–18\nDi 8–12\nMi 8–12\, 14 + –15\nDo 14–19\nFr 8–12 +TITLE:Facharzt für Allgemeinmedizin +UID:b4fc4930-043f-446a-9a76-cf0b548368d8 +VERSION:3.0 +END:VCARD + +BEGIN:VCARD +ADR;TYPE=work:;;DDDDDDDDDDDstraße 26\n00000 DDDDDDDDDDDDDDDDD;;;; +FN:Second Doctor +N:Doctor;Second;;; +NOTE:Sprechzeiten:\nMo 8–13\nDi 10–12\, 13–18\nMi 10–12\, 13 + –18\nDo 13–18\nFr 8–12 +TITLE:Dentist +UID:941b057d-e959-4644-b41f-e122b26c3807 +VERSION:3.0 +END:VCARD + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.12.97/kabc/vcardparser/vcardparser.cpp new/kdepimlibs-4.13.0/kabc/vcardparser/vcardparser.cpp --- old/kdepimlibs-4.12.97/kabc/vcardparser/vcardparser.cpp 2014-03-26 08:20:40.000000000 +0100 +++ new/kdepimlibs-4.13.0/kabc/vcardparser/vcardparser.cpp 2014-04-09 12:18:48.000000000 +0200 @@ -178,6 +178,10 @@ value.chop( 1 ); // remove the '=' value.append( *it ); ++it; + // remove the trailing \r, left from \r\n + if ( (*it).endsWith('\r') ) { + (*it).chop(1); + } } KCodecs::quotedPrintableDecode( value, output ); } else if ( encoding == QLatin1String( "8bit" ) ) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-runtime for openSUSE:Factory
by root＠hilbert.suse.de 18 Apr '14

18 Apr '14

Hello community, here is the log from the commit of package kdebase4-runtime for openSUSE:Factory checked in at 2014-04-18 11:35:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-runtime (Old) and /work/SRC/openSUSE:Factory/.kdebase4-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-runtime" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-runtime/kdebase4-runtime.changes 2014-03-30 08:21:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4-runtime.new/kdebase4-runtime.changes 2014-04-18 12:37:38.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 11 16:43:51 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.0 + * KDE 4.13 release + * See http://www.kde.org/announcements/4.13/ + +------------------------------------------------------------------- Old: ---- kde-runtime-4.12.97.tar.xz New: ---- kde-runtime-4.13.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.g0UbNP/_old 2014-04-18 12:37:40.000000000 +0200 +++ /var/tmp/diff_new_pack.g0UbNP/_new 2014-04-18 12:37:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdebase4-runtime -Version: 4.12.97 +Version: 4.13.0 Release: 0 Summary: The KDE Runtime Components License: GPL-2.0+ ++++++ kde-runtime-4.12.97.tar.xz -> kde-runtime-4.13.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kdebase4-runtime/kde-runtime-4.12.97.tar.xz /work/SRC/openSUSE:Factory/.kdebase4-runtime.new/kde-runtime-4.13.0.tar.xz differ: char 27, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4 for openSUSE:Factory
by root＠hilbert.suse.de 18 Apr '14

18 Apr '14

Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at 2014-04-18 11:35:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4 (Old) and /work/SRC/openSUSE:Factory/.kdebase4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4/kdebase4.changes 2014-03-30 08:24:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4.new/kdebase4.changes 2014-04-18 12:37:35.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 11 16:44:10 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.0 + * KDE 4.13 release + * See http://www.kde.org/announcements/4.13/ + +------------------------------------------------------------------- Old: ---- kde-baseapps-4.12.97.tar.xz New: ---- kde-baseapps-4.13.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.Did3Kn/_old 2014-04-18 12:37:36.000000000 +0200 +++ /var/tmp/diff_new_pack.Did3Kn/_new 2014-04-18 12:37:36.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdebase4 -Version: 4.12.97 +Version: 4.13.0 Release: 0 Summary: The Base KDE Apps License: GPL-2.0+ ++++++ kde-baseapps-4.12.97.tar.xz -> kde-baseapps-4.13.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.97/dolphin/src/dolphinviewcontainer.cpp new/kde-baseapps-4.13.0/dolphin/src/dolphinviewcontainer.cpp --- old/kde-baseapps-4.12.97/dolphin/src/dolphinviewcontainer.cpp 2014-03-25 23:39:47.000000000 +0100 +++ new/kde-baseapps-4.13.0/dolphin/src/dolphinviewcontainer.cpp 2014-04-03 09:03:47.000000000 +0200 @@ -314,36 +314,18 @@ m_urlNavigator->setVisible(!enabled); if (enabled) { - KUrl url = m_urlNavigator->locationUrl(); - m_searchBox->setText(QString()); - m_searchBox->setReadOnly(isSearchUrl(url), url); - - // Remember the most recent non-search URL as search path - // of the search-box, so that it can be restored - // when switching back to the URL navigator. - int index = m_urlNavigator->historyIndex(); - const int historySize = m_urlNavigator->historySize(); - while (isSearchUrl(url) && (index < historySize)) { - ++index; - url = m_urlNavigator->locationUrl(index); - } - - if (!isSearchUrl(url)) { - m_searchBox->setSearchPath(url); - } + const KUrl& locationUrl = m_urlNavigator->locationUrl(); + m_searchBox->fromSearchUrl(locationUrl); } else { m_view->setViewPropertiesContext(QString()); // Restore the URL for the URL navigator. If Dolphin has been // started with a search-URL, the home URL is used as fallback. - const KUrl url = m_searchBox->searchPath(); - if (url.isValid() && !url.isEmpty()) { - if (isSearchUrl(url)) { - m_urlNavigator->goHome(); - } else { - m_urlNavigator->setLocationUrl(url); - } + KUrl url = m_searchBox->searchPath(); + if (url.isEmpty() || !url.isValid() || isSearchUrl(url)) { + url = GeneralSettings::self()->homeUrl(); } + m_urlNavigator->setLocationUrl(url); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.97/dolphin/src/kitemviews/private/kdirectorycontentscounter.cpp new/kde-baseapps-4.13.0/dolphin/src/kitemviews/private/kdirectorycontentscounter.cpp --- old/kde-baseapps-4.12.97/dolphin/src/kitemviews/private/kdirectorycontentscounter.cpp 2014-03-25 23:39:47.000000000 +0100 +++ new/kde-baseapps-4.13.0/dolphin/src/kitemviews/private/kdirectorycontentscounter.cpp 2014-04-03 09:03:47.000000000 +0200 @@ -60,14 +60,23 @@ { --m_workersCount; - if (m_workersCount == 0) { + if (m_workersCount > 0) { + // The worker thread will continue running. It could even be running + // a method of m_worker at the moment, so we delete it using + // deleteLater() to prevent a crash. + m_worker->deleteLater(); + } else { + // There are no remaining workers -> stop the worker thread. m_workerThread->quit(); m_workerThread->wait(); delete m_workerThread; m_workerThread = 0; - } - delete m_worker; + // The worker thread has finished running now, so it's safe to delete + // m_worker. deleteLater() would not work at all because the event loop + // which would deliver the event to m_worker is not running any more. + delete m_worker; + } } void KDirectoryContentsCounter::addDirectory(const QString& path) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.97/dolphin/src/search/dolphinfacetswidget.cpp new/kde-baseapps-4.13.0/dolphin/src/search/dolphinfacetswidget.cpp --- old/kde-baseapps-4.12.97/dolphin/src/search/dolphinfacetswidget.cpp 2014-03-25 23:39:47.000000000 +0100 +++ new/kde-baseapps-4.13.0/dolphin/src/search/dolphinfacetswidget.cpp 2014-04-03 09:03:47.000000000 +0200 @@ -179,8 +179,117 @@ return QString(); } +bool DolphinFacetsWidget::isRatingTerm(const Baloo::Term& term) const +{ + const QList<Baloo::Term> subTerms = term.subTerms(); + if (subTerms.isEmpty()) { + // If term has no sub terms, then the term itself is either a "rating" term + // or a "modified" term. + return term.property() == QLatin1String("modified") || + term.property() == QLatin1String("rating"); + + } else if (subTerms.size() == 2) { + // If term has sub terms, then the sub terms are always "rating" and "modified" terms. + + QStringList properties; + foreach (const Baloo::Term& subTerm, subTerms) { + properties << subTerm.property(); + } + + return properties.contains(QLatin1String("modified")) && + properties.contains(QLatin1String("rating")); + } + + return false; +} + +void DolphinFacetsWidget::setRatingTerm(const Baloo::Term& term) +{ + // If term has sub terms, then the sub terms are always "rating" and "modified" terms. + // If term has no sub terms, then the term itself is either a "rating" term or a "modified" + // term. To avoid code duplication we add term to subTerms list, if the list is empty. + QList<Baloo::Term> subTerms = term.subTerms(); + if (subTerms.isEmpty()) { + subTerms << term; + } + + foreach (const Baloo::Term& subTerm, subTerms) { + const QString property = subTerm.property(); + + if (property == QLatin1String("modified")) { + const QDate date = subTerm.value().toDate(); + setTimespan(date); + } else if (property == QLatin1String("rating")) { + const int stars = subTerm.value().toInt() / 2; + setRating(stars); + } + } +} + #endif +void DolphinFacetsWidget::setFacetType(const QString& type) +{ + if (type == QLatin1String("Document")) { + m_documents->setChecked(true); + } else if (type == QLatin1String("Image")) { + m_images->setChecked(true); + } else if (type == QLatin1String("Audio")) { + m_audio->setChecked(true); + } else if (type == QLatin1String("Video")) { + m_videos->setChecked(true); + } else { + m_anyType->setChecked(true); + } +} + +void DolphinFacetsWidget::setRating(const int stars) +{ + switch (stars) { + case 5: + m_maxRating->setChecked(true); + break; + + case 4: + m_fourOrMore->setChecked(true); + break; + + case 3: + m_threeOrMore->setChecked(true); + break; + + case 2: + m_twoOrMore->setChecked(true); + break; + + case 1: + m_oneOrMore->setChecked(true); + break; + + default: + m_anyRating->setChecked(true); + } +} + +void DolphinFacetsWidget::setTimespan(const QDate& date) +{ + const QDate currentDate = QDate::currentDate(); + const int days = date.daysTo(currentDate); + + if (days <= 0) { + m_today->setChecked(true); + } else if (days <= 1) { + m_yesterday->setChecked(true); + } else if (days <= currentDate.dayOfWeek()) { + m_thisWeek->setChecked(true); + } else if (days <= currentDate.day()) { + m_thisMonth->setChecked(true); + } else if (days <= currentDate.dayOfYear()) { + m_thisYear->setChecked(true); + } else { + m_anytime->setChecked(true); + } +} QRadioButton* DolphinFacetsWidget::createRadioButton(const QString& text, QButtonGroup* group) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.97/dolphin/src/search/dolphinfacetswidget.h new/kde-baseapps-4.13.0/dolphin/src/search/dolphinfacetswidget.h --- old/kde-baseapps-4.12.97/dolphin/src/search/dolphinfacetswidget.h 2014-03-25 23:39:47.000000000 +0100 +++ new/kde-baseapps-4.13.0/dolphin/src/search/dolphinfacetswidget.h 2014-04-03 09:03:47.000000000 +0200 @@ -29,6 +29,7 @@ class QButtonGroup; class QCheckBox; +class QDate; class QRadioButton; /** @@ -58,12 +59,20 @@ #ifdef HAVE_BALOO Baloo::Term ratingTerm() const; QString facetType() const; + + bool isRatingTerm(const Baloo::Term& term) const; + void setRatingTerm(const Baloo::Term& term); #endif + void setFacetType(const QString& type); + signals: void facetChanged(); private: + void setRating(const int stars); + void setTimespan(const QDate& date); + /** * @return New radiobutton which is connected to the * slotFacedChanged() slot whenever it has diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.97/dolphin/src/search/dolphinsearchbox.cpp new/kde-baseapps-4.13.0/dolphin/src/search/dolphinsearchbox.cpp --- old/kde-baseapps-4.12.97/dolphin/src/search/dolphinsearchbox.cpp 2014-03-25 23:39:47.000000000 +0100 +++ new/kde-baseapps-4.13.0/dolphin/src/search/dolphinsearchbox.cpp 2014-04-03 09:03:47.000000000 +0200 @@ -49,7 +49,6 @@ DolphinSearchBox::DolphinSearchBox(QWidget* parent) : QWidget(parent), m_startedSearching(false), - m_readOnly(false), m_active(true), m_topLayout(0), m_searchLabel(0), @@ -63,7 +62,6 @@ m_facetsToggleButton(0), m_facetsWidget(0), m_searchPath(), - m_readOnlyQuery(), m_startSearchTimer(0) { } @@ -102,7 +100,7 @@ const QString elidedLocation = metrics.elidedText(location, Qt::ElideMiddle, maxWidth); m_fromHereButton->setText(i18nc("action:button", "From Here (%1)", elidedLocation)); - const bool showSearchFromButtons = url.isLocalFile() && !m_readOnly; + const bool showSearchFromButtons = url.isLocalFile(); m_separator->setVisible(showSearchFromButtons); m_fromHereButton->setVisible(showSearchFromButtons); m_everywhereButton->setVisible(showSearchFromButtons); @@ -152,23 +150,24 @@ return url; } -void DolphinSearchBox::selectAll() -{ - m_searchInput->selectAll(); -} - -void DolphinSearchBox::setReadOnly(bool readOnly, const KUrl& query) +void DolphinSearchBox::fromSearchUrl(const KUrl& url) { - if (m_readOnly != readOnly || m_readOnlyQuery != query) { - m_readOnly = readOnly; - m_readOnlyQuery = query; - applyReadOnlyState(); + if (url.protocol() == "baloosearch") { + fromBalooSearchUrl(url); + } else if (url.protocol() == "filenamesearch") { + const QMap<QString, QString>& queryItems = url.queryItems(); + setText(queryItems.value("search")); + setSearchPath(queryItems.value("url")); + m_contentButton->setChecked(queryItems.value("checkContent") == "yes"); + } else { + setText(QString()); + setSearchPath(url); } } -bool DolphinSearchBox::isReadOnly() const +void DolphinSearchBox::selectAll() { - return m_readOnly; + m_searchInput->selectAll(); } void DolphinSearchBox::setActive(bool active) @@ -426,7 +425,6 @@ connect(m_startSearchTimer, SIGNAL(timeout()), this, SLOT(emitSearchRequest())); updateFacetsToggleButton(); - applyReadOnlyState(); } KUrl DolphinSearchBox::balooUrlForSearching() const @@ -464,26 +462,46 @@ #endif } -void DolphinSearchBox::applyReadOnlyState() +void DolphinSearchBox::fromBalooSearchUrl(const KUrl& url) { #ifdef HAVE_BALOO - if (m_readOnly) { - m_searchLabel->setText(Baloo::Query::titleFromQueryUrl(m_readOnlyQuery)); + const Baloo::Query query = Baloo::Query::fromSearchUrl(url); + const Baloo::Term term = query.term(); + + // Block all signals to avoid unnecessary "searchRequest" signals + // while we adjust the search text and the facet widget. + blockSignals(true); + + const QVariantHash customOptions = query.customOptions(); + if (customOptions.contains("includeFolder")) { + setSearchPath(customOptions.value("includeFolder").toString()); } else { -#else - { -#endif - m_searchLabel->setText(i18nc("@label:textbox", "Find:")); + setSearchPath(QDir::homePath()); } - m_searchInput->setVisible(!m_readOnly); - m_optionsScrollArea->setVisible(!m_readOnly); + if (!query.searchString().isEmpty()) { + setText(query.searchString()); + } - if (m_readOnly) { - m_facetsWidget->hide(); - } else { - m_facetsWidget->setVisible(SearchSettings::showFacetsWidget()); + QStringList types = query.types(); + types.removeOne("File"); // We are only interested in facet widget types + if (!types.isEmpty()) { + m_facetsWidget->setFacetType(types.first()); + } + + foreach (const Baloo::Term& subTerm, term.subTerms()) { + const QString property = subTerm.property(); + + if (property == QLatin1String("filename")) { + setText(subTerm.value().toString()); + } else if (m_facetsWidget->isRatingTerm(subTerm)) { + m_facetsWidget->setRatingTerm(subTerm); + } } + + m_startSearchTimer->stop(); + blockSignals(false); +#endif } void DolphinSearchBox::updateFacetsToggleButton() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.97/dolphin/src/search/dolphinsearchbox.h new/kde-baseapps-4.13.0/dolphin/src/search/dolphinsearchbox.h --- old/kde-baseapps-4.12.97/dolphin/src/search/dolphinsearchbox.h 2014-03-25 23:39:47.000000000 +0100 +++ new/kde-baseapps-4.13.0/dolphin/src/search/dolphinsearchbox.h 2014-04-03 09:03:47.000000000 +0200 @@ -72,20 +72,15 @@ KUrl urlForSearching() const; /** - * Selects the whole text of the search box. + * Extracts information from the given search \a url to + * initialize the search box properly. */ - void selectAll(); + void fromSearchUrl(const KUrl& url); /** - * @param readOnly If set to true the searchbox cannot be modified - * by the user and acts as visual indicator for - * an externally triggered search query. - * @param query If readOnly is true this URL will be used - * to show a human readable information about the - * query. + * Selects the whole text of the search box. */ - void setReadOnly(bool readOnly, const KUrl& query = KUrl()); - bool isReadOnly() const; + void selectAll(); /** * Set the search box to the active mode, if \a active @@ -155,12 +150,15 @@ */ KUrl balooUrlForSearching() const; - void applyReadOnlyState(); + /** + * Extracts information from the given Baloo search \a url to + * initialize the search box properly. + */ + void fromBalooSearchUrl(const KUrl& url); void updateFacetsToggleButton(); private: bool m_startedSearching; - bool m_readOnly; bool m_active; QVBoxLayout* m_topLayout; @@ -177,7 +175,6 @@ DolphinFacetsWidget* m_facetsWidget; KUrl m_searchPath; - KUrl m_readOnlyQuery; QTimer* m_startSearchTimer; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.97/konq-plugins/imagerotation/jpegorient.desktop new/kde-baseapps-4.13.0/konq-plugins/imagerotation/jpegorient.desktop --- old/kde-baseapps-4.12.97/konq-plugins/imagerotation/jpegorient.desktop 2014-03-25 23:39:47.000000000 +0100 +++ new/kde-baseapps-4.13.0/konq-plugins/imagerotation/jpegorient.desktop 2014-04-03 09:03:47.000000000 +0200 @@ -80,7 +80,7 @@ Name[ca@valencia]=Gira en sentit horari Name[cs]=Rotovat po směru hodin Name[da]=Rotér med uret -Name[de]=Rechts drehen +Name[de]=Mit dem Uhrzeigersinn drehen Name[el]=Περιστροφή με τη Φορά του Ρολογιού Name[en_GB]=Rotate Clockwise Name[es]=Girar en el sentido de las agujas del reloj @@ -147,7 +147,7 @@ Name[ca@valencia]=Gira en sentit antihorari Name[cs]=Rotovat proti směru hodin Name[da]=Rotér mod uret -Name[de]=Links drehen +Name[de]=Gegen den Uhrzeigersinn drehen Name[el]=Περιστροφή αριστερόστροφα Name[en_GB]=Rotate Anti-Clockwise Name[es]=Girar en sentido contrario a las agujas del reloj diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.97/konqueror/settings/kio/proxy.desktop new/kde-baseapps-4.13.0/konqueror/settings/kio/proxy.desktop --- old/kde-baseapps-4.12.97/konqueror/settings/kio/proxy.desktop 2014-03-25 23:39:47.000000000 +0100 +++ new/kde-baseapps-4.13.0/konqueror/settings/kio/proxy.desktop 2014-04-03 09:03:47.000000000 +0200 @@ -76,7 +76,7 @@ Name[oc]=Proxy Name[or]=ପ୍ରକ୍ସି Name[pa]=ਪਰਾਕਸੀ -Name[pl]=Pośrednik (Proxy) +Name[pl]=Pośrednik Name[pt]=Proxy Name[pt_BR]=Proxy Name[ro]=Proxy -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kate for openSUSE:Factory
by root＠hilbert.suse.de 18 Apr '14

18 Apr '14

Hello community, here is the log from the commit of package kate for openSUSE:Factory checked in at 2014-04-18 11:35:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kate (Old) and /work/SRC/openSUSE:Factory/.kate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kate" Changes: -------- --- /work/SRC/openSUSE:Factory/kate/kate.changes 2014-03-30 08:28:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kate.new/kate.changes 2014-04-18 12:37:30.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 11 16:44:21 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.0 + * KDE 4.13 release + * See http://www.kde.org/announcements/4.13/ + +------------------------------------------------------------------- Old: ---- kate-4.12.97.tar.xz New: ---- kate-4.13.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kate.spec ++++++ --- /var/tmp/diff_new_pack.8CQuL0/_old 2014-04-18 12:37:32.000000000 +0200 +++ /var/tmp/diff_new_pack.8CQuL0/_new 2014-04-18 12:37:32.000000000 +0200 @@ -17,7 +17,7 @@ Name: kate -Version: 4.12.97 +Version: 4.13.0 Release: 0 Summary: Advanced Text Editor License: GPL-2.0+ ++++++ kate-4.12.97.tar.xz -> kate-4.13.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/addons/kate/filetemplates/templates/FindXXX.cmake.katetemplate new/kate-4.13.0/addons/kate/filetemplates/templates/FindXXX.cmake.katetemplate --- old/kate-4.12.97/addons/kate/filetemplates/templates/FindXXX.cmake.katetemplate 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/addons/kate/filetemplates/templates/FindXXX.cmake.katetemplate 2014-04-07 17:27:59.000000000 +0200 @@ -19,7 +19,7 @@ # Check if already in cache # NOTE Feel free to check/change/add any other vars -if(%{package}_LIBRARIES) +if(NOT %{package}_LIBRARIES) if(%{package}_FIND_QUIETLY) set(_pkg_find_quietly QUIET) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/addons/kate/pate/src/katepythonplugin.desktop new/kate-4.13.0/addons/kate/pate/src/katepythonplugin.desktop --- old/kate-4.12.97/addons/kate/pate/src/katepythonplugin.desktop 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/addons/kate/pate/src/katepythonplugin.desktop 2014-04-07 17:27:59.000000000 +0200 @@ -7,6 +7,7 @@ Comment[ca]=Connector Python del Kate Comment[ca@valencia]=Connector Python del Kate Comment[cs]=Moduly Pythonu pro Kate +Comment[da]=Kate Python-plugin Comment[de]=Python-Modul für Kate Comment[el]=Πρόσθετο του Kate για την Python Comment[es]=Complementos de Python para Kate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/addons/kate/pate/src/plugins/cmake_utils/katepate_cmake_utils.desktop new/kate-4.13.0/addons/kate/pate/src/plugins/cmake_utils/katepate_cmake_utils.desktop --- old/kate-4.12.97/addons/kate/pate/src/plugins/cmake_utils/katepate_cmake_utils.desktop 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/addons/kate/pate/src/plugins/cmake_utils/katepate_cmake_utils.desktop 2014-04-07 17:27:59.000000000 +0200 @@ -7,6 +7,7 @@ Name[ca]=Utilitats del CMake Name[ca@valencia]=Utilitats del CMake Name[cs]=Nástroje CMake +Name[da]=CMake-værktøjer Name[de]=CMake-Dienstprogramme Name[el]=Εργαλεία του CMake Name[es]=Utilidades CMake @@ -44,6 +45,7 @@ Comment[ca]=Compleció de codi, navegador de memòria cau i ajuda Comment[ca@valencia]=Compleció de codi, navegador de memòria cau i ajuda Comment[cs]=Doplňování kódu, mezipaměť a prohlížeč nápovědy +Comment[da]=Kodefuldførelse, browser til cache og hjælp Comment[de]=Quelltext-Vervollständigung, Zwischenspeicher und Hilfe-Browser Comment[el]=Εργαλείο συμπλήρωσης κώδικα, λανθάνουσα μνήμη και βοηθητικός περιηγητής Comment[es]=Completador de código, caché y navegador de la ayuda diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/addons/kate/pate/src/plugins/color_tools/katepate_color_tools.desktop new/kate-4.13.0/addons/kate/pate/src/plugins/color_tools/katepate_color_tools.desktop --- old/kate-4.12.97/addons/kate/pate/src/plugins/color_tools/katepate_color_tools.desktop 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/addons/kate/pate/src/plugins/color_tools/katepate_color_tools.desktop 2014-04-07 17:27:59.000000000 +0200 @@ -6,6 +6,7 @@ Name[bs]=Alati boja Name[ca]=Eines de color Name[ca@valencia]=Eines de color +Name[da]=Farveværktøjer Name[de]=Farbenwerkzeuge Name[el]=Εργαλεία χρωμάτων Name[es]=Herramientas de color @@ -43,6 +44,7 @@ Comment[ca]=Utilitats per treballar amb colors hexadecimals en documents Comment[ca@valencia]=Utilitats per treballar amb colors hexadecimals en documents Comment[cs]=Nástroje pro práci s šestnáctkovými barvami v dokumentech +Comment[da]=Værktøjer til at arbejde med hexadecimale farver i dokumenter Comment[de]=Hilfsmittel zum Umgang mit Hexadezimalwerten für Farben in Dokumenten Comment[el]=Εργαλεία για εργασία με δεκαεξαδικά χρώματα σε έγγραφα Comment[es]=Utilidades para trabajar con colores en hexadecimal en los documentos diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/addons/kate/pate/src/plugins/expand/katepate_expand.desktop new/kate-4.13.0/addons/kate/pate/src/plugins/expand/katepate_expand.desktop --- old/kate-4.12.97/addons/kate/pate/src/plugins/expand/katepate_expand.desktop 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/addons/kate/pate/src/plugins/expand/katepate_expand.desktop 2014-04-07 17:27:59.000000000 +0200 @@ -6,6 +6,7 @@ Name[bs]=Korisnički-definisana proširenja teksta Name[ca]=Expansions de text definides per l'usuari Name[ca@valencia]=Expansions de text definides per l'usuari +Name[da]=Brugerdefinerede tekstudvidelser Name[de]=Benutzerdefinierte Texterweiterungen Name[el]=Επεκτάσεις κειμένου ορισμένες από το χρήστη Name[es]=Expansiones de texto definidas por el usuario @@ -41,6 +42,7 @@ Comment[bs]=Izvrši funkciju proširenja i ubaci izlaz u dokument Comment[ca]=Executa funcions d'expansió i inserció de sortida en un document Comment[ca@valencia]=Executa funcions d'expansió i inserció d'eixida en un document +Comment[da]=Kør udvidelsesfunktion og indsæt output i et dokument Comment[de]=Führt die Erweiterungsfunktion aus und fügt die Ausgabe in ein Dokument ein Comment[el]=Εκτέλεση λειτουργίας επέκτασης και εισαγωγή της εξόδου σε έγγραφο Comment[es]=Ejecutar la función de expansión e insertar la salida en un documento diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/addons/kate/pate/src/plugins/gid/katepate_gid.desktop new/kate-4.13.0/addons/kate/pate/src/plugins/gid/katepate_gid.desktop --- old/kate-4.12.97/addons/kate/pate/src/plugins/gid/katepate_gid.desktop 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/addons/kate/pate/src/plugins/gid/katepate_gid.desktop 2014-04-07 17:27:59.000000000 +0200 @@ -7,6 +7,7 @@ Name[ca]=Connector «idutils» de GNU Name[ca@valencia]=Connector «idutils» de GNU Name[cs]=Modul GNU idutils +Name[da]=GNU idutils-plugin Name[de]=„GNU Idutils“-Modul Name[el]=Πρόσθετο GNU idutils Name[es]=Complemento GNU idutils @@ -43,6 +44,7 @@ Comment[bs]=Pregledaj tokene u GNU idutils id datoteci Comment[ca]=Examina els testimonis en un fitxer ID amb «idutils» de GNU Comment[ca@valencia]=Examina els testimonis en un fitxer ID amb «idutils» de GNU +Comment[da]=Gennemse poletter i en GNU idutils id-fil Comment[de]=Durchsuchen Sie die Token in einer ID-Datei von „GNU-Idutils“ Comment[es]=Mostrar los identificadores en un archivo GNU idutils de ID Comment[fi]=Selaa GNU idutils -ohjelman ID-tiedoston lausekkeita diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/addons/kate/pate/src/plugins/js_utils/katepate_js_utils.desktop new/kate-4.13.0/addons/kate/pate/src/plugins/js_utils/katepate_js_utils.desktop --- old/kate-4.12.97/addons/kate/pate/src/plugins/js_utils/katepate_js_utils.desktop 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/addons/kate/pate/src/plugins/js_utils/katepate_js_utils.desktop 2014-04-07 17:27:59.000000000 +0200 @@ -7,6 +7,7 @@ Name[ca]=Utilitats JavaScript Name[ca@valencia]=Utilitats JavaScript Name[cs]=Nástroje JavaScript +Name[da]=JavaScript-værktøjer Name[de]=JavaScript-Dienstprogramme Name[el]=Εργαλεία JavaScript Name[es]=Utilidades de JavaScript @@ -43,6 +44,7 @@ Comment[bs]=JS i jQuery automatsko dovršavanje, jQuery spreman odsječak, JSLint/JSHint Comment[ca]=Compleció automàtica de JS i jQuery, un retall «ready» de jQuery, JSLint/JSHint Comment[ca@valencia]=Compleció automàtica de JS i jQuery, un retall «ready» de jQuery, JSLint/JSHint +Comment[da]=JS- og jQuery autofuldførelse, en jQuery-forberedt tekststump, JSLint/JSHint Comment[de]=Auto-Vervollständigung für JS und jQuery, jQuery-Textbaustein, jSLint/JSHint Comment[el]=Αυτόματη συμπλήρωση JS και jQuery, ένα έτοιμο προς χρήση τμήμα κώδικα jQuery, JSLint/JSHint Comment[es]=Completado automático de JS y jQuery, un fragmento de código de jQuery preparado, JSLint/JSHint diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/addons/kate/pate/src/plugins/katepate_block.desktop new/kate-4.13.0/addons/kate/pate/src/plugins/katepate_block.desktop --- old/kate-4.12.97/addons/kate/pate/src/plugins/katepate_block.desktop 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/addons/kate/pate/src/plugins/katepate_block.desktop 2014-04-07 17:27:59.000000000 +0200 @@ -7,6 +7,7 @@ Name[ca]=Bloc Name[ca@valencia]=Bloc Name[cs]=Blok +Name[da]=Blok Name[de]=Block Name[es]=Bloque Name[fi]=Block @@ -43,6 +44,7 @@ Comment[ca]=Diverses accions que ajuden en l'edició de codi Comment[ca@valencia]=Diverses accions que ajuden en l'edició de codi Comment[cs]=Různé činnosti pomáhající s úpravou kódu +Comment[da]=Diverse handlinger til at hjælpe med koderedigering Comment[de]=Verschiedene Aktionen zur Hilfe bei dem Editieren von Quelltext Comment[el]=Διάφορες ενέργειες για βοήθεια στην επεξεργασία κώδικα Comment[es]=Diversas acciones para ayudar en la edición de código diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/addons/kate/pate/src/plugins/katepate_commentar.desktop new/kate-4.13.0/addons/kate/pate/src/plugins/katepate_commentar.desktop --- old/kate-4.12.97/addons/kate/pate/src/plugins/katepate_commentar.desktop 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/addons/kate/pate/src/plugins/katepate_commentar.desktop 2014-04-07 17:27:59.000000000 +0200 @@ -7,6 +7,7 @@ Name[ca]=Connectors per treballar amb comentaris Name[ca@valencia]=Connectors per treballar amb comentaris Name[cs]=Moduly pro práci s komentáři +Name[da]=Plugins til at arbejde med kommentarer Name[de]=Module für die Bearbeitung von Kommentaren Name[el]=Πρόσθετα για εργασία με σχόλια Name[es]=Complementos para trabajar con comentarios @@ -43,6 +44,7 @@ Comment[ca]=Els llenguatges implementats són C++, JS, Python, CMake, Bash Comment[ca@valencia]=Els llenguatges implementats són C++, JS, Python, CMake, Bash Comment[cs]=Podporované jazyky jsou C++, JS, Python, CMake a Bash +Comment[da]=Understøttede sprog er C++, JS, Python, CMake, Bash Comment[de]=Unterstützte Sprachen sind C++, JS, Python, CMake, Bash Comment[el]=Υποστηριζόμενες γλώσσες είναι οι C++, JS, Python, CMake, Bash Comment[es]=Los lenguajes permitidos son C++, JS, Python, CMake y Bash diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/addons/kate/pate/src/plugins/katepate_format.desktop new/kate-4.13.0/addons/kate/pate/src/plugins/katepate_format.desktop --- old/kate-4.12.97/addons/kate/pate/src/plugins/katepate_format.desktop 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/addons/kate/pate/src/plugins/katepate_format.desktop 2014-04-07 17:27:59.000000000 +0200 @@ -6,6 +6,7 @@ Name[bs]=Formatiranje C++ koda u Boost stilu Name[ca]=Formatador de codi com el C++ «boost» Name[ca@valencia]=Formatador de codi com el C++ «boost» +Name[da]=Boost-like C++ kodeformatering Name[de]=„C++“-Formatierer ähnlich wie Boost Name[el]=Διαμορφωτής κώδικα C++ τύπου-Boost Name[es]=Formateador de código C++ de tipo boost @@ -41,6 +42,7 @@ Comment[bs]=Pomoć za formatiranje poziva/predložaka u boost stilu Comment[ca]=Ajuda a formatar les crides/plantilles en estil «boost» Comment[ca@valencia]=Ajuda a formatar les crides/plantilles en estil «boost» +Comment[da]=Hjælp til at formatere kald/skabeloner i boost-stil Comment[de]=Hilfe zur Formatierung von Aufrufen / Vorlagen im Boost-Stil Comment[el]=Βοήθεια στη μορφοποίηση κλήσεων/προτύπων σε στιλ boost Comment[es]=Ayuda para formatear llamadas y plantillas en estilo boost diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/addons/kate/pate/src/plugins/katepate_python_autocomplete_jedi.desktop new/kate-4.13.0/addons/kate/pate/src/plugins/katepate_python_autocomplete_jedi.desktop --- old/kate-4.12.97/addons/kate/pate/src/plugins/katepate_python_autocomplete_jedi.desktop 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/addons/kate/pate/src/plugins/katepate_python_autocomplete_jedi.desktop 2014-04-07 17:27:59.000000000 +0200 @@ -6,6 +6,8 @@ Name[bs]=Automatsko kompletiranje za Python Name[ca]=Autocompleció per al Python Name[ca@valencia]=Autocompleció per al Python +Name[cs]=Automatické doplňování Pythonu +Name[da]=Python autofuldførelse Name[de]=Python-Autovervollständigung Name[el]=Αυτόματη συμπλήρωση Python Name[es]=Terminación automática de Python @@ -41,6 +43,8 @@ Comment[bs]=Zasnovano na biblioteci jedi. Comment[ca]=Basat en la biblioteca Jedi Comment[ca@valencia]=Basat en la biblioteca Jedi +Comment[cs]=Založen na knihovně Jedi +Comment[da]=Baseret på biblioteket Jedi Comment[de]=Entwickelt aus der Jedi-Bibliothek Comment[el]=Βασισμένο στη βιβλιοθήκη Jedi Comment[es]=Basado en la biblioteca Jedi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/addons/kate/pate/src/plugins/katepate_try_open_file.desktop new/kate-4.13.0/addons/kate/pate/src/plugins/katepate_try_open_file.desktop --- old/kate-4.12.97/addons/kate/pate/src/plugins/katepate_try_open_file.desktop 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/addons/kate/pate/src/plugins/katepate_try_open_file.desktop 2014-04-07 17:27:59.000000000 +0200 @@ -6,6 +6,7 @@ Name[bs]=Jednostavno otvaranje/kreiranje datoteke. Name[ca]=Obertura/creació senzilla de fitxer Name[ca@valencia]=Obertura/creació senzilla de fitxer +Name[da]=Nem åbning/oprettelse af filer Name[de]=Einfacher Öffnen/Erstellen von Dateien Name[el]=Εύκολο άνοιγμα/δημιουργία αρχείου Name[es]=Apertura y creación sencilla de archivos @@ -40,6 +41,7 @@ Comment[bs]=Pokušaj otvaranja izabranog teksta kao URI u dokument Comment[ca]=Intenta obrir el text seleccionat com un URI a un document Comment[ca@valencia]=Intenta obrir el text seleccionat com un URI a un document +Comment[da]=Prøv at åbne markeret tekst som URI til et dokument Comment[de]=Öffnen des ausgewählten Textes als URI zu einem Dokument Comment[el]=Προσπάθεια για άνοιγμα του επιλεγμένου κειμένου σαν URI σε έγγραφο Comment[es]=Intentar abrir el texto seleccionado como URI de un documento diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/addons/kate/pate/src/plugins/katepate_xml_pretty.desktop new/kate-4.13.0/addons/kate/pate/src/plugins/katepate_xml_pretty.desktop --- old/kate-4.12.97/addons/kate/pate/src/plugins/katepate_xml_pretty.desktop 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/addons/kate/pate/src/plugins/katepate_xml_pretty.desktop 2014-04-07 17:27:59.000000000 +0200 @@ -7,6 +7,7 @@ Name[ca]=Eines XML Name[ca@valencia]=Eines XML Name[cs]=Nástroje XML +Name[da]=XML-værktøjer Name[de]=XML-Werkzeuge Name[el]=Εργαλεία XML Name[es]=Herramientas XML @@ -42,6 +43,7 @@ Comment[bs]=XML lijepi ispis Comment[ca]=Impressió d'XML endreçat Comment[ca@valencia]=Impressió d'XML endreçat +Comment[da]=XML pretty print Comment[de]=XML-Quelltextformatierung Comment[el]=Κομψή αποτύπωση XML Comment[es]=Impresión elegante de XML diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/addons/kate/pate/src/plugins/python_autocomplete/katepate_python_autocomplete.desktop new/kate-4.13.0/addons/kate/pate/src/plugins/python_autocomplete/katepate_python_autocomplete.desktop --- old/kate-4.12.97/addons/kate/pate/src/plugins/python_autocomplete/katepate_python_autocomplete.desktop 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/addons/kate/pate/src/plugins/python_autocomplete/katepate_python_autocomplete.desktop 2014-04-07 17:27:59.000000000 +0200 @@ -6,6 +6,8 @@ Name[bs]=Automatsko kompletiranje za Python Name[ca]=Autocompleció per al Python Name[ca@valencia]=Autocompleció per al Python +Name[cs]=Automatické doplňování Pythonu +Name[da]=Python autofuldførelse Name[de]=Python-Autovervollständigung Name[el]=Αυτόματη συμπλήρωση Python Name[es]=Terminación automática de Python @@ -42,6 +44,7 @@ Comment[ca]=Beta, només pel Python 2 Comment[ca@valencia]=Beta, només pel Python 2 Comment[cs]=Beta, pouze pro Python 2 +Comment[da]=Beta, kun til Python 2 Comment[de]=Beta, nur für Python 2 Comment[el]=Δοκιμαστική έκδοση, μόνο για Python 2 Comment[es]=Beta, solo para Python 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/addons/kate/pate/src/plugins/python_console_classic/katepate_python_console_classic.desktop new/kate-4.13.0/addons/kate/pate/src/plugins/python_console_classic/katepate_python_console_classic.desktop --- old/kate-4.12.97/addons/kate/pate/src/plugins/python_console_classic/katepate_python_console_classic.desktop 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/addons/kate/pate/src/plugins/python_console_classic/katepate_python_console_classic.desktop 2014-04-07 17:27:59.000000000 +0200 @@ -7,6 +7,7 @@ Name[ca]=Consola senzilla del Python Name[ca@valencia]=Consola senzilla del Python Name[cs]=Jednoduchá konzole Pythonu +Name[da]=Simpel Python-konsol Name[de]=Einfache Python-Konsole Name[el]=Απλή κονσόλα Python Name[es]=Consola de Python sencilla @@ -42,6 +43,7 @@ Comment[bs]=Interaktivna konzola za analizu Kata internih stvari i igranje s njima Comment[ca]=Consola interactiva per inspeccionar l'estat intern del Kate i jugar-hi Comment[ca@valencia]=Consola interactiva per inspeccionar l'estat intern del Kate i jugar-hi +Comment[da]=Interaktiv konsol til at inspicere Kate indvendigt og se sig omkring Comment[de]=interaktive Konsole für die Untersuchung der Internas von Kate Comment[el]=Διαδραστική κονσόλα για εξερεύνηση στο εσωτερικό του Kate και παιχνίδι Comment[es]=Consola interactiva para inspeccionar las interioridades de Kate y jugar con ellas diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/addons/kate/pate/src/plugins/python_console_ipython/katepate_python_console_ipython.desktop new/kate-4.13.0/addons/kate/pate/src/plugins/python_console_ipython/katepate_python_console_ipython.desktop --- old/kate-4.12.97/addons/kate/pate/src/plugins/python_console_ipython/katepate_python_console_ipython.desktop 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/addons/kate/pate/src/plugins/python_console_ipython/katepate_python_console_ipython.desktop 2014-04-07 17:27:59.000000000 +0200 @@ -7,6 +7,7 @@ Name[ca]=Consola de l'IPython Name[ca@valencia]=Consola de l'IPython Name[cs]=Konzole IPythonu +Name[da]=IPython-konsol Name[de]=IPython-Konsole Name[el]=Κονσόλα IPython Name[es]=Consola de IPython @@ -43,6 +44,7 @@ Comment[bs]=Interaktivna konzola za naukovanje o hakiranju Kate Comment[ca]=Consola interactiva per a hackejar el Kate i fer ciència Comment[ca@valencia]=Consola interactiva per a hackejar el Kate i fer ciència +Comment[da]=Interaktiv konsol til at hacke kate og bedrive videnskab Comment[de]=interaktive Konsole für das Hacken von Kate und wissenschaftliches Arbeiten Comment[es]=Consola interactiva para hacerse con el control de Kate y hacer ciencia Comment[fi]=Interaktiivinen konsoli Katen kehittämiseen ja tieteen tekemiseen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/addons/kate/pate/src/plugins/python_utils/katepate_python_utils.desktop new/kate-4.13.0/addons/kate/pate/src/plugins/python_utils/katepate_python_utils.desktop --- old/kate-4.12.97/addons/kate/pate/src/plugins/python_utils/katepate_python_utils.desktop 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/addons/kate/pate/src/plugins/python_utils/katepate_python_utils.desktop 2014-04-07 17:27:59.000000000 +0200 @@ -7,6 +7,7 @@ Name[ca]=Utilitats del Python Name[ca@valencia]=Utilitats del Python Name[cs]=Nástroje Pythonu +Name[da]=Python-værktøjer Name[de]=Python-Werkzeuge Name[el]=Εργαλεία Python Name[es]=Utilidades de Python @@ -43,6 +44,7 @@ Comment[bs]=Parse provjera, PEP8 provjera, Pyflakes provjera, Isječci Comment[ca]=Verificador d'anàlisi, verificador PEP8, verificador Pyflakes, retalls Comment[ca@valencia]=Verificador d'anàlisi, verificador PEP8, verificador Pyflakes, retalls +Comment[da]=Fortolkningstjekker, PEP8-tjekker, Pyflakes-tjekker, Tekststumper Comment[de]=Python-Werkzeuge: Parse-Überprüfung, PEP8-Überprüfung, Pyflakes-Überprüfung, Textbausteine Comment[el]=Ελεγκτής ανάλυσης, ελεγκτής PEP8, ελεγκτής Pyflakes, αποσπάσματα κώδικα Comment[es]=Comprobación de análisis sintáctico, comprobador de PEP8, comprobador de Pyflakes, fragmentos de código diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/addons/kate/replicode/katereplicodeplugin.desktop new/kate-4.13.0/addons/kate/replicode/katereplicodeplugin.desktop --- old/kate-4.12.97/addons/kate/replicode/katereplicodeplugin.desktop 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/addons/kate/replicode/katereplicodeplugin.desktop 2014-04-07 17:27:59.000000000 +0200 @@ -7,6 +7,7 @@ Name=Replicode Name[ca]=Replicode Name[ca@valencia]=Replicode +Name[da]=Replicode Name[de]=Replicode Name[el]=Replicode Name[es]=Replicode @@ -35,6 +36,7 @@ Comment=Replicode Comment[ca]=Replicode Comment[ca@valencia]=Replicode +Comment[da]=Replicode Comment[de]=Replicode Comment[el]=Replicode Comment[es]=Replicode @@ -63,6 +65,7 @@ GenericName=Replicode GenericName[ca]=Replicode GenericName[ca@valencia]=Replicode +GenericName[da]=Replicode GenericName[de]=Replicode GenericName[el]=Replicode GenericName[es]=Replicode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/addons/kate/search/plugin_search.cpp new/kate-4.13.0/addons/kate/search/plugin_search.cpp --- old/kate-4.12.97/addons/kate/search/plugin_search.cpp 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/addons/kate/search/plugin_search.cpp 2014-04-07 17:27:59.000000000 +0200 @@ -1564,9 +1564,15 @@ return; } + m_ui.searchCombo->blockSignals(true); + m_ui.matchCase->blockSignals(true); + m_ui.useRegExp->blockSignals(true); m_ui.searchCombo->lineEdit()->setText(m_ui.resultTabWidget->tabText(index)); m_ui.matchCase->setChecked(res->regExp.caseSensitivity() == Qt::CaseSensitive); m_ui.useRegExp->setChecked(res->regExp.patternSyntax() != QRegExp::FixedString); + m_ui.searchCombo->blockSignals(false); + m_ui.matchCase->blockSignals(false); + m_ui.useRegExp->blockSignals(false); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/addons/ktexteditor/lumen/ktexteditor_lumen.desktop new/kate-4.13.0/addons/ktexteditor/lumen/ktexteditor_lumen.desktop --- old/kate-4.12.97/addons/ktexteditor/lumen/ktexteditor_lumen.desktop 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/addons/ktexteditor/lumen/ktexteditor_lumen.desktop 2014-04-07 17:27:59.000000000 +0200 @@ -18,6 +18,8 @@ Name=Lumen Name[ca]=Lumen Name[ca@valencia]=Lumen +Name[cs]=Lumen +Name[da]=Lumen Name[de]=Lumen Name[el]=Lumen Name[es]=Lumen @@ -49,6 +51,8 @@ Comment=Lumen is a Autocompletion Plugin for D, using the DCD autocompletion server Comment[ca]=El Lumen és un connector de compleció automàtica pel D, que utilitza el servidor de compleció automàtica DCD Comment[ca@valencia]=El Lumen és un connector de compleció automàtica pel D, que utilitza el servidor de compleció automàtica DCD +Comment[cs]=Lumen modul pro automatické doplňování D využívající server pro automatické doplňování DCD +Comment[da]=Lumen er et autofuldførelse-plugin til D, som bruger autofuldførelse-serveren DCD Comment[de]=Lumen ist ein Modul zur automatischen Vervollständigung für D und benutzt den DCD-Auto-Vervollständigungs-Server Comment[el]=Το Lumen είναι ένα πρόσθετο αυτόματης συμπλήρωσης για την D, με τη χρήση του εξυπηρετητή αυτόματης συμπλήρωσης DCD Comment[es]=Lumen es un complemento de completado automático para D que utiliza el servidor de completado automático DCD. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/ktexteditor/ktexteditor.desktop new/kate-4.13.0/ktexteditor/ktexteditor.desktop --- old/kate-4.12.97/ktexteditor/ktexteditor.desktop 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/ktexteditor/ktexteditor.desktop 2014-04-07 17:27:59.000000000 +0200 @@ -15,7 +15,7 @@ Comment[es]=Componente empotrable de edición de texto (con separación documentos/vista) Comment[et]=Põimitav tekstiredaktori komponent (dokumendi/vaate eraldamisega) Comment[eu]=Testu-editore osagai kapsulagarria (dokumentu/ikuspegi bereizlearekin) -Comment[fi]=Upotettava tekstimuokkauskomponentti (Asiakirja/Näkymä-jaolla) +Comment[fi]=Upotettava tekstimuokkauskomponentti (Tiedosto/Näkymä-jaolla) Comment[fr]=Composant intégrable d'édition de texte (avec séparation Doc / Vue) Comment[ga]=Comhpháirt eagarthóireacht téacs inleabaithe (le deighilt idir cáipéis agus amharc) Comment[gl]=Compoñente integrábel de edición de texto (cunha Separación Doc/Vista) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/part/script/data/indentation/cstyle.js new/kate-4.13.0/part/script/data/indentation/cstyle.js --- old/kate-4.12.97/part/script/data/indentation/cstyle.js 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/part/script/data/indentation/cstyle.js 2014-04-07 17:27:59.000000000 +0200 @@ -548,7 +548,7 @@ // make sure it's not commented out if (currentString[i] == result[2] && (i == 0 || currentString[i - 1] != '\\')) { // also make sure that this is not a line like '#include "..."' <-- we don't want to indent here - if (currentString.match(/^#include/)) { + if (currentString.match(/^#include/) || currentString.match(/'use strict'/)) { return indentation; } cursor = new Cursor(currentLine, i); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/part/script/data/indentation/haskell.js new/kate-4.13.0/part/script/data/indentation/haskell.js --- old/kate-4.12.97/part/script/data/indentation/haskell.js 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/part/script/data/indentation/haskell.js 2014-04-07 17:27:59.000000000 +0200 @@ -75,7 +75,7 @@ // invocations triggered by a space character should be ignored unless the // line starts with one of the words in re_spaceIndent if (character == ' ') { - if (currentLine.search(re_spaceIndent) == -1 || + if (currentLine.stripWhiteSpace().search(re_spaceIndent) != 0 || !document.isCode(line, document.lineLength(line) - 2)) { dbg("skipping..."); return -2; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/part/vimode/katevinormalmode.cpp new/kate-4.13.0/part/vimode/katevinormalmode.cpp --- old/kate-4.12.97/part/vimode/katevinormalmode.cpp 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/part/vimode/katevinormalmode.cpp 2014-04-07 17:27:59.000000000 +0200 @@ -763,59 +763,63 @@ bool KateViNormalMode::commandDeleteToEOL() { - Cursor c( m_view->cursorPosition() ); - OperationMode m = CharWise; - - if ( m_viInputModeManager->getCurrentViMode() == NormalMode ) { - m_commandRange.startLine = c.line(); - m_commandRange.startColumn = c.column(); - m_commandRange.endLine = c.line()+getCount()-1; - m_commandRange.endColumn = doc()->lineLength( m_commandRange.endLine )-1; - } + Cursor c(m_view->cursorPosition()); + OperationMode m = CharWise; - if ( m_viInputModeManager->getCurrentViMode() == VisualMode - || m_viInputModeManager->getCurrentViMode() == VisualLineMode ) { - m = LineWise; - } else if ( m_viInputModeManager->getCurrentViMode() == VisualBlockMode ) { - m_commandRange.normalize(); m_commandRange.endColumn = KateVi::EOL; - m = Block; - } + switch (m_viInputModeManager->getCurrentViMode()) { + case NormalMode: + m_commandRange.startLine = c.line(); + m_commandRange.startColumn = c.column(); + m_commandRange.endLine = c.line() + getCount() - 1; + break; + case VisualMode: + case VisualLineMode: + m = LineWise; + break; + case VisualBlockMode: + m_commandRange.normalize(); + m = Block; + break; + default: + /* InsertMode and ReplaceMode will never call this method. */ + Q_ASSERT(false); + } - bool r = deleteRange( m_commandRange, m ); + bool r = deleteRange(m_commandRange, m); - switch (m) { - case CharWise: - c.setColumn( doc()->lineLength( c.line() )-1 ); - break; - case LineWise: - c.setLine( m_commandRange.startLine ); - c.setColumn( 0 ); // FIXME: should be first non-blank - break; - case Block: - c.setLine( m_commandRange.startLine ); - c.setColumn( m_commandRange.startColumn-1 ); - break; - } + switch (m) { + case CharWise: + c.setColumn(doc()->lineLength(c.line()) - 1); + break; + case LineWise: + c.setLine(m_commandRange.startLine); + c.setColumn(0); // FIXME: should be first non-blank. + break; + case Block: + c.setLine(m_commandRange.startLine); + c.setColumn(m_commandRange.startColumn - 1); + break; + } - // make sure cursor position is valid after deletion - if ( c.line() < 0 ) { - c.setLine( 0 ); - } - if ( c.line() > doc()->lastLine() ) { - c.setLine( doc()->lastLine() ); - } - if ( c.column() > doc()->lineLength( c.line() )-1 ) { - c.setColumn( doc()->lineLength( c.line() )-1 ); - } - if ( c.column() < 0 ) { - c.setColumn( 0 ); - } + // make sure cursor position is valid after deletion + if (c.line() < 0) { + c.setLine(0); + } + if (c.line() > doc()->lastLine()) { + c.setLine(doc()->lastLine()); + } + if (c.column() > doc()->lineLength(c.line()) - 1) { + c.setColumn(doc()->lineLength(c.line()) - 1); + } + if (c.column() < 0) { + c.setColumn(0); + } - updateCursor( c ); + updateCursor(c); - m_deleteCommand = true; - return r; + m_deleteCommand = true; + return r; } bool KateViNormalMode::commandMakeLowercase() @@ -1122,8 +1126,7 @@ // Position cursor just before first non-whitesspace character of what was the last line joined. c.setColumn(doc()->lineLength(from) - leftTrimmedLastLine.length() - 1); - if (c.column() != -1) - { + if (c.column() >= 0) { updateCursor( c ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/tests/data/indent/cstyle/usestrict/expected new/kate-4.13.0/tests/data/indent/cstyle/usestrict/expected --- old/kate-4.12.97/tests/data/indent/cstyle/usestrict/expected 1970-01-01 01:00:00.000000000 +0100 +++ new/kate-4.13.0/tests/data/indent/cstyle/usestrict/expected 2014-04-07 17:27:59.000000000 +0200 @@ -0,0 +1,4 @@ +function(['asdf']) { + 'use strict'; + ok +// kate: hl JavaScript; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/tests/data/indent/cstyle/usestrict/input.js new/kate-4.13.0/tests/data/indent/cstyle/usestrict/input.js --- old/kate-4.12.97/tests/data/indent/cstyle/usestrict/input.js 1970-01-01 01:00:00.000000000 +0100 +++ new/kate-4.13.0/tests/data/indent/cstyle/usestrict/input.js 2014-04-07 17:27:59.000000000 +0200 @@ -0,0 +1,3 @@ +v.setCursorPosition(1,15); +v.enter(); +v.type("ok"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/tests/data/indent/cstyle/usestrict/origin new/kate-4.13.0/tests/data/indent/cstyle/usestrict/origin --- old/kate-4.12.97/tests/data/indent/cstyle/usestrict/origin 1970-01-01 01:00:00.000000000 +0100 +++ new/kate-4.13.0/tests/data/indent/cstyle/usestrict/origin 2014-04-07 17:27:59.000000000 +0200 @@ -0,0 +1,3 @@ +function(['asdf']) { + 'use strict'; +// kate: hl JavaScript; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.97/tests/vimode_test.cpp new/kate-4.13.0/tests/vimode_test.cpp --- old/kate-4.12.97/tests/vimode_test.cpp 2014-03-25 06:33:18.000000000 +0100 +++ new/kate-4.13.0/tests/vimode_test.cpp 2014-04-07 17:27:59.000000000 +0200 @@ -1622,6 +1622,7 @@ // Testing "D" DoTest("foo bar", "lllD", "foo"); DoTest("foo\nfoo2\nfoo3", "l2D", "f\nfoo3"); + DoTest("qwerty", "d frDai", "wei"); // Testing "d" DoTest("foobar", "ld2l", "fbar"); @@ -1836,6 +1837,13 @@ DoTest("foo\nbar\nxyz\n123", "jdju`.r.", "foo\n.ar\nxyz\n123"); DoTest("foo\nbar\nxyz\n123", "jdju`]r]", "foo\nbar\n]yz\n123"); DoTest("foo\nbar\nxyz\n123", "jVj~u\\esc`[r[", "foo\n[ar\nxyz\n123", ShouldFail, "Vim is weird."); + + // BUG #332523 + BeginTest("asdasdasd\nasdasdasdasdasdasdasd"); + kate_document->setWordWrap(true); + kate_document->setWordWrapAt( 10 ); + TestPressKey("Jii"); + FinishTest("iasdasdasd\n \nasdasdasda \nsdasdasdas \nd"); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit konsole for openSUSE:Factory
by root＠hilbert.suse.de 18 Apr '14

18 Apr '14

Hello community, here is the log from the commit of package konsole for openSUSE:Factory checked in at 2014-04-18 11:35:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/konsole (Old) and /work/SRC/openSUSE:Factory/.konsole.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "konsole" Changes: -------- --- /work/SRC/openSUSE:Factory/konsole/konsole.changes 2014-03-30 08:31:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.konsole.new/konsole.changes 2014-04-18 12:37:27.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 11 16:44:31 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.0 + * KDE 4.13 release + * See http://www.kde.org/announcements/4.13/ + +------------------------------------------------------------------- Old: ---- konsole-4.12.97.tar.xz New: ---- konsole-4.13.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konsole.spec ++++++ --- /var/tmp/diff_new_pack.vFKYfP/_old 2014-04-18 12:37:29.000000000 +0200 +++ /var/tmp/diff_new_pack.vFKYfP/_new 2014-04-18 12:37:29.000000000 +0200 @@ -17,7 +17,7 @@ Name: konsole -Version: 4.12.97 +Version: 4.13.0 Release: 0 Summary: KDE Terminal License: GPL-2.0+ ++++++ konsole-4.12.97.tar.xz -> konsole-4.13.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.12.97/desktop/konsole.desktop new/konsole-4.13.0/desktop/konsole.desktop --- old/konsole-4.12.97/desktop/konsole.desktop 2014-03-24 05:27:53.000000000 +0100 +++ new/konsole-4.13.0/desktop/konsole.desktop 2014-03-31 06:33:41.000000000 +0200 @@ -201,6 +201,7 @@ Name[es]=Abrir una nueva ventana Name[fi]=Avaa uusi ikkuna Name[fr]=Ouvrir dans une nouvelle fenêtre +Name[gl]=Abrir unha xanela nova Name[he]=פתח חלון חדש Name[hu]=Új ablak megnyitása Name[ia]=Aperi un nove fenestra @@ -210,9 +211,11 @@ Name[nb]=Åpne et nytt vindu Name[nds]=En nieg Finster opmaken Name[nl]=Een nieuw venster openen +Name[pa]=ਨਵੀਂ ਵਿੰਡੋ ਖੋਲ੍ਹੋ Name[pl]=Otwórz nowe okno Name[pt]=Abrir uma Nova Janela Name[pt_BR]=Abre uma nova janela +Name[ro]=Deschide o fereastră nouă Name[ru]=Открыть новое окно Name[sk]=Otvoriť nové okno Name[sl]=Odpri novo okno diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.12.97/desktop/konsolerun.desktop new/konsole-4.13.0/desktop/konsolerun.desktop --- old/konsole-4.12.97/desktop/konsolerun.desktop 2014-03-24 05:27:53.000000000 +0100 +++ new/konsole-4.13.0/desktop/konsolerun.desktop 2014-03-31 06:33:41.000000000 +0200 @@ -20,6 +20,7 @@ Name[es]=Ejecutar en Konsole Name[fi]=Suorita Konsolessa Name[fr]=Lancer dans Konsole +Name[gl]=Executar en Konsole Name[he]=הפעל בתוך Konsole Name[hu]=Futtatás a Konsole programban Name[ia]=Executa in Konsole @@ -29,9 +30,11 @@ Name[nb]=Kjør i Konsole Name[nds]=Binnen Konsole lopen Name[nl]=In Konsole uitvoeren +Name[pa]=ਕੰਨਸੋਲ ਵਿੱਚ ਚਲਾਓ Name[pl]=Uruchom w konsoli Name[pt]=Executar no Konsole Name[pt_BR]=Executar no Konsole +Name[ro]=Rulează în Konsolă Name[ru]=Запустить в Konsole Name[sk]=Spustiť v Konsole Name[sl]=Zaženi v Konzoli -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0