January 2016 - openSUSE Commits - openSUSE Mailing Lists

commit kaccounts-providers for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package kaccounts-providers for openSUSE:Factory checked in at 2016-01-23 01:05:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kaccounts-providers (Old) and /work/SRC/openSUSE:Factory/.kaccounts-providers.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kaccounts-providers" Changes: -------- --- /work/SRC/openSUSE:Factory/kaccounts-providers/kaccounts-providers.changes 2016-01-10 13:04:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kaccounts-providers.new/kaccounts-providers.changes 2016-01-23 01:05:54.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:11:40 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- kaccounts-providers-15.12.0.tar.xz New: ---- kaccounts-providers-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kaccounts-providers.spec ++++++ --- /var/tmp/diff_new_pack.Rg5Sja/_old 2016-01-23 01:05:55.000000000 +0100 +++ /var/tmp/diff_new_pack.Rg5Sja/_new 2016-01-23 01:05:55.000000000 +0100 @@ -17,7 +17,7 @@ Name: kaccounts-providers -Version: 15.12.0 +Version: 15.12.1 Release: 0 Summary: KDE Accounts Providers License: GPL-2.0+ ++++++ kaccounts-providers-15.12.0.tar.xz -> kaccounts-providers-15.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kaccounts-providers-15.12.0/CMakeLists.txt new/kaccounts-providers-15.12.1/CMakeLists.txt --- old/kaccounts-providers-15.12.0/CMakeLists.txt 2015-12-09 13:00:36.000000000 +0100 +++ new/kaccounts-providers-15.12.1/CMakeLists.txt 2016-01-07 00:25:19.000000000 +0100 @@ -4,7 +4,7 @@ set(KDE_APPLICATIONS_VERSION_MAJOR "15") set(KDE_APPLICATIONS_VERSION_MINOR "12") -set(KDE_APPLICATIONS_VERSION_MICRO "0") +set(KDE_APPLICATIONS_VERSION_MICRO "1") set(KACCOUNTS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(REQUIRED_QT_VERSION "5.2.0") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kaccounts-providers-15.12.0/Messages.sh new/kaccounts-providers-15.12.1/Messages.sh --- old/kaccounts-providers-15.12.0/Messages.sh 2015-12-09 13:00:36.000000000 +0100 +++ new/kaccounts-providers-15.12.1/Messages.sh 2016-01-07 00:25:19.000000000 +0100 @@ -1,5 +1,5 @@ #! /usr/bin/env bash find . -name "*.provider.in" -o -name "*.service.in" -type f | xargs -n1 intltool-extract -l -type="gettext/xml" -$XGETTEXT `find . -name "*.h" -o -name "*.cpp"` -c -a -o $podir/kaccounts-providers.pot +$XGETTEXT `find . -name "*.h" -o -name "*.cpp"` -c -kN_ -o $podir/kaccounts-providers.pot rm -rf ./tmp/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kaccounts-providers-15.12.0/plugins/owncloud-ui/package/metadata.desktop new/kaccounts-providers-15.12.1/plugins/owncloud-ui/package/metadata.desktop --- old/kaccounts-providers-15.12.0/plugins/owncloud-ui/package/metadata.desktop 2015-12-09 13:00:36.000000000 +0100 +++ new/kaccounts-providers-15.12.1/plugins/owncloud-ui/package/metadata.desktop 2016-01-07 00:25:19.000000000 +0100 @@ -24,6 +24,7 @@ Name[uk]=Додаток QML KAccounts OwnCloud Name[x-test]=xxOwnCloud KAccounts QML pluginxx Name[zh_CN]=OwnCloud KAccounts QML 插件 +Name[zh_TW]=OwnCloud KAccounts QML 外掛程式 Encoding=UTF-8 Type=Service

1 0

commit kaccounts-integration for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package kaccounts-integration for openSUSE:Factory checked in at 2016-01-23 01:05:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kaccounts-integration (Old) and /work/SRC/openSUSE:Factory/.kaccounts-integration.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kaccounts-integration" Changes: -------- --- /work/SRC/openSUSE:Factory/kaccounts-integration/kaccounts-integration.changes 2016-01-07 00:20:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kaccounts-integration.new/kaccounts-integration.changes 2016-01-23 01:05:49.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:11:32 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- kaccounts-integration-15.12.0.tar.xz New: ---- kaccounts-integration-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kaccounts-integration.spec ++++++ --- /var/tmp/diff_new_pack.67wNDJ/_old 2016-01-23 01:05:50.000000000 +0100 +++ /var/tmp/diff_new_pack.67wNDJ/_new 2016-01-23 01:05:50.000000000 +0100 @@ -17,7 +17,7 @@ Name: kaccounts-integration -Version: 15.12.0 +Version: 15.12.1 Release: 0 Summary: KDE Accounts Providers License: GPL-2.0+ ++++++ kaccounts-integration-15.12.0.tar.xz -> kaccounts-integration-15.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kaccounts-integration-15.12.0/CMakeLists.txt new/kaccounts-integration-15.12.1/CMakeLists.txt --- old/kaccounts-integration-15.12.0/CMakeLists.txt 2015-12-08 17:09:04.000000000 +0100 +++ new/kaccounts-integration-15.12.1/CMakeLists.txt 2016-01-07 00:24:49.000000000 +0100 @@ -10,7 +10,7 @@ set(KDE_APPLICATIONS_VERSION_MAJOR "15") set(KDE_APPLICATIONS_VERSION_MINOR "12") -set(KDE_APPLICATIONS_VERSION_MICRO "0") +set(KDE_APPLICATIONS_VERSION_MICRO "1") set(KACCOUNTS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(KACCOUNTS_SOVERSION "1") set(REQUIRED_QT_VERSION "5.2.0")

1 0

commit gpgmepp5 for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package gpgmepp5 for openSUSE:Factory checked in at 2016-01-23 01:05:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gpgmepp5 (Old) and /work/SRC/openSUSE:Factory/.gpgmepp5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gpgmepp5" Changes: -------- --- /work/SRC/openSUSE:Factory/gpgmepp5/gpgmepp5.changes 2016-01-07 00:20:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gpgmepp5.new/gpgmepp5.changes 2016-01-23 01:05:45.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:10:41 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- gpgmepp-15.12.0.tar.xz New: ---- gpgmepp-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpgmepp5.spec ++++++ --- /var/tmp/diff_new_pack.ux6fHp/_old 2016-01-23 01:05:46.000000000 +0100 +++ /var/tmp/diff_new_pack.ux6fHp/_new 2016-01-23 01:05:46.000000000 +0100 @@ -18,7 +18,7 @@ %define kf5_version 5.5.0 Name: gpgmepp5 -Version: 15.12.0 +Version: 15.12.1 Release: 0 Summary: C++ bindings/wrapper for gpgme License: LGPL-2.1+ ++++++ gpgmepp-15.12.0.tar.xz -> gpgmepp-15.12.1.tar.xz ++++++

1 0

commit dragonplayer for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package dragonplayer for openSUSE:Factory checked in at 2016-01-23 01:05:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dragonplayer (Old) and /work/SRC/openSUSE:Factory/.dragonplayer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dragonplayer" Changes: -------- --- /work/SRC/openSUSE:Factory/dragonplayer/dragonplayer.changes 2016-01-07 00:20:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dragonplayer.new/dragonplayer.changes 2016-01-23 01:05:39.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:10:19 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- dragon-15.12.0.tar.xz New: ---- dragon-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dragonplayer.spec ++++++ --- /var/tmp/diff_new_pack.41ba9g/_old 2016-01-23 01:05:40.000000000 +0100 +++ /var/tmp/diff_new_pack.41ba9g/_new 2016-01-23 01:05:40.000000000 +0100 @@ -41,7 +41,7 @@ License: GPL-2.0+ Group: Productivity/Multimedia/Video/Players Url: http://dragonplayer.org/ -Version: 15.12.0 +Version: 15.12.1 Release: 0 Source0: dragon-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ dragon-15.12.0.tar.xz -> dragon-15.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dragon-15.12.0/CMakeLists.txt new/dragon-15.12.1/CMakeLists.txt --- old/dragon-15.12.0/CMakeLists.txt 2015-12-08 16:57:27.000000000 +0100 +++ new/dragon-15.12.1/CMakeLists.txt 2016-01-07 00:10:26.000000000 +0100 @@ -4,7 +4,7 @@ # KDE Application Version, managed by release script set(KDE_APPLICATIONS_VERSION_MAJOR "15") set(KDE_APPLICATIONS_VERSION_MINOR "12") -set(KDE_APPLICATIONS_VERSION_MICRO "0") +set(KDE_APPLICATIONS_VERSION_MICRO "1") set(KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(PROJECT_VERSION ${KDE_APPLICATIONS_VERSION})

1 0

