Hello community, here is the log from the commit of package ki18n for openSUSE:Factory checked in at 2018-10-22 11:12:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ki18n (Old) and /work/SRC/openSUSE:Factory/.ki18n.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ki18n" Mon Oct 22 11:12:41 2018 rev:62 rq:642321 version:5.51.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ki18n/ki18n.changes 2018-10-01 08:06:43.570342794 +0200 +++ /work/SRC/openSUSE:Factory/.ki18n.new/ki18n.changes 2018-10-22 11:12:49.603803350 +0200 @@ -1,0 +2,20 @@ +Tue Oct 16 08:02:14 UTC 2018 - Luca Beltrame <lbeltr...@kde.org> + +- Run spec-cleaner + +------------------------------------------------------------------- +Mon Oct 15 11:50:35 UTC 2018 - lbeltr...@kde.org + +- Update to 5.51.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.51.0.php +- Changes since 5.50.0: + * Remove misleading use of KDE_INSTALL_PYTHONBINDINGSDIR + * Properly scope CMAKE_REQUIRED_LIBRARIES change + * Android: Make sure we're looking for .mo files in the right path + * Fix autotests with -DBUILD_QCH:BOOL=TRUE +- Refreshed patches: + * fallbackLang.diff + +------------------------------------------------------------------- Old: ---- ki18n-5.50.0.tar.xz New: ---- ki18n-5.51.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ki18n.spec ++++++ --- /var/tmp/diff_new_pack.zqXsge/_old 2018-10-22 11:12:50.423802696 +0200 +++ /var/tmp/diff_new_pack.zqXsge/_new 2018-10-22 11:12:50.431802690 +0200 @@ -12,24 +12,24 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define lname libKF5I18n5 -%define _tar_path 5.50 +%define _tar_path 5.51 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: ki18n -Version: 5.50.0 +Version: 5.51.0 Release: 0 Summary: KDE Gettext-based UI text internationalization License: LGPL-2.1-or-later Group: System/GUI/KDE -URL: http://www.kde.org +URL: https://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf # PATCH-FIX-OPENSUSE fallbackLang.diff -- look for translations in locale/kf5 also @@ -124,7 +124,6 @@ %{_kf5_plugindir}/ %files devel -%license COPYING* %{_kf5_libdir}/libKF5I18n.so %{_kf5_libdir}/cmake/KF5I18n/ %{_kf5_includedir}/ ++++++ fallbackLang.diff ++++++ --- /var/tmp/diff_new_pack.zqXsge/_old 2018-10-22 11:12:50.447802677 +0200 +++ /var/tmp/diff_new_pack.zqXsge/_new 2018-10-22 11:12:50.451802673 +0200 @@ -1,14 +1,13 @@ diff --git a/src/kcatalog.cpp b/src/kcatalog.cpp -index 8b8feb3..98b393d 100644 +index 8b8feb3..1ccc28b 100644 --- a/src/kcatalog.cpp +++ b/src/kcatalog.cpp -@@ -118,9 +118,22 @@ KCatalog::~KCatalog() +@@ -118,9 +118,21 @@ KCatalog::~KCatalog() QString KCatalog::catalogLocaleDir(const QByteArray &domain, const QString &language) { - QString relpath = QStringLiteral("%1/LC_MESSAGES/%2.mo") + QStringList localeDirs; -+ QString localeDir; + QString relpath = QStringLiteral("%1/LC_MESSAGES/%2.mo") .arg(language, QFile::decodeName(domain)); @@ -26,14 +25,6 @@ { QMutexLocker lock(&catalogStaticData->mutex); const QString customLocaleDir = catalogStaticData->customCatalogDirs.value(domain); -@@ -137,7 +150,6 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain, - - QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, - QStringLiteral("locale/") + relpath); -- QString localeDir; - if (!file.isEmpty()) { - #if defined(Q_OS_ANDROID) - // The exact file name must be returned on Android because libintl-lite loads a catalog by filename with bindtextdomain() @@ -153,9 +165,23 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain, QSet<QString> KCatalog::availableCatalogLanguages(const QByteArray &domain_) { ++++++ ki18n-5.50.0.tar.xz -> ki18n-5.51.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.50.0/CMakeLists.txt new/ki18n-5.51.0/CMakeLists.txt --- old/ki18n-5.50.0/CMakeLists.txt 2018-09-02 21:22:29.000000000 +0200 +++ new/ki18n-5.51.0/CMakeLists.txt 2018-10-08 10:15:21.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.50.0") # handled by release scripts +set(KF5_VERSION "5.51.0") # handled by release scripts project(KI18n VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.50.0 NO_MODULE) +find_package(ECM 5.51.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -88,7 +88,7 @@ if (BUILD_QCH) ecm_install_qch_export( TARGETS KF5I18n_QCH - FILE KF5I18nQchTargets.cmake + FILE "${CMAKE_BINARY_DIR}/cmake/KF5I18nQchTargets.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.50.0/cmake/FindLibIntl.cmake new/ki18n-5.51.0/cmake/FindLibIntl.cmake --- old/ki18n-5.50.0/cmake/FindLibIntl.cmake 2018-09-02 21:22:29.000000000 +0200 +++ new/ki18n-5.51.0/cmake/FindLibIntl.cmake 2018-10-08 10:15:21.000000000 +0200 @@ -45,6 +45,7 @@ find_library(LibIntl_LIBRARIES NAMES intl libintl) include(CheckCXXSymbolExists) +include(CMakePushCheckState) check_cxx_symbol_exists(dngettext libintl.h LibIntl_SYMBOL_FOUND) include(FindPackageHandleStandardArgs) @@ -64,5 +65,7 @@ endif() # make sure we have -Wl,--no-undefined here, otherwise this test will always pass +cmake_push_check_state() set(CMAKE_REQUIRED_LIBRARIES ${LibIntl_LIBRARIES} ${CMAKE_SHARED_LINKER_FLAGS}) check_cxx_source_compiles("extern \"C\" int _nl_msg_cat_cntr; int main(void) { ++_nl_msg_cat_cntr; return 0; }" HAVE_NL_MSG_CAT_CNTR) +cmake_pop_check_state() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.50.0/po/zh_CN/ki18n5.po new/ki18n-5.51.0/po/zh_CN/ki18n5.po --- old/ki18n-5.50.0/po/zh_CN/ki18n5.po 2018-09-02 21:22:29.000000000 +0200 +++ new/ki18n-5.51.0/po/zh_CN/ki18n5.po 2018-10-08 10:15:21.000000000 +0200 @@ -16,8 +16,8 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-08-16 09:05+0200\n" -"PO-Revision-Date: 2018-08-30 13:09\n" -"Last-Translator: guoyunhebrave <yunhe....@protonmail.com>\n" +"PO-Revision-Date: 2018-09-28 19:47\n" +"Last-Translator: guoyunhe <yunhe....@protonmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.50.0/src/CMakeLists.txt new/ki18n-5.51.0/src/CMakeLists.txt --- old/ki18n-5.50.0/src/CMakeLists.txt 2018-09-02 21:22:29.000000000 +0200 +++ new/ki18n-5.51.0/src/CMakeLists.txt 2018-10-08 10:15:21.000000000 +0200 @@ -45,7 +45,6 @@ PYTHONNAMESPACE PyKF5 MODULENAME KI18n RULES_FILE "${CMAKE_SOURCE_DIR}/cmake/rules_PyKF5.py" - INSTALL_DIR_SUFFIX ${KDE_INSTALL_PYTHONBINDINGSDIR} SIP_DEPENDS QtCore/QtCoremod.sip HEADERS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.50.0/src/kcatalog.cpp new/ki18n-5.51.0/src/kcatalog.cpp --- old/ki18n-5.50.0/src/kcatalog.cpp 2018-09-02 21:22:29.000000000 +0200 +++ new/ki18n-5.51.0/src/kcatalog.cpp 2018-10-08 10:15:21.000000000 +0200 @@ -136,19 +136,23 @@ } } - QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, - QStringLiteral("locale/") + relpath); - QString localeDir; - if (!file.isEmpty()) { #if defined(Q_OS_ANDROID) - // The exact file name must be returned on Android because libintl-lite loads a catalog by filename with bindtextdomain() - localeDir = file; +// The exact file name must be returned on Android because libintl-lite loads a catalog by filename with bindtextdomain() + QString file = QDir::homePath()+QStringLiteral("/../qt-reserved-files/share/locale/") + relpath; + if (!QFile::exists(file)) { + file.clear(); + } + return file; #else + const QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("locale/") + relpath); + + QString localeDir; + if (!file.isEmpty()) { // Path of the locale/ directory must be returned. localeDir = QFileInfo(file.left(file.size() - relpath.size())).absolutePath(); -#endif } return localeDir; +#endif } QSet<QString> KCatalog::availableCatalogLanguages(const QByteArray &domain_)
