Hello community, here is the log from the commit of package ki18n for openSUSE:Factory checked in at 2015-03-16 09:29:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ki18n (Old) and /work/SRC/openSUSE:Factory/.ki18n.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ki18n" Changes: -------- --- /work/SRC/openSUSE:Factory/ki18n/ki18n.changes 2015-02-16 17:31:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ki18n.new/ki18n.changes 2015-03-16 09:29:01.000000000 +0100 @@ -1,0 +2,13 @@ +Sat Mar 7 16:58:39 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 5.8.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.8.0.php + +------------------------------------------------------------------- +Fri Feb 27 17:52:51 UTC 2015 - hrvoje.sen...@gmail.com + +- Improve fallbackLang.diff to look into kf5 locale subdir first, + boo#904524 + +------------------------------------------------------------------- Old: ---- ki18n-5.7.0.tar.xz New: ---- ki18n-5.8.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ki18n.spec ++++++ --- /var/tmp/diff_new_pack.ThlyVE/_old 2015-03-16 09:29:02.000000000 +0100 +++ /var/tmp/diff_new_pack.ThlyVE/_new 2015-03-16 09:29:02.000000000 +0100 @@ -17,12 +17,12 @@ %define lname libKF5I18n5 -%define _tar_path 5.7 +%define _tar_path 5.8 Name: ki18n Version: %{_tar_path}.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.7.0 +BuildRequires: extra-cmake-modules >= 1.8.0 BuildRequires: fdupes BuildRequires: gettext-runtime BuildRequires: kf5-filesystem ++++++ fallbackLang.diff ++++++ --- /var/tmp/diff_new_pack.ThlyVE/_old 2015-03-16 09:29:02.000000000 +0100 +++ /var/tmp/diff_new_pack.ThlyVE/_new 2015-03-16 09:29:02.000000000 +0100 @@ -1,19 +1,34 @@ diff --git a/src/kcatalog.cpp b/src/kcatalog.cpp -index 7711e9b..8a1ebde 100644 +index 7711e9b..8a4e12e 100644 --- a/src/kcatalog.cpp +++ b/src/kcatalog.cpp -@@ -113,7 +113,10 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain, +@@ -113,14 +113,23 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain, QString relpath = QString::fromLatin1("%1/LC_MESSAGES/%2.mo") .arg(language, QFile::decodeName(domain)); QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, +- QString::fromLatin1("locale/") + relpath); + QString::fromLatin1("locale/kf5/") + relpath); -+ QString fallbackfile = QStandardPaths::locate(QStandardPaths::GenericDataLocation, - QString::fromLatin1("locale/") + relpath); -+ file.append(fallbackfile); QString localeDir; if (file.isEmpty()) { - localeDir = QString(); -@@ -128,8 +131,12 @@ QSet<QString> KCatalog::availableCatalogLanguages(const QByteArray &domain_) +- localeDir = QString(); ++ QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, ++ QString::fromLatin1("locale/") + relpath); ++ if (file.isEmpty()) { ++ localeDir = QString(); ++ } else { ++ localeDir = QFileInfo(file.left(file.size() - relpath.size())).absolutePath(); ++ } ++ // qDebug() << "localeDir= " << localeDir; ++ return localeDir; + } else { + // Path of the locale/ directory must be returned. + localeDir = QFileInfo(file.left(file.size() - relpath.size())).absolutePath(); + } ++ // qDebug() << "localeDir= " << localeDir; + return localeDir; + } + +@@ -128,8 +137,12 @@ QSet<QString> KCatalog::availableCatalogLanguages(const QByteArray &domain_) { QString domain = QFile::decodeName(domain_); QStringList localeDirPaths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, ++++++ ki18n-5.7.0.tar.xz -> ki18n-5.8.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.7.0/CMakeLists.txt new/ki18n-5.8.0/CMakeLists.txt --- old/ki18n-5.7.0/CMakeLists.txt 2015-02-08 16:18:18.000000000 +0100 +++ new/ki18n-5.8.0/CMakeLists.txt 2015-03-07 15:43:57.000000000 +0100 @@ -3,7 +3,7 @@ project(KI18n) # ECM setup -find_package(ECM 1.7.0 REQUIRED NO_MODULE) +find_package(ECM 1.8.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) include(FeatureSummary) @@ -12,7 +12,7 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "5.7.0") # handled by release scripts +set(KF5_VERSION "5.8.0") # handled by release scripts ecm_setup_version( ${KF5_VERSION} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.7.0/KF5I18nConfig.cmake.in new/ki18n-5.8.0/KF5I18nConfig.cmake.in --- old/ki18n-5.7.0/KF5I18nConfig.cmake.in 2015-02-08 16:18:18.000000000 +0100 +++ new/ki18n-5.8.0/KF5I18nConfig.cmake.in 2015-03-07 15:43:57.000000000 +0100 @@ -1,6 +1,8 @@ @PACKAGE_INIT@ -set(KI18N_MODULE_DIR "${PACKAGE_PREFIX_DIR}/@CMAKECONFIG_INSTALL_DIR@") +# This is no longer used by the macros, but we should keep it in case +# something else is using it. +set(KI18N_MODULE_DIR "${CMAKE_CURRENT_LIST_DIR}") include("${CMAKE_CURRENT_LIST_DIR}/KF5I18nTargets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/KF5I18NMacros.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.7.0/cmake/KF5I18NMacros.cmake new/ki18n-5.8.0/cmake/KF5I18NMacros.cmake --- old/ki18n-5.7.0/cmake/KF5I18NMacros.cmake 2015-02-08 16:18:18.000000000 +0100 +++ new/ki18n-5.8.0/cmake/KF5I18NMacros.cmake 2015-03-07 15:43:57.000000000 +0100 @@ -7,12 +7,8 @@ find_package(Gettext REQUIRED) find_package(PythonInterp REQUIRED) -if(KI18N_MODULE_DIR) - set(_pmap_compile_script ${KI18N_MODULE_DIR}/ts-pmap-compile.py) -else() - # This script is needed when installing ki18n itself. - set(_pmap_compile_script ${CMAKE_SOURCE_DIR}/cmake/ts-pmap-compile.py) -endif() +set(_ki18n_pmap_compile_script ${CMAKE_CURRENT_LIST_DIR}/ts-pmap-compile.py) +set(_ki18n_uic_script ${CMAKE_CURRENT_LIST_DIR}/kf5i18nuic.cmake) #create the implementation files from the ui files and add them to the list of sources #usage: KI18N_WRAP_UI(foo_SRCS ${ui_files}) @@ -33,7 +29,7 @@ -DKDE_UIC_FILE:FILEPATH=${_tmp_FILE} -DKDE_UIC_H_FILE:FILEPATH=${_header} -DKDE_UIC_BASENAME:STRING=${_basename} - -P ${KI18N_MODULE_DIR}/kf5i18nuic.cmake + -P ${_ki18n_uic_script} MAIN_DEPENDENCY ${_tmp_FILE} ) list(APPEND ${_sources} ${_header}) @@ -65,7 +61,7 @@ COMMAND ${PYTHON_EXECUTABLE} ARGS -B - ${_pmap_compile_script} + ${_ki18n_pmap_compile_script} ${CMAKE_CURRENT_SOURCE_DIR}/${pmap_file} ${pmapc_file} DEPENDS ${pmap_file}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.7.0/po/ast/ki18n5.po new/ki18n-5.8.0/po/ast/ki18n5.po --- old/ki18n-5.7.0/po/ast/ki18n5.po 2015-02-08 16:18:18.000000000 +0100 +++ new/ki18n-5.8.0/po/ast/ki18n5.po 2015-03-07 15:43:57.000000000 +0100 @@ -1,22 +1,22 @@ -# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # +# enolp <en...@softastur.org>, 2015. msgid "" msgstr "" "Project-Id-Version: kdelibs4-1\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-01-26 07:50+0000\n" -"PO-Revision-Date: 2012-12-28 17:14+0100\n" -"Last-Translator: ivarela <ivar...@ubuntu.com>\n" -"Language-Team: asturian <kde-i18n-...@kde.org>\n" -"Language: \n" +"PO-Revision-Date: 2015-02-27 21:59+0100\n" +"Last-Translator: enolp <en...@softastur.org>\n" +"Language-Team: Asturian <kde-i18n-...@kde.org>\n" +"Language: ast\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Poedit-Language: asturian\n" +"X-Generator: Lokalize 2.0\n" #. i18n: Decide which string is used to delimit keys in a keyboard #. shortcut (e.g. + in Ctrl+Alt+Tab) in plain text. @@ -64,7 +64,7 @@ #: kuitmarkup.cpp:327 msgctxt "keyboard-key-name" msgid "CapsLock" -msgstr "Mayúscules" +msgstr "Bloq Mayús" #: kuitmarkup.cpp:328 msgctxt "keyboard-key-name" @@ -124,7 +124,7 @@ #: kuitmarkup.cpp:339 msgctxt "keyboard-key-name" msgid "Ins" -msgstr "Inxert" +msgstr "Inx" #: kuitmarkup.cpp:340 msgctxt "keyboard-key-name" @@ -149,17 +149,17 @@ #: kuitmarkup.cpp:344 msgctxt "keyboard-key-name" msgid "NumLock" -msgstr "BloqNúmb" +msgstr "Bloq Numb" #: kuitmarkup.cpp:345 msgctxt "keyboard-key-name" msgid "PageDown" -msgstr "AvPág" +msgstr "PáxAb" #: kuitmarkup.cpp:346 msgctxt "keyboard-key-name" msgid "PageUp" -msgstr "RePág" +msgstr "PáxAr" #: kuitmarkup.cpp:347 msgctxt "keyboard-key-name" @@ -179,7 +179,7 @@ #: kuitmarkup.cpp:350 msgctxt "keyboard-key-name" msgid "PrintScreen" -msgstr "ImprPant" +msgstr "Impentar pantalla" #: kuitmarkup.cpp:351 msgctxt "keyboard-key-name" @@ -189,22 +189,22 @@ #: kuitmarkup.cpp:352 msgctxt "keyboard-key-name" msgid "Return" -msgstr "Intro" +msgstr "" #: kuitmarkup.cpp:353 msgctxt "keyboard-key-name" msgid "Right" -msgstr "Derecha" +msgstr "Drecha" #: kuitmarkup.cpp:354 msgctxt "keyboard-key-name" msgid "ScrollLock" -msgstr "BloqDespl" +msgstr "Bloq Despl" #: kuitmarkup.cpp:355 msgctxt "keyboard-key-name" msgid "Shift" -msgstr "Mayús." +msgstr "Mayúscules" #: kuitmarkup.cpp:356 msgctxt "keyboard-key-name" @@ -224,7 +224,7 @@ #: kuitmarkup.cpp:359 msgctxt "keyboard-key-name" msgid "Tab" -msgstr "TAB" +msgstr "Tabulador" #: kuitmarkup.cpp:360 msgctxt "keyboard-key-name" @@ -237,92 +237,64 @@ msgstr "Win" #: kuitmarkup.cpp:362 -#, fuzzy -#| msgctxt "keyboard-key-name" -#| msgid "F%1" msgctxt "keyboard-key-name" msgid "F1" -msgstr "F%1" +msgstr "F1" #: kuitmarkup.cpp:363 -#, fuzzy -#| msgid "2" msgctxt "keyboard-key-name" msgid "F2" -msgstr "2" +msgstr "F2" #: kuitmarkup.cpp:364 -#, fuzzy -#| msgid "3" msgctxt "keyboard-key-name" msgid "F3" -msgstr "3" +msgstr "F3" #: kuitmarkup.cpp:365 -#, fuzzy -#| msgid "4" msgctxt "keyboard-key-name" msgid "F4" -msgstr "4" +msgstr "F4" #: kuitmarkup.cpp:366 -#, fuzzy -#| msgid "5" msgctxt "keyboard-key-name" msgid "F5" -msgstr "5" +msgstr "F5" #: kuitmarkup.cpp:367 -#, fuzzy -#| msgid "6" msgctxt "keyboard-key-name" msgid "F6" -msgstr "6" +msgstr "F6" #: kuitmarkup.cpp:368 -#, fuzzy -#| msgid "7" msgctxt "keyboard-key-name" msgid "F7" -msgstr "7" +msgstr "F7" #: kuitmarkup.cpp:369 -#, fuzzy -#| msgid "8" msgctxt "keyboard-key-name" msgid "F8" -msgstr "8" +msgstr "F8" #: kuitmarkup.cpp:370 -#, fuzzy -#| msgid "9" msgctxt "keyboard-key-name" msgid "F9" -msgstr "9" +msgstr "F9" #: kuitmarkup.cpp:371 -#, fuzzy -#| msgctxt "keyboard-key-name" -#| msgid "F%1" msgctxt "keyboard-key-name" msgid "F10" -msgstr "F%1" +msgstr "F10" #: kuitmarkup.cpp:372 -#, fuzzy -#| msgctxt "keyboard-key-name" -#| msgid "F%1" msgctxt "keyboard-key-name" msgid "F11" -msgstr "F%1" +msgstr "F11" #: kuitmarkup.cpp:373 -#, fuzzy -#| msgctxt "keyboard-key-name" -#| msgid "F%1" msgctxt "keyboard-key-name" msgid "F12" -msgstr "F%1" +msgstr "F12" #. i18n: The messages with context "tag-format-pattern <tag ...> format" #. are KUIT patterns for formatting the text found inside KUIT tags. @@ -865,4 +837,4 @@ #, kde-format msgctxt "tag-format-pattern <nl> rich" msgid "%1<br/>" -msgstr "" +msgstr "%1<br/>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.7.0/src/ktranscript.cpp new/ki18n-5.8.0/src/ktranscript.cpp --- old/ki18n-5.7.0/src/ktranscript.cpp 2015-02-08 16:18:18.000000000 +0100 +++ new/ki18n-5.8.0/src/ktranscript.cpp 2015-03-07 15:43:57.000000000 +0100 @@ -68,9 +68,9 @@ const QString &ftrans, QList<QStringList> &mods, QString &error, - bool &fallback); + bool &fallback) Q_DECL_OVERRIDE; - QStringList postCalls(const QString &lang); + QStringList postCalls(const QString &lang) Q_DECL_OVERRIDE; // Lexical path of the module for the executing code. QString currentModulePath; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.7.0/src/kuitmarkup.cpp new/ki18n-5.8.0/src/kuitmarkup.cpp --- old/ki18n-5.7.0/src/kuitmarkup.cpp 2015-02-08 16:18:18.000000000 +0100 +++ new/ki18n-5.8.0/src/kuitmarkup.cpp 2015-03-07 15:43:57.000000000 +0100 @@ -120,7 +120,7 @@ entityMap = entities; } - QString resolveUndeclaredEntity(const QString &name) + QString resolveUndeclaredEntity(const QString &name) Q_DECL_OVERRIDE { QString value = entityMap.value(name); // This will return empty string if the entity name is not known, -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