commit dolphin for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package dolphin for openSUSE:Factory checked in at 2016-01-23 01:05:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dolphin (Old) and /work/SRC/openSUSE:Factory/.dolphin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dolphin" Changes: -------- --- /work/SRC/openSUSE:Factory/dolphin/dolphin.changes 2016-01-07 00:20:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dolphin.new/dolphin.changes 2016-01-23 01:05:34.000000000 +0100 @@ -1,0 +2,16 @@ +Thu Jan 14 19:55:08 UTC 2016 - wbauer(a)tmo.at + +- Added Do-not-delete-sub-menus-of-the-control-menu-explicitly.patch: + fixes a possible crash when closing the "Control" menu (boo#952460, + kde#354558) + +------------------------------------------------------------------- +Sat Jan 9 18:10:05 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- dolphin-15.12.0.tar.xz New: ---- Do-not-delete-sub-menus-of-the-control-menu-explicitly.patch dolphin-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dolphin.spec ++++++ --- /var/tmp/diff_new_pack.bgtXEw/_old 2016-01-23 01:05:35.000000000 +0100 +++ /var/tmp/diff_new_pack.bgtXEw/_new 2016-01-23 01:05:35.000000000 +0100 @@ -17,7 +17,7 @@ Name: dolphin -Version: 15.12.0 +Version: 15.12.1 Release: 0 Summary: KDE File Manager License: GPL-2.0+ @@ -26,6 +26,8 @@ Source: dolphin-%{version}.tar.xz Source1: dolphinsu.desktop Patch0: dolphin-go_up.diff +# PATCH-FIX-UPSTREAM Do-not-delete-sub-menus-of-the-control-menu-explicitly.patch boo#952460, kde#354558 -- fixes a possible crash when closing the "Control" menu +Patch1: Do-not-delete-sub-menus-of-the-control-menu-explicitly.patch BuildRequires: baloo5-devel BuildRequires: baloo5-widgets-devel BuildRequires: extra-cmake-modules >= 1.6.0 @@ -94,6 +96,7 @@ %prep %setup -q -n dolphin-%{version} %patch0 -p1 +%patch1 -p1 %build %cmake_kf5 -d build ++++++ Do-not-delete-sub-menus-of-the-control-menu-explicitly.patch ++++++ From: Frank Reininghaus <frank78ac(a)googlemail.com> Date: Sun, 10 Jan 2016 10:18:30 +0000 Subject: Do not delete sub menus of the control menu explicitly X-Git-Url: http://quickgit.kde.org/?p=dolphin.git&a=commitdiff&h=ddc050f23596493e8debd… --- Do not delete sub menus of the control menu explicitly This is not necessary because the sub menus are children of the main menu, such that they are deleted together with the other actions by QMenu::clear(). This prevents a crash that can happen if a sub menu is open while another menu action is clicked. Thanks to Fabian Vogt and Wolfgang Bauer for investigating this issue! BUG: 354558 FIXED-IN: 15.12.2 REVIEW: 126693 --- --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -789,8 +789,8 @@ QMenu* menu = qobject_cast<QMenu*>(sender()); Q_ASSERT(menu); - // All actions get cleared by QMenu::clear(). The sub-menus are deleted - // by connecting to the aboutToHide() signal from the parent-menu. + // All actions get cleared by QMenu::clear(). This includes the sub-menus + // because 'menu' is their parent. menu->clear(); KActionCollection* ac = actionCollection(); @@ -840,7 +840,6 @@ // Add "Go" menu QMenu* goMenu = new QMenu(i18nc("@action:inmenu", "Go"), menu); - connect(menu, &QMenu::aboutToHide, goMenu, &QMenu::deleteLater); goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Back))); goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Forward))); goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Up))); @@ -850,7 +849,6 @@ // Add "Tool" menu QMenu* toolsMenu = new QMenu(i18nc("@action:inmenu", "Tools"), menu); - connect(menu, &QMenu::aboutToHide, toolsMenu, &QMenu::deleteLater); toolsMenu->addAction(ac->action("show_filter_bar")); toolsMenu->addAction(ac->action("compare_files")); toolsMenu->addAction(ac->action("open_terminal")); @@ -864,7 +862,6 @@ // Add "Help" menu QMenu* helpMenu = new QMenu(i18nc("@action:inmenu", "Help"), menu); - connect(menu, &QMenu::aboutToHide, helpMenu, &QMenu::deleteLater); helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::HelpContents))); helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::WhatsThis))); helpMenu->addSeparator(); ++++++ dolphin-15.12.0.tar.xz -> dolphin-15.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-15.12.0/CMakeLists.txt new/dolphin-15.12.1/CMakeLists.txt --- old/dolphin-15.12.0/CMakeLists.txt 2015-12-08 16:49:30.000000000 +0100 +++ new/dolphin-15.12.1/CMakeLists.txt 2016-01-07 00:02:10.000000000 +0100 @@ -5,7 +5,7 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "15") set (KDE_APPLICATIONS_VERSION_MINOR "12") -set (KDE_APPLICATIONS_VERSION_MICRO "0") +set (KDE_APPLICATIONS_VERSION_MICRO "1") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(QT_MIN_VERSION "5.4.0") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-15.12.0/src/dolphinpart.desktop new/dolphin-15.12.1/src/dolphinpart.desktop --- old/dolphin-15.12.0/src/dolphinpart.desktop 2015-12-08 16:49:30.000000000 +0100 +++ new/dolphin-15.12.1/src/dolphinpart.desktop 2016-01-07 00:02:10.000000000 +0100 @@ -72,7 +72,7 @@ Name[it]=Icone Name[ja]=アイコン Name[ko]=아이콘 -Name[lt]=Piktogramos +Name[lt]=Ženkliukai Name[nb]=Ikoner Name[nl]=Pictogrammen Name[nn]=Ikon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-15.12.0/src/org.kde.dolphin.appdata.xml new/dolphin-15.12.1/src/org.kde.dolphin.appdata.xml --- old/dolphin-15.12.0/src/org.kde.dolphin.appdata.xml 2015-12-08 16:49:30.000000000 +0100 +++ new/dolphin-15.12.1/src/org.kde.dolphin.appdata.xml 2016-01-07 00:02:10.000000000 +0100 @@ -109,6 +109,7 @@ Dolphin er en lettvekts filbehandler. Den er laget for å være enkel og lett å bruke, samtidig som den er fleksibel og kan tilpasses. Det betyr at du kan utføre dine filbehandlingsoppgaver akkurat slik du vil gjøre det. Dolphin is en slank Dateipleger. Dat wöör buut mit de Idee vun't eenfache Bedenen vör Ogen, bides dat liekers flexibel un topassbor wesen schull. Du kannst Dien Dateien also jüst so plegen, as Du dat wullt. Dolphin is een lichtgewicht bestandsbeheerder. Het is ontworpen met gebruiksgemak en eenvoud in gedachte en staat toch flexibiliteit en aan te passen toe. Dit betekent dat u uw bestandsbeheer kunt doen precies op de manier zoals u dat wilt. + Dolphin er ein lettvekts filhandsamar. Han er laga for å vera enkel å bruka, samtidig som han er fleksibel og kan tilpassast, slik at kan gjera filhandsamingsoppgåvene nett slik du ønskjer. Dolphin jest lekkim programem do zarządzania plikami. Został on opracowany mając na uwadze łatwość i prostotę obsługi, zapewniając jednocześnie elastyczność i możliwość dostosowania. Oznacza to, że można urządzić zarządzanie plikami w dokładnie taki sposób w jaki jest to pożądane. O Dolphin é um gestor de ficheiros leve. Foi desenhado com a facilidade de uso e simplicidade em mente, permitindo à mesma a flexibilidade e personalização. Isto significa que poderá fazer a sua gestão de ficheiros exactamente da forma que deseja. Dolphin é um gerenciador de arquivos leve e fácil de usar. Foi projetado para ser simples e ao mesmo tempo manter a flexibilidade e personalização. Isso significa que você poderá gerenciar seus arquivos da forma que desejar. @@ -188,6 +189,7 @@ <li xml:lang="nb">Navigasjonslinje (brødsmulelinje) for URL-er slik at du raskt kan navigere gjennom hierarkiet av filer og mapper.</li> <li xml:lang="nds">Steed- (oder Krömelspoor-)Balken för URLs, mit de Du Di fix dör de Hierarchie ut Dateien un Ornern bewegen kannst</li> <li xml:lang="nl">Navigatie- (of broodkruimel)balk voor URL's, waarmee u snel kunt navigeren door de hiërarchie van bestanden en mappen.</li> + <li xml:lang="nn">Navigasjonslinje (brødsmulelinje), slik at du raskt kan navigera gjennom hierarkiet av filer og mapper.</li> <li xml:lang="pl">Pasek nawigacji (lub okruchy chleba) dla adresów URL, umożliwiające szybkie przechodzenie w hierarchii plików i katalogów.</li> <li xml:lang="pt">Barra de navegação dos URL's, que lhe permite navegar rapidamente pela hierarquia de ficheiros e pastas.</li> <li xml:lang="pt-BR">Barra de navegação de URLs, permitindo-lhe navegar rapidamente pela hierarquia de arquivos e pastas.</li> @@ -224,6 +226,7 @@ <li xml:lang="nb">Støtter flere forskjellige visningsstiler og kan sette opp visningen akkurat slik du vil ha den.</li> <li xml:lang="nds">Ünnerstütt en Reeg verscheden Ansichtstilen un -egenschappen un lett Di de Ansicht jüst so topassen, as Du dat bruukst.</li> <li xml:lang="nl">Ondersteunt een aantal verschillende soorten stijlen van weergave en eigenschappen en biedt u de mogelijkheid de weergave in te stellen precies zoals u dat wilt.</li> + <li xml:lang="nn">Støttar fleire ulike visingsstilar, og du kan setja opp visinga nett slik du vil ha ho.</li> <li xml:lang="pl">Obsługa wielu różnych rodzajów stylów widoków i właściwości oraz możliwość ustawienia widoku dopasowanego do potrzeb.</li> <li xml:lang="pt">Suposta diferentes tipos de vistas e propriedades e permite-lhe configurar cada vista exactamente como a deseja.</li> <li xml:lang="pt-BR">Suporte a diferentes tipos de visualização, permitindo-lhe configurar cada modo de exibição da forma que desejar.</li> @@ -260,6 +263,7 @@ <li xml:lang="nb">Delt visning, så du lett kan kopiere eller flytte filer mellom steder.</li> <li xml:lang="nds">Deelt Ansicht, mit De Du Dateien eenfach twischen Steden koperen oder bewegen kannst.</li> <li xml:lang="nl">Gesplitst beeld, waarmee u gemakkelijk bestanden kunt kopiëren of verplaatsen tussen locaties.</li> + <li xml:lang="nn">Delt vising, så du lett kan kopiera eller flytta filer mellom mapper.</li> <li xml:lang="pl">Widok podzielony, umożliwiający łatwe kopiowane lub przenoszenie plików pomiędzy położeniami.</li> <li xml:lang="pt">Uma vista dividida, que lhe permite facilmente copiar ou mover os ficheiros entre locais.</li> <li xml:lang="pt-BR">Um modo de exibição dividido, permitindo-lhe copiar ou mover arquivos facilmente entre locais.</li> @@ -296,6 +300,7 @@ <li xml:lang="nb">Mer informasjon og snarveier er tilgjengelige som dokkbare ruter, som du kan flytte fritt rundt og bruke til å vise akkurat hva du vil.</li> <li xml:lang="nds">Bito-Infos un Leestekens laat sik as Paneels andocken, Du kannst ehr verschuven un se jüst dat wiesen laten, wat Du weten wullt.</li> <li xml:lang="nl">Extra informatie en sneltoetsen zijn beschikbaar als vast te zetten panelen, die u vrij kunt verplaatsen en precies kunt tonen wat u wilt.</li> + <li xml:lang="nn">Tilleggsinformasjon og snarvegar er tilgjengelege som dokkbare ruter, som du kan flytta fritt rundt og bruka til å visa det du ønskjer.</li> <li xml:lang="pl">Dodatkowe szczegóły i skróty dostępne jako dokowalne panele, umożliwiające ich dowolne przenoszenie i wyświetlanie dopasowane do potrzeb.</li> <li xml:lang="pt">Estão disponíveis informações e atalhos adicionais como painéis acopláveis, permitindo-lhe movê-los à vontade e apresentar como desejar.</li> <li xml:lang="pt-BR">As informações e atalhos adicionais estão disponíveis na forma de painéis acopláveis, permitindo-lhe movê-los à vontade e apresentar como desejar.</li> @@ -334,6 +339,7 @@ <li xml:lang="nb">Støtte for flere faner</li> <li xml:lang="nds">Ünnerstütten för Paneels</li> <li xml:lang="nl">Ondersteuning voor meerdere tabbladen</li> + <li xml:lang="nn">Støtte for fleire faner</li> <li xml:lang="pa">ਬਹੁ ਟੈਬ ਸਹਿਯੋਗ</li> <li xml:lang="pl">Obsługa wielu kart</li> <li xml:lang="pt">Suporte para várias páginas</li> @@ -372,6 +378,7 @@ <li xml:lang="nb">Informasjonsdialoger vises på en lite påtrengende måte.</li> <li xml:lang="nds">Informatschoondialogen kaamt Di nich in'n Weg.</li> <li xml:lang="nl">Informatiedialogen worden op een prettige manier getoond.</li> + <li xml:lang="nn">Informasjonsdialogar vert viste på ein lite påtrengjande måte.</li> <li xml:lang="pl">Pokazywanie informacyjnych okien dialogowych w nienatrętny sposób.</li> <li xml:lang="pt">As janelas informativas são apresentadas de forma não-intrusiva.</li> <li xml:lang="pt-BR">As janelas informativas são apresentadas de forma não-intrusiva.</li> @@ -408,6 +415,7 @@ <li xml:lang="nb">Støtte for angring/omgjøring</li> <li xml:lang="nds">Ünnerstütten för Torüchnehmen un Wedderherstellen</li> <li xml:lang="nl">Ondersteuning ongedaan maken/opnieuw</li> + <li xml:lang="nn">Støtte for angring/omgjering</li> <li xml:lang="pa">ਵਾਪਿਸ ਕਰੋ/ਪਰਤਾਉਣ ਸਹਿਯੋਗ</li> <li xml:lang="pl">Obsługa cofnij/ponów</li> <li xml:lang="pt">Suporte para desfazer/refazer</li> @@ -446,6 +454,7 @@ <li xml:lang="nb">Gjennomsiktig nettverkstilgang via KIO-systemet.</li> <li xml:lang="nds">Direkt Nettwarktogriep över dat KDE-In-/Utgaav-(KIO-)Moduulsysteem</li> <li xml:lang="nl">Transparante toegang tot het netwerk via het KIO systeem.</li> + <li xml:lang="nn">Direkte nettverkstilgang via KIO-systemet.</li> <li xml:lang="pl">Przezroczysty dostęp do sieci przez system KIO.</li> <li xml:lang="pt">Acesso transparente à rede através do sistema KIO.</li> <li xml:lang="pt-BR">Acesso transparente à rede através do sistema KIO.</li> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-15.12.0/src/settings/kcm/kcmdolphingeneral.desktop new/dolphin-15.12.1/src/settings/kcm/kcmdolphingeneral.desktop --- old/dolphin-15.12.0/src/settings/kcm/kcmdolphingeneral.desktop 2015-12-08 16:49:30.000000000 +0100 +++ new/dolphin-15.12.1/src/settings/kcm/kcmdolphingeneral.desktop 2016-01-07 00:02:10.000000000 +0100 @@ -56,7 +56,7 @@ Comment[it]=Questo servizio permette di configurare le impostazioni generali di Dolphin. Comment[ja]=Dolphin の全般的な設定を行います Comment[ko]=이 서비스는 일반 Dolphin 설정을 담당합니다. -Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin bendruosius nustatymus. +Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin bendruosius nuostatas. Comment[nb]=Med denne tjenesten kan du sette opp generelle innstillinger for Dolphin. Comment[nl]=Met deze dienst kunt u algemene Dolphin-instellingen configureren. Comment[nn]=Denne tenesta lèt deg setja opp generelle innstillingar for Dolphin. @@ -145,7 +145,7 @@ Comment[it]=Configura le impostazioni generali del gestore dei file Comment[ja]=ファイルマネージャの全般的な設定を行います Comment[ko]=일반 파일 관리자 설정 -Comment[lt]=Bendrųjų failų tvarkyklės nustatymų konfigūravimas +Comment[lt]=Bendrųjų failų tvarkyklės nuostatų konfigūravimas Comment[nb]=Sett opp generelle innstillinger for filbehandleren Comment[nl]=Algemene bestandsbeheerderinstellingen configureren Comment[nn]=Set opp generelle innstillingar for filhandsamaren diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-15.12.0/src/views/versioncontrol/fileviewversioncontrolplugin.desktop new/dolphin-15.12.1/src/views/versioncontrol/fileviewversioncontrolplugin.desktop --- old/dolphin-15.12.0/src/views/versioncontrol/fileviewversioncontrolplugin.desktop 2015-12-08 16:49:30.000000000 +0100 +++ new/dolphin-15.12.1/src/views/versioncontrol/fileviewversioncontrolplugin.desktop 2016-01-07 00:02:10.000000000 +0100 @@ -19,7 +19,7 @@ Comment[it]=Estensione di controllo delle versioni per le viste dei file Comment[ja]=ファイルビューのためのバージョン管理プラグイン Comment[ko]=파일 보기를 위한 버전 관리 플러그인 -Comment[lt]=Versijų kontrolės priedas failų tvarkyklėms +Comment[lt]=Versijų kontrolės papildinys failų tvarkyklėms Comment[nb]=Versjonskontrollmodul for filvisninger Comment[nl]=Plugin voor versiecontrole op bestandoverzichten Comment[nn]=Versjonskontroll-tillegg for filvisingar

