Hello community, here is the log from the commit of package baloo5 for openSUSE:Factory checked in at 2016-05-19 12:05:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/baloo5 (Old) and /work/SRC/openSUSE:Factory/.baloo5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "baloo5" Changes: -------- --- /work/SRC/openSUSE:Factory/baloo5/baloo5.changes 2016-04-12 19:08:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.baloo5.new/baloo5.changes 2016-05-19 12:05:03.000000000 +0200 @@ -1,0 +2,8 @@ +Sat May 7 18:29:27 UTC 2016 - [email protected] + +- Update to 5.22.0 (boo#980066) + * Compilation fixes for Windows + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.22.0.php + +------------------------------------------------------------------- Old: ---- baloo-5.21.0.tar.xz New: ---- baloo-5.22.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ baloo5.spec ++++++ --- /var/tmp/diff_new_pack.ViOJIY/_old 2016-05-19 12:05:04.000000000 +0200 +++ /var/tmp/diff_new_pack.ViOJIY/_new 2016-05-19 12:05:04.000000000 +0200 @@ -17,9 +17,9 @@ %bcond_without lang -%define _tar_path 5.21 +%define _tar_path 5.22 Name: baloo5 -Version: 5.21.0 +Version: 5.22.0 Release: 0 %define kf5_version %{version} Summary: Framework for searching and managing metadata ++++++ baloo-5.21.0.tar.xz -> baloo-5.22.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.21.0/CMakeLists.txt new/baloo-5.22.0/CMakeLists.txt --- old/baloo-5.21.0/CMakeLists.txt 2016-04-03 22:42:08.000000000 +0200 +++ new/baloo-5.22.0/CMakeLists.txt 2016-05-07 17:03:08.000000000 +0200 @@ -1,8 +1,8 @@ # set minimum version requirements cmake_minimum_required(VERSION 2.8.12) set(REQUIRED_QT_VERSION 5.4.0) -set(KF5_VERSION "5.21.0") # handled by release scripts -set(KF5_DEP_VERSION "5.21.0") # handled by release scripts +set(KF5_VERSION "5.22.0") # handled by release scripts +set(KF5_DEP_VERSION "5.22.0") # handled by release scripts # set up project project(Baloo) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.21.0/po/nn/balooctl.po new/baloo-5.22.0/po/nn/balooctl.po --- old/baloo-5.21.0/po/nn/balooctl.po 2016-04-03 22:42:08.000000000 +0200 +++ new/baloo-5.22.0/po/nn/balooctl.po 2016-05-07 17:03:08.000000000 +0200 @@ -1,12 +1,12 @@ # Translation of balooctl to Norwegian Nynorsk # -# Karl Ove Hufthammer <[email protected]>, 2015. +# Karl Ove Hufthammer <[email protected]>, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-12-15 08:19+0000\n" -"PO-Revision-Date: 2015-09-12 19:01+0100\n" +"PO-Revision-Date: 2016-04-30 10:09+0100\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" "Language: nn\n" @@ -29,196 +29,196 @@ #: ../../file/indexerstate.h:42 msgid "Unknown" -msgstr "" +msgstr "Ukjend" #: ../../file/indexerstate.h:45 msgid "Idle" -msgstr "" +msgstr "Passiv" #: ../../file/indexerstate.h:48 msgid "Suspended" -msgstr "" +msgstr "I pause" #: ../../file/indexerstate.h:51 msgid "Initial Indexing" -msgstr "" +msgstr "Første indeksering" #: ../../file/indexerstate.h:54 msgid "Indexing new files" -msgstr "" +msgstr "Indekserer nye filer" #: ../../file/indexerstate.h:57 msgid "Indexing modified files" -msgstr "" +msgstr "Indekserer endra filer" #: ../../file/indexerstate.h:60 msgid "Indexing Extended Attributes" -msgstr "" +msgstr "Indekserer utvida attributt" #: ../../file/indexerstate.h:63 msgid "Indexing file content" -msgstr "" +msgstr "Indekserer filinnhald" #: ../../file/indexerstate.h:66 msgid "Checking for unindexed files" -msgstr "" +msgstr "Ser etter ikkje-indekserte filer" #: configcommand.cpp:45 msgid "Manipulate the Baloo configuration" -msgstr "" +msgstr "Endra Baloo-oppsettet" #: configcommand.cpp:68 msgid "The config command can be used to manipulate the Baloo Configuration" -msgstr "" +msgstr "Kommandoen «config» kan brukast til å endra Baloo-oppsettet" #: configcommand.cpp:69 msgid "Usage: balooctl config <command>" -msgstr "" +msgstr "Bruk: balooctl config <kommando>" #: configcommand.cpp:70 msgid "Possible Commands:" -msgstr "" +msgstr "Moglege kommandoar:" #: configcommand.cpp:73 msgid "Add a value to config parameter" -msgstr "" +msgstr "Legg verdi til oppsettparameter" #: configcommand.cpp:74 msgid "Remove a value from a config parameter" -msgstr "" +msgstr "Fjern verdi frå oppsettparameter" #: configcommand.cpp:75 msgid "Show the value of a config parameter" -msgstr "" +msgstr "Vis verdi til oppsettparameter" #: configcommand.cpp:76 msgid "Set the value of a config parameter" -msgstr "" +msgstr "Definer verdi til oppsettparameter" #: configcommand.cpp:77 msgid "Display this help menu" -msgstr "" +msgstr "Vis denne hjelpeteksten" #: configcommand.cpp:83 msgid "The following configuration options may be listed:" -msgstr "" +msgstr "Desse oppsettverdiane kan visast:" #: configcommand.cpp:85 configcommand.cpp:398 msgid "Controls if Baloo indexes hidden files and folders" -msgstr "" +msgstr "Styrer om Baloo skal indeksera gøymde filer og mapper" #: configcommand.cpp:86 msgid "Controls if baloo indexes file content." -msgstr "" +msgstr "Styrer om Baloo skal indeksera filinnhald" #: configcommand.cpp:87 configcommand.cpp:150 configcommand.cpp:261 msgid "The list of folders which Baloo indexes" -msgstr "" +msgstr "Liste over mapper som Baloo skal indeksera" #: configcommand.cpp:88 configcommand.cpp:151 configcommand.cpp:262 msgid "The list of folders which Baloo will never index" -msgstr "" +msgstr "Liste over mapper som Baloo aldri skal indeksera" #: configcommand.cpp:89 configcommand.cpp:152 configcommand.cpp:263 msgid "The list of filters which are used to exclude files" -msgstr "" +msgstr "Liste over filter som vert brukt til å eksludera filer" #: configcommand.cpp:90 configcommand.cpp:153 configcommand.cpp:264 msgid "The list of mimetypes which are used to exclude files" -msgstr "" +msgstr "Liste over MIME-typar som skal brukast til å ekskludera filer" #: configcommand.cpp:142 configcommand.cpp:253 configcommand.cpp:390 #: configcommand.cpp:459 msgid "Config parameter could not be found" -msgstr "" +msgstr "Fann ikkje oppsettparameteren" #: configcommand.cpp:148 configcommand.cpp:259 configcommand.cpp:396 msgid "The following configuration options may be modified:" -msgstr "" +msgstr "Desse innstillingane kan endrast:" #: configcommand.cpp:161 configcommand.cpp:191 configcommand.cpp:272 #: configcommand.cpp:314 msgid "A folder must be provided" -msgstr "" +msgstr "Du må oppgje ei mappe" #: configcommand.cpp:167 configcommand.cpp:197 configcommand.cpp:278 #: configcommand.cpp:320 msgid "Path does not exist" -msgstr "" +msgstr "Adressa finst ikkje" #: configcommand.cpp:172 configcommand.cpp:202 configcommand.cpp:283 #: configcommand.cpp:325 msgid "Path is not a directory" -msgstr "" +msgstr "Adresse viser ikkje til ei mappe" #: configcommand.cpp:179 #, kde-format msgid "%1 is not in the list of include folders" -msgstr "" +msgstr "%1 er ikkje i lista over inkluderte mapper" #: configcommand.cpp:209 #, kde-format msgid "%1 is not in the list of exclude folders" -msgstr "" +msgstr "%1 er ikkje i lista over ekskluderte mapper" #: configcommand.cpp:221 configcommand.cpp:356 msgid "A filter must be provided" -msgstr "" +msgstr "Du må oppgje eit filter" #: configcommand.cpp:227 #, kde-format msgid "%1 is not in list of exclude filters" -msgstr "" +msgstr "%1 er ikkje i lista over ekskluderte filter" #: configcommand.cpp:238 configcommand.cpp:374 msgid "A mimetype must be provided" -msgstr "" +msgstr "Du må oppgje MIME-type" #: configcommand.cpp:244 #, kde-format msgid "%1 is not in list of exclude mimetypes" -msgstr "" +msgstr "%1 er ikkje i lista over ekskluderte MIME-typar" #: configcommand.cpp:290 #, kde-format msgid "%1 is already in the list of include folders" -msgstr "" +msgstr "%1 er alt i lista over inkluderte mapper" #: configcommand.cpp:296 #, kde-format msgid "Parent folder %1 is already in the list of include folders" -msgstr "" +msgstr "Foreldermappa %1 er alt i lista over inkluderte mapper" #: configcommand.cpp:302 configcommand.cpp:344 #, kde-format msgid "%1 is in the list of exclude folders" -msgstr "" +msgstr "%1 er i lista over ekskluderte mapper" #: configcommand.cpp:332 #, kde-format msgid "%1 is already in the list of exclude folders" -msgstr "" +msgstr "%1 finst alt i lista over ekskluderte mapper" #: configcommand.cpp:338 #, kde-format msgid "Parent folder %1 is already in the list of exclude folders" -msgstr "" +msgstr "Foreldermappa %1 finst alt i lista over ekskluderte mapper" #: configcommand.cpp:362 msgid "Exclude filter is already in the list" -msgstr "" +msgstr "Ekskluderingsfilteret finst alt i lista" #: configcommand.cpp:380 msgid "Exclude mimetype is already in the list" -msgstr "" +msgstr "Den ekskluderte MIME-typen finst alt i lista" #: configcommand.cpp:407 configcommand.cpp:434 msgid "A value must be provided" -msgstr "" +msgstr "Du må oppgje ein verdi" #: configcommand.cpp:428 configcommand.cpp:455 msgid "Invalid value" -msgstr "" +msgstr "Ugyldig verdi" #: main.cpp:67 msgid "balooctl" @@ -282,39 +282,39 @@ #: main.cpp:87 msgid "Modify the Baloo configuration" -msgstr "" +msgstr "Endra Baloo-oppsettet" #: statuscommand.cpp:45 msgid "Print the status of the Indexer" -msgstr "" +msgstr "Vis status for indekseraren" #: statuscommand.cpp:54 msgid "Baloo is currently disabled. To enable, please run \"balooctl enable\"" -msgstr "" +msgstr "Baloo er slått av. Køyr «balooctl enable» for å slå det på att." #: statuscommand.cpp:60 msgid "Baloo Index could not be opened" -msgstr "" +msgstr "Klarte ikkje opna Baloo-indeksen" #: statuscommand.cpp:81 msgid "Baloo File Indexer is running" -msgstr "" +msgstr "Baloo filindeksering køyrer" #: statuscommand.cpp:82 #, kde-format msgid "Indexer state: %1" -msgstr "" +msgstr "Indekseringsstatus: %1" #: statuscommand.cpp:85 msgid "Baloo File Indexer is not running" -msgstr "" +msgstr "Baloo filindeksering køyrer ikkje" #: statuscommand.cpp:91 #, kde-format msgid "Indexed %1 / %2 files" -msgstr "" +msgstr "Indeksert %1/%2 filer" #: statuscommand.cpp:108 #, kde-format msgid "File: %1" -msgstr "" +msgstr "Fil: %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.21.0/po/nn/baloosearch.po new/baloo-5.22.0/po/nn/baloosearch.po --- old/baloo-5.21.0/po/nn/baloosearch.po 2016-04-03 22:42:08.000000000 +0200 +++ new/baloo-5.22.0/po/nn/baloosearch.po 2016-05-07 17:03:08.000000000 +0200 @@ -1,12 +1,12 @@ # Translation of baloosearch to Norwegian Nynorsk # -# Karl Ove Hufthammer <[email protected]>, 2015. +# Karl Ove Hufthammer <[email protected]>, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-09-19 08:51+0000\n" -"PO-Revision-Date: 2015-09-12 19:03+0100\n" +"PO-Revision-Date: 2016-04-24 21:24+0100\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" "Language: nn\n" @@ -33,7 +33,7 @@ #: main.cpp:41 msgid "A tool to search through the files indexed by Baloo" -msgstr "" +msgstr "Verktøy for å søkja gjennom filer indekserte av Baloo" #: main.cpp:43 msgid "Vishesh Handa" @@ -45,19 +45,19 @@ #: main.cpp:50 msgid "The maximum number of results" -msgstr "" +msgstr "Høgste tal på forslag" #: main.cpp:51 msgid "limit" -msgstr "" +msgstr "grenser" #: main.cpp:53 msgid "Offset from which to start the search" -msgstr "" +msgstr "Posisjon der søket skal starta" #: main.cpp:54 msgid "offset" -msgstr "" +msgstr "posisjon" #: main.cpp:56 msgid "Type of data to be searched" @@ -65,20 +65,20 @@ #: main.cpp:57 msgid "typeStr" -msgstr "" +msgstr "typeStr" #: main.cpp:59 msgid "Limit search to specified directory" -msgstr "" +msgstr "Avgrens søket til vald mappe" #: main.cpp:60 msgid "directory" -msgstr "" +msgstr "mappe" #: main.cpp:61 msgid "query" -msgstr "" +msgstr "søk" #: main.cpp:61 msgid "List of words to query for" -msgstr "" +msgstr "Ord å søkja etter" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.21.0/po/nn/balooshow.po new/baloo-5.22.0/po/nn/balooshow.po --- old/baloo-5.21.0/po/nn/balooshow.po 2016-04-03 22:42:08.000000000 +0200 +++ new/baloo-5.22.0/po/nn/balooshow.po 2016-05-07 17:03:08.000000000 +0200 @@ -1,12 +1,12 @@ # Translation of balooshow to Norwegian Nynorsk # -# Karl Ove Hufthammer <[email protected]>, 2015. +# Karl Ove Hufthammer <[email protected]>, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-10-11 08:16+0000\n" -"PO-Revision-Date: 2015-09-12 19:03+0100\n" +"PO-Revision-Date: 2016-04-24 21:23+0100\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" "Language: nn\n" @@ -52,15 +52,17 @@ "The Baloo index could not be opened. Please run \"balooctl status\" to see " "if Baloo is enabled and working." msgstr "" +"Klarte ikkje opna Baloo-indeksen. Køyr «balooctl status» for å sjå om Baloo " +"køyrer og verkar skikkeleg." #: main.cpp:121 msgid "The fileID is not equal to the actual Baloo fileID" -msgstr "" +msgstr "«fileID» er ikkje lik den faktiske Baloo-fileID-en" #: main.cpp:122 msgid "This is a bug" -msgstr "" +msgstr "Dette er ein feil" #: main.cpp:150 msgid "No index information found" -msgstr "" +msgstr "Fann ikkje nokon indeksinformasjon" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.21.0/src/engine/global.h new/baloo-5.22.0/src/engine/global.h --- old/baloo-5.21.0/src/engine/global.h 2016-04-03 22:42:08.000000000 +0200 +++ new/baloo-5.22.0/src/engine/global.h 2016-05-07 17:03:08.000000000 +0200 @@ -27,13 +27,13 @@ #include <QString> -namespace Baloo BALOO_ENGINE_EXPORT { +namespace Baloo { /* * If BALOO_DB_PATH environment variable is set, then it returns value of that variable. * Otherwise returns the default database path. */ - QString fileIndexDbPath(); + BALOO_ENGINE_EXPORT QString fileIndexDbPath(); /* * lmdb doesn't support opening database twice at the same time in the single process @@ -42,7 +42,7 @@ * other undesirable behaviour. So, keeping one global database would solve this problem * and improve the performace too. */ - Database* globalDatabaseInstance(); + BALOO_ENGINE_EXPORT Database* globalDatabaseInstance(); } #endif // GLOBAL_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.21.0/src/engine/idutils.h new/baloo-5.22.0/src/engine/idutils.h --- old/baloo-5.21.0/src/engine/idutils.h 2016-04-03 22:42:08.000000000 +0200 +++ new/baloo-5.22.0/src/engine/idutils.h 2016-05-07 17:03:08.000000000 +0200 @@ -26,6 +26,10 @@ #include <qplatformdefs.h> #include <qglobal.h> +#ifdef Q_OS_WIN +# include <QFileInfo> +#endif + namespace Baloo { inline quint64 devIdAndInodeToId(quint32 devId, quint32 inode) @@ -52,9 +56,20 @@ inline quint64 filePathToId(const QByteArray& filePath) { QT_STATBUF statBuf; +#ifndef Q_OS_WIN if (QT_LSTAT(filePath.constData(), &statBuf) != 0) { return 0; } +#else + if (QT_STAT(filePath.constData(), &statBuf) != 0) { + return 0; + } + if (QFileInfo(filePath).isSymLink()) { + if (QT_STAT(QFileInfo(filePath).symLinkTarget().toUtf8().constData(), &statBuf) != 0) { + return 0; + } + } +#endif return statBufToId(statBuf); }