1 0

commit baloo5-widgets for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package baloo5-widgets for openSUSE:Factory checked in at 2016-01-23 01:05:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/baloo5-widgets (Old) and /work/SRC/openSUSE:Factory/.baloo5-widgets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "baloo5-widgets" Changes: -------- --- /work/SRC/openSUSE:Factory/baloo5-widgets/baloo5-widgets.changes 2016-01-07 00:19:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.baloo5-widgets.new/baloo5-widgets.changes 2016-01-23 01:05:30.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:09:22 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- baloo-widgets-15.12.0.tar.xz New: ---- baloo-widgets-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ baloo5-widgets.spec ++++++ --- /var/tmp/diff_new_pack.EZIaff/_old 2016-01-23 01:05:30.000000000 +0100 +++ /var/tmp/diff_new_pack.EZIaff/_new 2016-01-23 01:05:31.000000000 +0100 @@ -18,7 +18,7 @@ Name: baloo5-widgets -Version: 15.12.0 +Version: 15.12.1 Release: 0 Summary: Framework for searching and managing metadata License: GPL-2.0+ and LGPL-2.1+ and LGPL-3.0 ++++++ baloo-widgets-15.12.0.tar.xz -> baloo-widgets-15.12.1.tar.xz ++++++

1 0

commit ark for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package ark for openSUSE:Factory checked in at 2016-01-23 01:05:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ark (Old) and /work/SRC/openSUSE:Factory/.ark.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ark" Changes: -------- --- /work/SRC/openSUSE:Factory/ark/ark.changes 2016-01-07 00:24:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ark.new/ark.changes 2016-01-23 01:05:25.000000000 +0100 @@ -1,0 +2,12 @@ +Sat Jan 9 18:08:50 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + +- Drop upstream patch + * Fix-ark-cannout-open-rar-file-with-space-in-archive-file-path.patch + * Fallback-to-read-only-mode-if-there-are-no-read-write-executables.patch + +------------------------------------------------------------------- Old: ---- Fallback-to-read-only-mode-if-there-are-no-read-write-executables.patch Fix-ark-cannout-open-rar-file-with-space-in-archive-file-path.patch ark-15.12.0.tar.xz New: ---- ark-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ark.spec ++++++ --- /var/tmp/diff_new_pack.7Oy0KB/_old 2016-01-23 01:05:26.000000000 +0100 +++ /var/tmp/diff_new_pack.7Oy0KB/_new 2016-01-23 01:05:26.000000000 +0100 @@ -17,23 +17,18 @@ Name: ark -Version: 15.12.0 +Version: 15.12.1 Release: 0 Summary: KDE Archiver Tool License: GPL-2.0+ Group: Productivity/Other Url: http://www.kde.org Source0: ark-%{version}.tar.xz -# PATCH-FIX-UPSTREAM Fix-ark-cannout-open-rar-file-with-space-in-archive-file-path.patch boo#959996 -- fixes opening rar files with a space in the file path -Patch0: Fix-ark-cannout-open-rar-file-with-space-in-archive-file-path.patch -# PATCH-FIX-UPSTREAM Fallback-to-read-only-mode-if-there-are-no-read-write-executables.patch boo#959996, kde#357057 -- fixes opening archives when the executable to create a new archive (e.g. rar or zip) is not installed -Patch1: Fallback-to-read-only-mode-if-there-are-no-read-write-executables.patch BuildRequires: extra-cmake-modules >= 1.7.0 BuildRequires: karchive-devel >= 5.2.0 BuildRequires: kconfig-devel >= 5.2.0 BuildRequires: kdelibs4support-devel >= 5.2.0 BuildRequires: kf5-filesystem -BuildRequires: khtml-devel >= 5.2.0 BuildRequires: kpty-devel >= 5.2.0 BuildRequires: libarchive-devel >= 3.0.0 BuildRequires: libzip-devel @@ -64,8 +59,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build %cmake_kf5 -d build ++++++ ark-15.12.0.tar.xz -> ark-15.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.0/CMakeLists.txt new/ark-15.12.1/CMakeLists.txt --- old/ark-15.12.0/CMakeLists.txt 2015-12-15 08:42:30.000000000 +0100 +++ new/ark-15.12.1/CMakeLists.txt 2016-01-07 00:07:30.000000000 +0100 @@ -7,7 +7,7 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "15") set (KDE_APPLICATIONS_VERSION_MINOR "12") -set (KDE_APPLICATIONS_VERSION_MICRO "0") +set (KDE_APPLICATIONS_VERSION_MICRO "1") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CTestCustom.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.0/app/ark_addtoservicemenu.desktop new/ark-15.12.1/app/ark_addtoservicemenu.desktop --- old/ark-15.12.0/app/ark_addtoservicemenu.desktop 2015-12-15 08:42:30.000000000 +0100 +++ new/ark-15.12.1/app/ark_addtoservicemenu.desktop 2016-01-07 00:07:30.000000000 +0100 @@ -80,6 +80,7 @@ Name[hu]=Ide (tar.gz-ként) Name[it]=Qui (come TAR.GZ) Name[ko]=여기(TAR.GZ로) +Name[lt]=Čia (TAR.GZ) Name[nl]=Hier (als TAR.GZ) Name[pl]=Tutaj (jako TAR.GZ) Name[pt]=Aqui (como TAR.GZ) @@ -115,6 +116,7 @@ Name[hu]=Ide (zip-ként) Name[it]=Qui (come ZIP) Name[ko]=여기(ZIP으로) +Name[lt]=Čia (ZIP) Name[nl]=Hier (als ZIP) Name[pl]=Tutaj (jako ZIP) Name[pt]=Aqui (como ZIP) @@ -150,6 +152,7 @@ Name[hu]=Ide (rar-ként) Name[it]=Qui (come RAR) Name[ko]=여기(RAR로) +Name[lt]=Čia (RAR) Name[nl]=Hier (als RAR) Name[pl]=Tutaj (jako RAR) Name[pt]=Aqui (como RAR) @@ -185,6 +188,7 @@ Name[hu]=Tömörítés ide… Name[it]=Comprimi in... Name[ko]=다음으로 압축하기... +Name[lt]=Suspausti... Name[nl]=Comprimeren naar... Name[pl]=Spakuj do... Name[pt]=Comprimir Para... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.0/app/ark_dndextract.desktop.cmake new/ark-15.12.1/app/ark_dndextract.desktop.cmake --- old/ark-15.12.0/app/ark_dndextract.desktop.cmake 2015-12-15 08:42:30.000000000 +0100 +++ new/ark-15.12.1/app/ark_dndextract.desktop.cmake 2016-01-07 00:07:30.000000000 +0100 @@ -30,7 +30,7 @@ Name[kk]=Мынаған тарқату Name[km]=ស្រង់ចេញ Ark នៅទីនេះ Name[ko]=Ark 여기에 풀기 -Name[lt]=Čia išpakuoti archyvą +Name[lt]=Išpakuoti čia su Ark Name[lv]=Ark atspiest šeit Name[mr]=येथे आर्क पुर्ववत करा Name[nb]=Pakk ut arkivet her med Ark diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.0/app/ark_servicemenu.desktop.cmake new/ark-15.12.1/app/ark_servicemenu.desktop.cmake --- old/ark-15.12.0/app/ark_servicemenu.desktop.cmake 2015-12-15 08:42:30.000000000 +0100 +++ new/ark-15.12.1/app/ark_servicemenu.desktop.cmake 2016-01-07 00:07:30.000000000 +0100 @@ -72,6 +72,7 @@ Name[gl]=Extraer o arquivo aquí Name[it]=Estrai l'archivio qui Name[ko]=여기에 압축 풀기 +Name[lt]=Išpakuoti čia Name[nl]=Archief hier uitpakken Name[pl]=Wypakuj archiwum tutaj Name[pt]=Extrair o pacote para aqui @@ -85,6 +86,7 @@ Name[sv]=Packa upp arkiv här Name[uk]=Видобути архів сюди Name[x-test]=xxExtract archive herexx +Name[zh_CN]=在此解压缩归档 Name[zh_TW]=在此解壓縮 Icon=ark Exec=ark --batch --autodestination %F @@ -104,6 +106,7 @@ Name[gl]=Extraer o arquivo en… Name[it]=Estrai l'archivio in... Name[ko]=다음 경로에 압축 풀기... +Name[lt]=Išpakuoti į... Name[nl]=Archief uitpakken naar... Name[pl]=Wypakuj archiwum do... Name[pt]=Extrair o pacote para... @@ -117,6 +120,7 @@ Name[sv]=Packa upp arkiv i... Name[uk]=Видобути архів до… Name[x-test]=xxExtract archive to...xx +Name[zh_CN]=解压缩归档到... Name[zh_TW]=解壓縮到... Icon=ark Exec=ark --batch --autodestination --dialog %F @@ -136,6 +140,7 @@ Name[gl]=Extraer o arquivo aquí, detectar o subcartafol Name[it]=Estrai l'archivio qui, autorileva la sottocartella Name[ko]=하위 폴더를 감지해서 여기에 압축 풀기 +Name[lt]=Išpakuoti čia, į poaplankį Name[nl]=Archief hier uitpakken, submap autodetecteren Name[pl]=Wypakuj archiwum tutaj, wykryj podkatalogi Name[pt]=Extrair o pacote aqui com detecção da sub-pasta @@ -149,6 +154,7 @@ Name[sv]=Packa upp arkiv här, detektera underkatalog automatiskt Name[uk]=Видобути архів сюди, автоматично визначити підтеку Name[x-test]=xxExtract archive here, autodetect subfolderxx +Name[zh_CN]=在此解压缩归档，自动探测子文件夹 Name[zh_TW]=在此解壓縮，自動偵測子資料夾 Icon=ark Exec=ark --batch --autodestination --autosubfolder %F diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.0/app/org.kde.ark.desktop.cmake new/ark-15.12.1/app/org.kde.ark.desktop.cmake --- old/ark-15.12.0/app/org.kde.ark.desktop.cmake 2015-12-15 08:42:30.000000000 +0100 +++ new/ark-15.12.1/app/org.kde.ark.desktop.cmake 2016-01-07 00:07:30.000000000 +0100 @@ -170,6 +170,7 @@ Comment[gl]=Traballa con arquivos de ficheiros Comment[it]=Lavora con gli archivi di file Comment[ko]=압축 파일로 작업하기 +Comment[lt]=Darbas su archyvais Comment[nl]=Mert bestandsarchieven werken Comment[pl]=Pracuj z archiwami plików Comment[pt]=Lidar com pacotes em ficheiros diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.0/kerfuffle/archive_kerfuffle.cpp new/ark-15.12.1/kerfuffle/archive_kerfuffle.cpp --- old/ark-15.12.0/kerfuffle/archive_kerfuffle.cpp 2015-12-15 08:42:30.000000000 +0100 +++ new/ark-15.12.1/kerfuffle/archive_kerfuffle.cpp 2016-01-07 00:07:30.000000000 +0100 @@ -173,6 +173,9 @@ if (iface->findExecutables(!isReadOnly)) { return new Archive(iface, isReadOnly, parent); + } else if (!isReadOnly && iface->findExecutables(false)) { + qCWarning(ARK) << "Failed to find read-write executables: falling back to read-only mode for read-write plugin" << pluginName; + return new Archive(iface, true, parent); } else { qCWarning(ARK) << "Failed to find needed executables for plugin" << pluginName; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.0/kerfuffle/kerfufflePlugin.desktop new/ark-15.12.1/kerfuffle/kerfufflePlugin.desktop --- old/ark-15.12.0/kerfuffle/kerfufflePlugin.desktop 2015-12-15 08:42:30.000000000 +0100 +++ new/ark-15.12.1/kerfuffle/kerfufflePlugin.desktop 2016-01-07 00:07:30.000000000 +0100 @@ -31,7 +31,7 @@ Comment[kk]=Kerfuffle жиын файлға арналған архив пішіндерімен айналасу плагині Comment[km]=កម្មវិធីជំនួយសម្រាប់គ្រប់គ្រងទ្រង់ទ្រាយប័ណ្ណសារសម្រាប់បណ្ណាល័យ Kerfuffle Comment[ko]=Kerfuffle 라이브러리를 위한 압축 파일 플러그인 -Comment[lt]=Kerfuffle bibliotekos archyvų formatų palaikymo priedas +Comment[lt]=Kerfuffle bibliotekos archyvų formatų palaikymo papildinys Comment[lv]=Arhīva failu tipu izmantošanas spraudnis Kerfuffle bibliotēkai. Comment[mr]=कर्फफल लायब्ररी करिताचे संग्रह प्रकार हाताळणारे प्लगइन Comment[nb]=Programtillegg som håndterer arkivformater, for Kerfuffle-biblioteket diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.0/part/archivemodel.cpp new/ark-15.12.1/part/archivemodel.cpp --- old/ark-15.12.0/part/archivemodel.cpp 2015-12-15 08:42:30.000000000 +0100 +++ new/ark-15.12.1/part/archivemodel.cpp 2016-01-07 00:07:30.000000000 +0100 @@ -875,7 +875,7 @@ return m_archive.data(); } -KJob* ArchiveModel::setArchive(Kerfuffle::Archive *archive) +KJob* ArchiveModel::setArchive(Kerfuffle::Archive *archive, bool existingArchive) { m_archive.reset(archive); @@ -886,7 +886,7 @@ Kerfuffle::ListJob *job = Q_NULLPTR; m_newArchiveEntries.clear(); - if (m_archive) { + if (m_archive && existingArchive) { job = m_archive->list(); // TODO: call "open" or "create"? connect(job, &Kerfuffle::ListJob::newEntry, this, &ArchiveModel::slotNewEntryFromSetArchive); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.0/part/archivemodel.h new/ark-15.12.1/part/archivemodel.h --- old/ark-15.12.0/part/archivemodel.h 2015-12-15 08:42:30.000000000 +0100 +++ new/ark-15.12.1/part/archivemodel.h 2016-01-07 00:07:30.000000000 +0100 @@ -63,7 +63,7 @@ QMimeData * mimeData(const QModelIndexList & indexes) const Q_DECL_OVERRIDE; bool dropMimeData(const QMimeData * data, Qt::DropAction action, int row, int column, const QModelIndex & parent) Q_DECL_OVERRIDE; - KJob* setArchive(Kerfuffle::Archive *archive); + KJob* setArchive(Kerfuffle::Archive *archive, bool existingArchive = false); Kerfuffle::Archive *archive() const; Kerfuffle::ArchiveEntry entryForIndex(const QModelIndex &index); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.0/part/arkviewer.cpp new/ark-15.12.1/part/arkviewer.cpp --- old/ark-15.12.0/part/arkviewer.cpp 2015-12-15 08:42:30.000000000 +0100 +++ new/ark-15.12.1/part/arkviewer.cpp 2016-01-07 00:07:30.000000000 +0100 @@ -163,7 +163,6 @@ if (viewInInternalViewer) { qCDebug(ARK) << "Opening internal viewer"; ArkViewer *internalViewer = new ArkViewer(parent, Qt::Window); - internalViewer->setModal(Qt::WindowModal); internalViewer->show(); if (internalViewer->viewInInternalViewer(fileName, mimeType)) { // The internal viewer is showing the file, and will diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.0/part/part.cpp new/ark-15.12.1/part/part.cpp --- old/ark-15.12.0/part/part.cpp 2015-12-15 08:42:30.000000000 +0100 +++ new/ark-15.12.1/part/part.cpp 2016-01-07 00:07:30.000000000 +0100 @@ -229,6 +229,8 @@ // Create and start the ExtractJob. ExtractJob *job = m_model->extractFiles(filesAndRootNodesForIndexes(addChildren(m_view->selectionModel()->selectedRows())), destination, options); registerJob(job); + connect(job, &KJob::result, + this, &Part::slotExtractionDone); job->start(); } @@ -503,9 +505,14 @@ Q_ASSERT(archive->isValid()); // Plugin loaded successfully. - KJob *job = m_model->setArchive(archive.take()); - registerJob(job); - job->start(); + KJob *job = m_model->setArchive(archive.take(), localFileInfo.exists()); + if (job) { + registerJob(job); + job->start(); + } else { + updateActions(); + } + m_infoPanel->setIndex(QModelIndex()); if (arguments().metaData()[QStringLiteral("showExtractDialog")] == QLatin1String("true")) { @@ -587,7 +594,7 @@ updateActions(); - if (!m_model->archive()->comment().isEmpty()) { + if (m_model->archive() && !m_model->archive()->comment().isEmpty()) { m_commentView->setPlainText(m_model->archive()->comment()); m_commentBox->show(); m_commentSplitter->setSizes(QList<int>() << m_view->height() * 0.6 << 1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.0/plugins/cli7zplugin/kerfuffle_cli7z.desktop.cmake new/ark-15.12.1/plugins/cli7zplugin/kerfuffle_cli7z.desktop.cmake --- old/ark-15.12.0/plugins/cli7zplugin/kerfuffle_cli7z.desktop.cmake 2015-12-15 08:42:30.000000000 +0100 +++ new/ark-15.12.1/plugins/cli7zplugin/kerfuffle_cli7z.desktop.cmake 2016-01-07 00:07:30.000000000 +0100 @@ -41,7 +41,7 @@ Name[kk]=7zip архив плагині Name[km]=កម្មវិធីជំនួយប័ណ្ណសារ 7zip Name[ko]=7zip 압축 플러그인 -Name[lt]=7zip archyvo priedas +Name[lt]=7zip archyvo papildinys Name[lv]=7zip arhīvu spraudnis Name[mr]=7ZIP संग्रह प्लगइन Name[nb]=Programtillegg for 7zip-arkiv diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.0/plugins/clilhaplugin/kerfuffle_clilha.desktop.cmake new/ark-15.12.1/plugins/clilhaplugin/kerfuffle_clilha.desktop.cmake --- old/ark-15.12.0/plugins/clilhaplugin/kerfuffle_clilha.desktop.cmake 2015-12-15 08:42:30.000000000 +0100 +++ new/ark-15.12.1/plugins/clilhaplugin/kerfuffle_clilha.desktop.cmake 2016-01-07 00:07:30.000000000 +0100 @@ -37,7 +37,7 @@ Name[kk]=lha архив плагині Name[km]=កម្មវិធីជំនួយប័ណ្ណសារ lha Name[ko]=LHA 압축 플러그인 -Name[lt]=lha archyvo priedas +Name[lt]=lha archyvo papildinys Name[mr]=lha संग्रह प्लगइन Name[nb]=Programtillegg for lha-arkiv Name[nds]=LHA-Archievmoduul diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.0/plugins/cliplugin-example/kerfuffle_cli.desktop new/ark-15.12.1/plugins/cliplugin-example/kerfuffle_cli.desktop --- old/ark-15.12.0/plugins/cliplugin-example/kerfuffle_cli.desktop 2015-12-15 08:42:30.000000000 +0100 +++ new/ark-15.12.1/plugins/cliplugin-example/kerfuffle_cli.desktop 2016-01-07 00:07:30.000000000 +0100 @@ -37,7 +37,7 @@ Name[kk]=TODO архив плагині Name[km]=កម្មវិធីជំនួយប័ណ្ណសាររបស់ការងារត្រូវធ្វើ Name[ko]=TODO 압축 플러그인 -Name[lt]=PADARYTI archyvų priedas +Name[lt]=PADARYTI archyvų papildinys Name[lv]=TODO arhīvu spraudnis Name[mr]=TODO संग्रह प्लगइन Name[nb]=Programtillegg for gjøremålsarkiv diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.0/plugins/clirarplugin/cliplugin.cpp new/ark-15.12.1/plugins/clirarplugin/cliplugin.cpp --- old/ark-15.12.0/plugins/clirarplugin/cliplugin.cpp 2015-12-15 08:42:30.000000000 +0100 +++ new/ark-15.12.1/plugins/clirarplugin/cliplugin.cpp 2016-01-07 00:07:30.000000000 +0100 @@ -172,7 +172,8 @@ if (m_parseState == ParseStateComment) { // RegExp matching end of comment field. - QRegularExpression rxCommentEnd(QStringLiteral("^Archive: \\S+$")); + // FIXME: Comment itself could also contain the Archive path string here. + QRegularExpression rxCommentEnd(QStringLiteral("^Archive: .+$")); if (rxCommentEnd.match(line).hasMatch()) { m_parseState = ParseStateHeader; @@ -293,7 +294,8 @@ if (m_parseState == ParseStateComment) { // RegExp matching end of comment field. - QRegularExpression rxCommentEnd(QStringLiteral("^(Solid archive|Archive|Volume) \\S+$")); + // FIXME: Comment itself could also contain the Archive path string here. + QRegularExpression rxCommentEnd(QStringLiteral("^(Solid archive|Archive|Volume) .+$")); if (rxCommentEnd.match(line).hasMatch()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.0/plugins/clirarplugin/kerfuffle_clirar.desktop.cmake new/ark-15.12.1/plugins/clirarplugin/kerfuffle_clirar.desktop.cmake --- old/ark-15.12.0/plugins/clirarplugin/kerfuffle_clirar.desktop.cmake 2015-12-15 08:42:30.000000000 +0100 +++ new/ark-15.12.1/plugins/clirarplugin/kerfuffle_clirar.desktop.cmake 2016-01-07 00:07:30.000000000 +0100 @@ -41,7 +41,7 @@ Name[kk]=RAR архив плагині Name[km]=កម្មវិធីជំនួយប័ណ្ណសារ RAR Name[ko]=RAR 압축 플러그인 -Name[lt]=RAR archyvo priedas +Name[lt]=RAR archyvo papildinys Name[lv]=RAR arhīvu spraudnis Name[mr]=RAR संग्रह प्लगइन Name[nb]=Programtillegg for RAR-arkiv diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.0/plugins/clizipplugin/kerfuffle_clizip.desktop.cmake new/ark-15.12.1/plugins/clizipplugin/kerfuffle_clizip.desktop.cmake --- old/ark-15.12.0/plugins/clizipplugin/kerfuffle_clizip.desktop.cmake 2015-12-15 08:42:30.000000000 +0100 +++ new/ark-15.12.1/plugins/clizipplugin/kerfuffle_clizip.desktop.cmake 2016-01-07 00:07:30.000000000 +0100 @@ -40,7 +40,7 @@ Name[kk]=ZIP архив плагині Name[km]=កម្មវិធីជំនួយប័ណ្ណសារ ZIP Name[ko]=ZIP 압축 플러그인 -Name[lt]=ZIP archyvo priedas +Name[lt]=ZIP archyvo papildinys Name[lv]=ZIP arhīvu spraudnis Name[mr]=ZIP संग्रह प्लगइन Name[nb]=Programtillegg for ZIP-arkiv diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.0/plugins/karchiveplugin/kerfuffle_karchive.desktop.cmake new/ark-15.12.1/plugins/karchiveplugin/kerfuffle_karchive.desktop.cmake --- old/ark-15.12.0/plugins/karchiveplugin/kerfuffle_karchive.desktop.cmake 2015-12-15 08:42:30.000000000 +0100 +++ new/ark-15.12.1/plugins/karchiveplugin/kerfuffle_karchive.desktop.cmake 2016-01-07 00:07:30.000000000 +0100 @@ -99,7 +99,7 @@ Comment[kk]=Kerfuffle-ге арналған KArchive плагині Comment[km]=កម្មវិធីរបស់ KArchive សម្រាប់ Kerfuffle Comment[ko]=Kerfuffle을 위한 KArchive 플러그인 -Comment[lt]=KArchive Kerfuffle priedas +Comment[lt]=KArchive Kerfuffle papildinys Comment[lv]=Kerfuffle KArchive spraudnis Comment[mr]=कर्फफल करिता के-संग्रह प्लगइन Comment[nb]=KArchive programtillegg for Kerfuffle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.0/plugins/libarchive/kerfuffle_libarchive.desktop.cmake new/ark-15.12.1/plugins/libarchive/kerfuffle_libarchive.desktop.cmake --- old/ark-15.12.0/plugins/libarchive/kerfuffle_libarchive.desktop.cmake 2015-12-15 08:42:30.000000000 +0100 +++ new/ark-15.12.1/plugins/libarchive/kerfuffle_libarchive.desktop.cmake 2016-01-07 00:07:30.000000000 +0100 @@ -100,7 +100,7 @@ Comment[kk]=Kerfuffle-ге арналған LibArchive плагині Comment[km]=កម្មវិធីជំនួយ LibArchive សម្រាប់ Kerfuffle Comment[ko]=Kerfuffle을 위한 LibArchive 플러그인 -Comment[lt]=LibArchive Kerfuffle priedas +Comment[lt]=LibArchive Kerfuffle papildinys Comment[lv]=Kerfuffle LibArchive spraudnis Comment[mr]=कर्फफल करिता लिब-संग्रह प्लगइन Comment[nb]=LibArchive programtillegg for Kerfuffle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.0/plugins/libsinglefileplugin/kerfuffle_libbz2.desktop new/ark-15.12.1/plugins/libsinglefileplugin/kerfuffle_libbz2.desktop --- old/ark-15.12.0/plugins/libsinglefileplugin/kerfuffle_libbz2.desktop 2015-12-15 08:42:30.000000000 +0100 +++ new/ark-15.12.1/plugins/libsinglefileplugin/kerfuffle_libbz2.desktop 2016-01-07 00:07:30.000000000 +0100 @@ -95,7 +95,7 @@ Comment[kk]=Kerfuffle-ге арналған libbz2 плагині Comment[km]=កម្មវិធីជំនួយ libbz2 សម្រាប់ Kerfuffle Comment[ko]=Kerfuffle을 위한 libbz2 플러그인 -Comment[lt]=libbz2 Kerfuffle priedas +Comment[lt]=libbz2 Kerfuffle papildinys Comment[lv]=Kerfuffle libz2 spraudnis Comment[mr]=कर्फफल करिता लिब-बिझेड२ प्लगइन Comment[nb]=libbz2 pprogramtillegg for Kerfuffle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.0/plugins/libsinglefileplugin/kerfuffle_libgz.desktop new/ark-15.12.1/plugins/libsinglefileplugin/kerfuffle_libgz.desktop --- old/ark-15.12.0/plugins/libsinglefileplugin/kerfuffle_libgz.desktop 2015-12-15 08:42:30.000000000 +0100 +++ new/ark-15.12.1/plugins/libsinglefileplugin/kerfuffle_libgz.desktop 2016-01-07 00:07:30.000000000 +0100 @@ -97,7 +97,7 @@ Comment[kk]=Kerfuffle-ге арналған libgz плагині Comment[km]=កម្មវិធីជំនួយ libgz សម្រាប់ Kerfuffle Comment[ko]=Kerfuffle을 위한 libgz 플러그인 -Comment[lt]=libgz Kerfuffle priedas +Comment[lt]=libgz Kerfuffle papildinys Comment[lv]=Kerfuffle libgz spraudnis Comment[mr]=कर्फफल करिता लिब-जिझेड प्लगइन Comment[nb]=libgz pprogramtillegg for Kerfuffle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.0/plugins/libsinglefileplugin/kerfuffle_libxz.desktop new/ark-15.12.1/plugins/libsinglefileplugin/kerfuffle_libxz.desktop --- old/ark-15.12.0/plugins/libsinglefileplugin/kerfuffle_libxz.desktop 2015-12-15 08:42:30.000000000 +0100 +++ new/ark-15.12.1/plugins/libsinglefileplugin/kerfuffle_libxz.desktop 2016-01-07 00:07:30.000000000 +0100 @@ -95,7 +95,7 @@ Comment[kk]=Kerfuffle-ге арналған libxz плагині Comment[km]=កម្មវិធីជំនួយ libxz សម្រាប់ Kerfuffle Comment[ko]=Kerfuffle을 위한 libxz 플러그인 -Comment[lt]=libxz Kerfuffle priedas +Comment[lt]=libxz Kerfuffle papildinys Comment[lv]=Kerfuffle libxz spraudnis Comment[mr]=कर्फफल करिता लिब-एक्सझेड प्लगइन Comment[nb]=libxz pprogramtillegg for Kerfuffle

1 0

commit akonadi-server for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package akonadi-server for openSUSE:Factory checked in at 2016-01-23 01:05:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-server (Old) and /work/SRC/openSUSE:Factory/.akonadi-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "akonadi-server" Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-server/akonadi-server.changes 2016-01-07 00:19:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.akonadi-server.new/akonadi-server.changes 2016-01-23 01:05:20.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:08:35 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- akonadi-15.12.0.tar.xz New: ---- akonadi-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-server.spec ++++++ --- /var/tmp/diff_new_pack.Dcl4qp/_old 2016-01-23 01:05:21.000000000 +0100 +++ /var/tmp/diff_new_pack.Dcl4qp/_new 2016-01-23 01:05:21.000000000 +0100 @@ -17,7 +17,7 @@ Name: akonadi-server -Version: 15.12.0 +Version: 15.12.1 Release: 0 %define rname akonadi Summary: PIM Storage Service ++++++ akonadi-15.12.0.tar.xz -> akonadi-15.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-15.12.0/autotests/server/fakeakonadiserver.cpp new/akonadi-15.12.1/autotests/server/fakeakonadiserver.cpp --- old/akonadi-15.12.0/autotests/server/fakeakonadiserver.cpp 2015-11-14 14:42:31.000000000 +0100 +++ new/akonadi-15.12.1/autotests/server/fakeakonadiserver.cpp 2015-12-17 23:42:16.000000000 +0100 @@ -182,17 +182,20 @@ } const QLatin1String initCon("initConnection"); - QSqlDatabase db = QSqlDatabase::addDatabase(DbConfig::configuredDatabase()->driverName(), initCon); - DbConfig::configuredDatabase()->apply(db); - db.setDatabaseName(DbConfig::configuredDatabase()->databaseName()); - if (!db.isDriverAvailable(DbConfig::configuredDatabase()->driverName())) { - throw FakeAkonadiServerException(QString::fromLatin1("SQL driver %s not available").arg(db.driverName())); - } - if (!db.isValid()) { - throw FakeAkonadiServerException("Got invalid database"); - } - if (db.open()) { - qWarning() << "Database" << dbConfig->configuredDatabase()->databaseName() << "already exists, the test is not running in a clean environment!"; + { + QSqlDatabase db = QSqlDatabase::addDatabase(DbConfig::configuredDatabase()->driverName(), initCon); + DbConfig::configuredDatabase()->apply(db); + db.setDatabaseName(DbConfig::configuredDatabase()->databaseName()); + if (!db.isDriverAvailable(DbConfig::configuredDatabase()->driverName())) { + throw FakeAkonadiServerException(QString::fromLatin1("SQL driver %s not available").arg(db.driverName())); + } + if (!db.isValid()) { + throw FakeAkonadiServerException("Got invalid database"); + } + if (db.open()) { + qWarning() << "Database" << dbConfig->configuredDatabase()->databaseName() << "already exists, the test is not running in a clean environment!"; + } + db.close(); } QSqlDatabase::removeDatabase(initCon); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-15.12.0/src/server/connection.cpp new/akonadi-15.12.1/src/server/connection.cpp --- old/akonadi-15.12.0/src/server/connection.cpp 2015-11-14 14:42:31.000000000 +0100 +++ new/akonadi-15.12.1/src/server/connection.cpp 2015-12-17 23:42:16.000000000 +0100 @@ -41,9 +41,12 @@ #include <private/datastream_p_p.h> #include <private/standarddirs_p.h> + using namespace Akonadi; using namespace Akonadi::Server; +#define IDLE_TIMER_TIMEOUT 180000 // 3 min + Connection::Connection(QObject *parent) : QObject(parent) , m_socketDescriptor(0) @@ -92,6 +95,8 @@ this, &Connection::slotNewData); connect(socket, &QLocalSocket::disconnected, this, &Connection::disconnected); + connect(&m_idleTimer, &QTimer::timeout, + this, &Connection::slotConnectionIdle); // don't send before the event loop is active, since waitForBytesWritten() can cause interesting reentrancy issues // TODO should be QueueConnection, but unfortunately that doesn't work (yet), since @@ -131,6 +136,24 @@ if (m_reportTime) { reportTime(); } + + m_idleTimer.stop(); +} + +void Connection::slotConnectionIdle() +{ + Q_ASSERT(m_currentHandler == 0); + if (m_backend && m_backend->isOpened() ) { + if (m_backend->inTransaction()) { + // This is a programming error, the timer should not have fired. + // But it is safer to abort and leave the connection open, until + // a later operation causes the idle timer to fire (than crash + // the akonadi server). + akDebug() << "NOT Closing idle db connection; we are in transaction"; + return; + } + m_backend->close(); + } } void Connection::slotNewData() @@ -140,6 +163,14 @@ return; } + m_idleTimer.stop(); + + // will only open() a previously idle backend. + // Otherwise, a new backend could lazily be constructed by later calls. + if (!storageBackend()->isOpened()) { + m_backend->open(); + } + QString currentCommand; while (m_socket->bytesAvailable() > (int) sizeof(qint64)) { QDataStream stream(m_socket); @@ -160,7 +191,6 @@ slotConnectionStateChange(Server::LoggingOut); return; } - if (cmd.type() == Protocol::Command::Invalid) { qDebug() << "Received an invalid command: resetting connection"; slotConnectionStateChange(Server::LoggingOut); @@ -214,6 +244,9 @@ delete m_currentHandler; m_currentHandler = 0; } + + // reset, arm the timer + m_idleTimer.start(IDLE_TIMER_TIMEOUT); } CommandContext *Connection::context() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-15.12.0/src/server/connection.h new/akonadi-15.12.1/src/server/connection.h --- old/akonadi-15.12.0/src/server/connection.h 2015-11-14 14:42:31.000000000 +0100 +++ new/akonadi-15.12.1/src/server/connection.h 2015-12-17 23:42:16.000000000 +0100 @@ -22,6 +22,7 @@ #include <QtCore/QPointer> #include <QtCore/QThread> +#include <QtCore/QTimer> #include <QtNetwork/QLocalSocket> #include <QtCore/QDataStream> @@ -86,6 +87,7 @@ */ void slotNewData(); void slotConnectionStateChange(ConnectionState state); + void slotConnectionIdle(); void slotSendHello(); @@ -106,6 +108,7 @@ QByteArray m_sessionId; bool m_verifyCacheOnRetrieval; CommandContext m_context; + QTimer m_idleTimer; QTime m_time; qint64 m_totalTime; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-15.12.0/src/server/storage/datastore.cpp new/akonadi-15.12.1/src/server/storage/datastore.cpp --- old/akonadi-15.12.0/src/server/storage/datastore.cpp 2015-11-14 14:42:31.000000000 +0100 +++ new/akonadi-15.12.1/src/server/storage/datastore.cpp 2015-12-17 23:42:16.000000000 +0100 @@ -86,7 +86,6 @@ , mNotificationCollector(0) , m_keepAliveTimer(0) { - open(); notificationCollector(); if (DbConfig::configuredDatabase()->driverName() == QLatin1String("QMYSQL")) { @@ -103,7 +102,9 @@ DataStore::~DataStore() { - close(); + if (m_dbOpened) { + close(); + } } void DataStore::open() @@ -129,6 +130,14 @@ DbConfig::configuredDatabase()->initSession(m_database); } +QSqlDatabase DataStore::database() +{ + if (!m_dbOpened) { + open(); + } + return m_database; +} + void DataStore::close() { @@ -160,7 +169,7 @@ Q_ASSERT(QThread::currentThread() == QCoreApplication::instance()->thread()); AkonadiSchema schema; - DbInitializer::Ptr initializer = DbInitializer::createInstance(m_database, &schema); + DbInitializer::Ptr initializer = DbInitializer::createInstance(database(), &schema); if (!initializer->run()) { akError() << initializer->errorMsg(); return false; @@ -168,7 +177,7 @@ s_hasForeignKeyConstraints = initializer->hasForeignKeyConstraints(); if (QFile::exists(QStringLiteral(":dbupdate.xml"))) { - DbUpdater updater(m_database, QStringLiteral(":dbupdate.xml")); + DbUpdater updater(database(), QStringLiteral(":dbupdate.xml")); if (!updater.run()) { return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-15.12.0/src/server/storage/datastore.h new/akonadi-15.12.1/src/server/storage/datastore.h --- old/akonadi-15.12.0/src/server/storage/datastore.h 2015-11-14 14:42:31.000000000 +0100 +++ new/akonadi-15.12.1/src/server/storage/datastore.h 2015-12-17 23:42:16.000000000 +0100 @@ -258,11 +258,10 @@ /** Returns the QSqlDatabase object. Use this for generating queries yourself. + + Will [re-]open the database, if it is closed. */ - QSqlDatabase database() const - { - return m_database; - } + QSqlDatabase database(); /** Sets the current session id. @@ -272,6 +271,11 @@ mSessionId = sessionId; } + /** + Returns if the database is currently open + */ + bool isOpened() const { return m_dbOpened ; } + Q_SIGNALS: /** Emitted if a transaction has been successfully committed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-15.12.0/src/server/storage/dbconfigpostgresql.cpp new/akonadi-15.12.1/src/server/storage/dbconfigpostgresql.cpp --- old/akonadi-15.12.0/src/server/storage/dbconfigpostgresql.cpp 2015-11-14 14:42:31.000000000 +0100 +++ new/akonadi-15.12.1/src/server/storage/dbconfigpostgresql.cpp 2015-12-17 23:42:16.000000000 +0100 @@ -39,7 +39,8 @@ using namespace Akonadi::Server; DbConfigPostgresql::DbConfigPostgresql() - : mInternalServer(true) + : mHostPort(0) + , mInternalServer(true) { } @@ -102,6 +103,7 @@ if (mHostName.isEmpty()) { mHostName = defaultHostName; } + mHostPort = settings.value(QStringLiteral("Port")).toInt(); // User, password and Options can be empty and still valid, so don't override them mUserName = settings.value(QStringLiteral("User")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString(); @@ -124,6 +126,9 @@ settings.beginGroup(driverName()); settings.setValue(QStringLiteral("Name"), mDatabaseName); settings.setValue(QStringLiteral("Host"), mHostName); + if (mHostPort) { + settings.setValue(QStringLiteral("Port"), mHostPort); + } settings.setValue(QStringLiteral("Options"), mConnectionOptions); settings.setValue(QStringLiteral("ServerPath"), mServerPath); settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath); @@ -142,6 +147,9 @@ if (!mHostName.isEmpty()) { database.setHostName(mHostName); } + if (mHostPort > 0 && mHostPort < 65535) { + database.setPort(mHostPort); + } if (!mUserName.isEmpty()) { database.setUserName(mUserName); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-15.12.0/src/server/storage/dbconfigpostgresql.h new/akonadi-15.12.1/src/server/storage/dbconfigpostgresql.h --- old/akonadi-15.12.0/src/server/storage/dbconfigpostgresql.h 2015-11-14 14:42:31.000000000 +0100 +++ new/akonadi-15.12.1/src/server/storage/dbconfigpostgresql.h 2015-12-17 23:42:16.000000000 +0100 @@ -77,6 +77,7 @@ QString mDatabaseName; QString mHostName; + int mHostPort; QString mUserName; QString mPassword; QString mConnectionOptions; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-15.12.0/src/server/storage/dbconfigsqlite.cpp new/akonadi-15.12.1/src/server/storage/dbconfigsqlite.cpp --- old/akonadi-15.12.0/src/server/storage/dbconfigsqlite.cpp 2015-11-14 14:42:31.000000000 +0100 +++ new/akonadi-15.12.1/src/server/storage/dbconfigsqlite.cpp 2015-12-17 23:42:16.000000000 +0100 @@ -143,112 +143,114 @@ { const QLatin1String connectionName("initConnection"); - QSqlDatabase db = QSqlDatabase::addDatabase(driverName(), connectionName); + { + QSqlDatabase db = QSqlDatabase::addDatabase(driverName(), connectionName); - if (!db.isValid()) { - akDebug() << "Invalid database for " - << mDatabaseName - << " with driver " - << driverName(); - return; - } + if (!db.isValid()) { + akDebug() << "Invalid database for " + << mDatabaseName + << " with driver " + << driverName(); + return; + } - QFileInfo finfo(mDatabaseName); - if (!finfo.dir().exists()) { - QDir dir; - dir.mkpath(finfo.path()); - } + QFileInfo finfo(mDatabaseName); + if (!finfo.dir().exists()) { + QDir dir; + dir.mkpath(finfo.path()); + } -#ifdef Q_OS_LINUX - QFile dbFile(mDatabaseName); - // It is recommended to disable CoW feature when running on Btrfs to improve - // database performance. It does not have any effect on non-empty files, so - // we check, whether the database has not yet been initialized. - if (dbFile.size() == 0) { - if (Utils::getDirectoryFileSystem(mDatabaseName) == QLatin1String("btrfs")) { - Utils::disableCoW(mDatabaseName); + #ifdef Q_OS_LINUX + QFile dbFile(mDatabaseName); + // It is recommended to disable CoW feature when running on Btrfs to improve + // database performance. It does not have any effect on non-empty files, so + // we check, whether the database has not yet been initialized. + if (dbFile.size() == 0) { + if (Utils::getDirectoryFileSystem(mDatabaseName) == QLatin1String("btrfs")) { + Utils::disableCoW(mDatabaseName); + } } - } -#endif + #endif - db.setDatabaseName(mDatabaseName); - if (!db.open()) { - akDebug() << "Could not open sqlite database " - << mDatabaseName - << " with driver " - << driverName() - << " for initialization"; - db.close(); - return; - } + db.setDatabaseName(mDatabaseName); + if (!db.open()) { + akDebug() << "Could not open sqlite database " + << mDatabaseName + << " with driver " + << driverName() + << " for initialization"; + db.close(); + return; + } - apply(db); + apply(db); - QSqlQuery query(db); - if (!query.exec(QStringLiteral("SELECT sqlite_version()"))) { - akDebug() << "Could not query sqlite version"; - akDebug() << "Database: " << mDatabaseName; - akDebug() << "Query error: " << query.lastError().text(); - akDebug() << "Database error: " << db.lastError().text(); - db.close(); - return; - } + QSqlQuery query(db); + if (!query.exec(QStringLiteral("SELECT sqlite_version()"))) { + akDebug() << "Could not query sqlite version"; + akDebug() << "Database: " << mDatabaseName; + akDebug() << "Query error: " << query.lastError().text(); + akDebug() << "Database error: " << db.lastError().text(); + db.close(); + return; + } - if (!query.next()) { // should never occur - akDebug() << "Could not query sqlite version"; - akDebug() << "Database: " << mDatabaseName; - akDebug() << "Query error: " << query.lastError().text(); - akDebug() << "Database error: " << db.lastError().text(); - db.close(); - return; - } + if (!query.next()) { // should never occur + akDebug() << "Could not query sqlite version"; + akDebug() << "Database: " << mDatabaseName; + akDebug() << "Query error: " << query.lastError().text(); + akDebug() << "Database error: " << db.lastError().text(); + db.close(); + return; + } - const QString sqliteVersion = query.value(0).toString(); - akDebug() << "sqlite version is " << sqliteVersion; + const QString sqliteVersion = query.value(0).toString(); + akDebug() << "sqlite version is " << sqliteVersion; - const QStringList list = sqliteVersion.split(QLatin1Char('.')); - const int sqliteVersionMajor = list[0].toInt(); - const int sqliteVersionMinor = list[1].toInt(); - - // set synchronous mode to NORMAL; see http://www.sqlite.org/pragma.html#pragma_synchronous - if (!query.exec(QStringLiteral("PRAGMA synchronous = 1"))) { - akDebug() << "Could not set sqlite synchronous mode to NORMAL"; - akDebug() << "Database: " << mDatabaseName; - akDebug() << "Query error: " << query.lastError().text(); - akDebug() << "Database error: " << db.lastError().text(); - db.close(); - return; - } + const QStringList list = sqliteVersion.split(QLatin1Char('.')); + const int sqliteVersionMajor = list[0].toInt(); + const int sqliteVersionMinor = list[1].toInt(); + + // set synchronous mode to NORMAL; see http://www.sqlite.org/pragma.html#pragma_synchronous + if (!query.exec(QStringLiteral("PRAGMA synchronous = 1"))) { + akDebug() << "Could not set sqlite synchronous mode to NORMAL"; + akDebug() << "Database: " << mDatabaseName; + akDebug() << "Query error: " << query.lastError().text(); + akDebug() << "Database error: " << db.lastError().text(); + db.close(); + return; + } - if (sqliteVersionMajor < 3 && sqliteVersionMinor < 7) { - // wal mode is only supported with >= sqlite 3.7.0 - db.close(); - return; - } + if (sqliteVersionMajor < 3 && sqliteVersionMinor < 7) { + // wal mode is only supported with >= sqlite 3.7.0 + db.close(); + return; + } - // set write-ahead-log mode; see http://www.sqlite.org/wal.html - if (!query.exec(QStringLiteral("PRAGMA journal_mode=wal"))) { - akDebug() << "Could not set sqlite write-ahead-log journal mode"; - akDebug() << "Database: " << mDatabaseName; - akDebug() << "Query error: " << query.lastError().text(); - akDebug() << "Database error: " << db.lastError().text(); - db.close(); - return; - } + // set write-ahead-log mode; see http://www.sqlite.org/wal.html + if (!query.exec(QStringLiteral("PRAGMA journal_mode=wal"))) { + akDebug() << "Could not set sqlite write-ahead-log journal mode"; + akDebug() << "Database: " << mDatabaseName; + akDebug() << "Query error: " << query.lastError().text(); + akDebug() << "Database error: " << db.lastError().text(); + db.close(); + return; + } - if (!query.next()) { // should never occur - akDebug() << "Could not query sqlite journal mode"; - akDebug() << "Database: " << mDatabaseName; - akDebug() << "Query error: " << query.lastError().text(); - akDebug() << "Database error: " << db.lastError().text(); - db.close(); - return; - } + if (!query.next()) { // should never occur + akDebug() << "Could not query sqlite journal mode"; + akDebug() << "Database: " << mDatabaseName; + akDebug() << "Query error: " << query.lastError().text(); + akDebug() << "Database error: " << db.lastError().text(); + db.close(); + return; + } - const QString journalMode = query.value(0).toString(); - akDebug() << "sqlite journal mode is " << journalMode; + const QString journalMode = query.value(0).toString(); + akDebug() << "sqlite journal mode is " << journalMode; - db.close(); + db.close(); + } QSqlDatabase::removeDatabase(connectionName); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-15.12.0/src/server/storage/querybuilder.cpp new/akonadi-15.12.1/src/server/storage/querybuilder.cpp --- old/akonadi-15.12.0/src/server/storage/querybuilder.cpp 2015-11-14 14:42:31.000000000 +0100 +++ new/akonadi-15.12.1/src/server/storage/querybuilder.cpp 2015-12-17 23:42:16.000000000 +0100 @@ -99,7 +99,6 @@ : mTable(table) #ifndef QUERYBUILDER_UNITTEST , mDatabaseType(DbType::type(DataStore::self()->database())) - , mQuery(DataStore::self()->database()) #else , mDatabaseType(DbType::Unknown) #endif @@ -355,6 +354,7 @@ if (QueryCache::contains(statement)) { mQuery = QueryCache::query(statement); } else { + mQuery = QSqlQuery(DataStore::self()->database()); mQuery.prepare(statement); QueryCache::insert(statement, mQuery); }

1 0

commit akonadi-search for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package akonadi-search for openSUSE:Factory checked in at 2016-01-23 01:05:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-search (Old) and /work/SRC/openSUSE:Factory/.akonadi-search.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "akonadi-search" Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-search/akonadi-search.changes 2016-01-10 13:03:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.akonadi-search.new/akonadi-search.changes 2016-01-23 01:05:14.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:08:27 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- akonadi-search-15.12.0.tar.xz New: ---- akonadi-search-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-search.spec ++++++ --- /var/tmp/diff_new_pack.DhgWhC/_old 2016-01-23 01:05:15.000000000 +0100 +++ /var/tmp/diff_new_pack.DhgWhC/_new 2016-01-23 01:05:15.000000000 +0100 @@ -17,7 +17,7 @@ Name: akonadi-search -Version: 15.12.0 +Version: 15.12.1 Release: 0 Summary: Framework for searching and managing PIM metadata License: GPL-2.0+ and LGPL-2.1+ and LGPL-3.0 ++++++ akonadi-search-15.12.0.tar.xz -> akonadi-search-15.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.0/CMakeLists.txt new/akonadi-search-15.12.1/CMakeLists.txt --- old/akonadi-search-15.12.0/CMakeLists.txt 2015-12-09 13:02:20.000000000 +0100 +++ new/akonadi-search-15.12.1/CMakeLists.txt 2015-12-21 08:56:00.000000000 +0100 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8.12) project(AkonadiSearch) -set(PROJECT_VERSION "5.0.80") +set(PROJECT_VERSION "5.1.00") set(KF5_VERSION "5.16.0") # ECM setup find_package(ECM 5.16.0 REQUIRED NO_MODULE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.0/debug/akonadisearchdebugsearchpathcombobox.cpp new/akonadi-search-15.12.1/debug/akonadisearchdebugsearchpathcombobox.cpp --- old/akonadi-search-15.12.0/debug/akonadisearchdebugsearchpathcombobox.cpp 2015-12-09 13:02:20.000000000 +0100 +++ new/akonadi-search-15.12.1/debug/akonadisearchdebugsearchpathcombobox.cpp 2015-12-21 08:56:00.000000000 +0100 @@ -17,6 +17,8 @@ #include "akonadisearchdebugsearchpathcombobox.h" #include <QStandardPaths> +#include <QDir> +#include <AkonadiCore/ServerManager> using namespace Akonadi::Search; AkonadiSearchDebugSearchPathComboBox::AkonadiSearchDebugSearchPathComboBox(QWidget *parent) @@ -30,7 +32,7 @@ } -QString AkonadiSearchDebugSearchPathComboBox::searchPath() const +QString AkonadiSearchDebugSearchPathComboBox::searchPath() { const int currentPathIndex = currentIndex(); if (currentPathIndex > -1) { @@ -50,20 +52,19 @@ addItem(QStringLiteral("Calendars"), Calendars); } -QString AkonadiSearchDebugSearchPathComboBox::pathFromEnum(SearchType type) const +QString AkonadiSearchDebugSearchPathComboBox::pathFromEnum(SearchType type) { - const QString xdgpath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/'); switch (type) { case Contacts: - return QString(xdgpath + QLatin1String("baloo/contacts/")); + return defaultLocations(QStringLiteral("contacts")); case ContactCompleter: - return QString(xdgpath + QLatin1String("baloo/emailContacts/")); + return defaultLocations(QStringLiteral("emailContacts")); case Emails: - return QString(xdgpath + QLatin1String("baloo/email/")); + return defaultLocations(QStringLiteral("email")); case Notes: - return QString(xdgpath + QLatin1String("baloo/notes/")); + return defaultLocations(QStringLiteral("notes")); case Calendars: - return QString(xdgpath + QLatin1String("baloo/calendars/")); + return defaultLocations(QStringLiteral("calendars")); } return QString(); } @@ -75,3 +76,30 @@ setCurrentIndex(indexType); } } + +QString AkonadiSearchDebugSearchPathComboBox::defaultLocations(const QString &dbName) +{ + // First look into the old location from Baloo times in ~/.local/share/baloo, + // because we don't migrate the database files automatically. + QString basePath; + if (Akonadi::ServerManager::hasInstanceIdentifier()) { + basePath = QStringLiteral("baloo/instances/%1").arg(Akonadi::ServerManager::instanceIdentifier()); + } else { + basePath = QStringLiteral("baloo"); + } + QString dbPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/%1/%2/").arg(basePath, dbName); + if (QDir(dbPath).exists()) { + return dbPath; + } + + // If the database does not exist in old Baloo folders, than use the new + // location in Akonadi's datadir in ~/.local/share/akonadi/search_db. + if (Akonadi::ServerManager::hasInstanceIdentifier()) { + basePath = QStringLiteral("akonadi/instance/%1/search_db").arg(Akonadi::ServerManager::instanceIdentifier()); + } else { + basePath = QStringLiteral("akonadi/search_db"); + } + dbPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/%1/%2/").arg(basePath, dbName); + QDir().mkpath(dbPath); + return dbPath; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.0/debug/akonadisearchdebugsearchpathcombobox.h new/akonadi-search-15.12.1/debug/akonadisearchdebugsearchpathcombobox.h --- old/akonadi-search-15.12.0/debug/akonadisearchdebugsearchpathcombobox.h 2015-12-09 13:02:20.000000000 +0100 +++ new/akonadi-search-15.12.1/debug/akonadisearchdebugsearchpathcombobox.h 2015-12-21 08:56:00.000000000 +0100 @@ -39,11 +39,12 @@ }; ~AkonadiSearchDebugSearchPathComboBox(); - QString searchPath() const; + QString searchPath(); - QString pathFromEnum(SearchType type) const; + QString pathFromEnum(SearchType type); void setSearchType(SearchType type); private: + QString defaultLocations(const QString &dbname); void initialize(); }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.0/lib/collectionquery.cpp new/akonadi-search-15.12.1/lib/collectionquery.cpp --- old/akonadi-search-15.12.0/lib/collectionquery.cpp 2015-12-09 13:02:20.000000000 +0100 +++ new/akonadi-search-15.12.1/lib/collectionquery.cpp 2015-12-21 08:56:00.000000000 +0100 @@ -44,7 +44,7 @@ : Query(), d(new Private) { - d->databaseDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/baloo/collections/"); + d->databaseDir = defaultLocation(QStringLiteral("collections")); d->limit = 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.0/lib/contactcompleter.cpp new/akonadi-search-15.12.1/lib/contactcompleter.cpp --- old/akonadi-search-15.12.0/lib/contactcompleter.cpp 2015-12-09 13:02:20.000000000 +0100 +++ new/akonadi-search-15.12.1/lib/contactcompleter.cpp 2015-12-21 08:56:00.000000000 +0100 @@ -21,6 +21,7 @@ */ #include "contactcompleter.h" +#include "query.h" #include <xapian.h> #include <QStandardPaths> @@ -39,7 +40,7 @@ QStringList ContactCompleter::complete() { - const QString dir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/baloo/emailContacts/"); + const QString dir = Query::defaultLocation(QStringLiteral("emailContacts")); Xapian::Database db; try { db = Xapian::Database(QFile::encodeName(dir).constData()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.0/lib/contactquery.cpp new/akonadi-search-15.12.1/lib/contactquery.cpp --- old/akonadi-search-15.12.0/lib/contactquery.cpp 2015-12-09 13:02:20.000000000 +0100 +++ new/akonadi-search-15.12.1/lib/contactquery.cpp 2015-12-21 08:56:00.000000000 +0100 @@ -106,7 +106,7 @@ ResultIterator ContactQuery::exec() { - const QString dir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/baloo/contacts/"); + const QString dir = defaultLocation(QStringLiteral("contacts")); Xapian::Database db; try { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.0/lib/emailquery.cpp new/akonadi-search-15.12.1/lib/emailquery.cpp --- old/akonadi-search-15.12.0/lib/emailquery.cpp 2015-12-09 13:02:20.000000000 +0100 +++ new/akonadi-search-15.12.1/lib/emailquery.cpp 2015-12-21 08:56:00.000000000 +0100 @@ -190,7 +190,7 @@ ResultIterator EmailQuery::exec() { - const QString dir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/baloo/email/"); + const QString dir = defaultLocation(QStringLiteral("email")); Xapian::Database db; try { db = Xapian::Database(QFile::encodeName(dir).constData()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.0/lib/notequery.cpp new/akonadi-search-15.12.1/lib/notequery.cpp --- old/akonadi-search-15.12.0/lib/notequery.cpp 2015-12-09 13:02:20.000000000 +0100 +++ new/akonadi-search-15.12.1/lib/notequery.cpp 2015-12-21 08:56:00.000000000 +0100 @@ -79,7 +79,7 @@ ResultIterator NoteQuery::exec() { - const QString dir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/baloo/notes/"); + const QString dir = defaultLocation(QStringLiteral("notes")); Xapian::Database db; try { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.0/lib/query.cpp new/akonadi-search-15.12.1/lib/query.cpp --- old/akonadi-search-15.12.0/lib/query.cpp 2015-12-09 13:02:20.000000000 +0100 +++ new/akonadi-search-15.12.1/lib/query.cpp 2015-12-21 08:56:00.000000000 +0100 @@ -28,6 +28,9 @@ #include <QDebug> #include <QJsonDocument> +#include <AkonadiCore/ServerManager> +#include <QStandardPaths> +#include <QDir> using namespace Akonadi::Search::PIM; @@ -75,3 +78,30 @@ return cq; } + +QString Query::defaultLocation(const QString &dbName) +{ + // First look into the old location from Baloo times in ~/.local/share/baloo, + // because we don't migrate the database files automatically. + QString basePath; + if (Akonadi::ServerManager::hasInstanceIdentifier()) { + basePath = QStringLiteral("baloo/instances/%1").arg(Akonadi::ServerManager::instanceIdentifier()); + } else { + basePath = QStringLiteral("baloo"); + } + QString dbPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/%1/%2/").arg(basePath, dbName); + if (QDir(dbPath).exists()) { + return dbPath; + } + + // If the database does not exist in old Baloo folders, than use the new + // location in Akonadi's datadir in ~/.local/share/akonadi/search_db. + if (Akonadi::ServerManager::hasInstanceIdentifier()) { + basePath = QStringLiteral("akonadi/instance/%1/search_db").arg(Akonadi::ServerManager::instanceIdentifier()); + } else { + basePath = QStringLiteral("akonadi/search_db"); + } + dbPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/%1/%2/").arg(basePath, dbName); + QDir().mkpath(dbPath); + return dbPath; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.0/lib/query.h new/akonadi-search-15.12.1/lib/query.h --- old/akonadi-search-15.12.0/lib/query.h 2015-12-09 13:02:20.000000000 +0100 +++ new/akonadi-search-15.12.1/lib/query.h 2015-12-21 08:56:00.000000000 +0100 @@ -43,6 +43,7 @@ virtual ResultIterator exec() = 0; static Query *fromJSON(const QByteArray &json); + static QString defaultLocation(const QString &dbName); }; }

1 0

commit akonadi-calendar for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package akonadi-calendar for openSUSE:Factory checked in at 2016-01-23 01:05:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-calendar (Old) and /work/SRC/openSUSE:Factory/.akonadi-calendar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "akonadi-calendar" Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-calendar/akonadi-calendar.changes 2016-01-10 13:03:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.akonadi-calendar.new/akonadi-calendar.changes 2016-01-23 01:05:10.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:08:21 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- akonadi-calendar-15.12.0.tar.xz New: ---- akonadi-calendar-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-calendar.spec ++++++ --- /var/tmp/diff_new_pack.2fl05I/_old 2016-01-23 01:05:11.000000000 +0100 +++ /var/tmp/diff_new_pack.2fl05I/_new 2016-01-23 01:05:11.000000000 +0100 @@ -17,7 +17,7 @@ Name: akonadi-calendar -Version: 15.12.0 +Version: 15.12.1 Release: 0 %define kf5_version 5.1.0 Summary: KDE PIM Libraries ++++++ akonadi-calendar-15.12.0.tar.xz -> akonadi-calendar-15.12.1.tar.xz ++++++

1 0