diff --git a/bundle-lang.patch b/bundle-lang.patch index 52b979a..39db402 100644 --- a/bundle-lang.patch +++ b/bundle-lang.patch @@ -1,24 +1,30 @@ -From 8c4c416228acf30862792b4a0da24d865988ea0f Mon Sep 17 00:00:00 2001 -From: Wolfgang Bauer -Date: Thu, 13 Jul 2017 16:53:08 +0200 -Subject: [PATCH] Also search in /usr/share/locale-bundle/ for translations - -openSUSE's bundle-lang packages install the translations in -/usr/share/locale-bundle/ to not conflict with the standard -lang -packages. +From d68190a86ac823d64355a33cfd78bd9e8ffd2785 Mon Sep 17 00:00:00 2001 +From: Luca Beltrame +Date: Wed, 26 Sep 2018 22:50:24 +0200 +Subject: [PATCH] openSUSE's bundle-lang packages install the translations in + /usr/share/locale-bundle/ to not conflict with the standard -lang packages. So look there too if a translation was not found in /usr/share/locale/. --- - modules/ECMQmLoader.cpp.in | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) + modules/ECMQmLoader.cpp.in | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/ECMQmLoader.cpp.in b/modules/ECMQmLoader.cpp.in -index 12a2d14..81fb6fb 100644 +index 003512d..bc6a4ad 100644 --- a/modules/ECMQmLoader.cpp.in +++ b/modules/ECMQmLoader.cpp.in -@@ -43,7 +43,11 @@ namespace { +@@ -44,14 +44,18 @@ namespace { QString subPath = QStringLiteral("locale/") + localeDirName + QStringLiteral("/LC_MESSAGES/@QM_LOADER_CATALOG_NAME@.qm"); - QString fullPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, subPath); + + #if defined(Q_OS_ANDROID) +- const QString fullPath = QDir::homePath()+QStringLiteral("/../qt-reserved-files/share/") + subPath; ++ QString fullPath = QDir::homePath()+QStringLiteral("/../qt-reserved-files/share/") + subPath; + if (!QFile::exists(fullPath)) { + return false; + } + #else +- const QString fullPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, subPath); ++ QString fullPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, subPath); if (fullPath.isEmpty()) { - return false; + subPath = QStringLiteral("locale-bundle/") + localeDirName + QStringLiteral("/LC_MESSAGES/@QM_LOADER_CATALOG_NAME@.qm"); @@ -27,8 +33,7 @@ index 12a2d14..81fb6fb 100644 + return false; + } } + #endif QTranslator *translator = new QTranslator(QCoreApplication::instance()); - if (!translator->load(fullPath)) { --- -2.12.3 - +-- +2.19.0 diff --git a/extra-cmake-modules-5.50.0.tar.xz b/extra-cmake-modules-5.50.0.tar.xz deleted file mode 100644 index 98f6dcc..0000000 --- a/extra-cmake-modules-5.50.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd33b0b09c9659c4e0f49f5ba0caf48ad01534bc3d31788d0793b140cd7e0489 -size 323928 diff --git a/extra-cmake-modules-5.51.0.tar.xz b/extra-cmake-modules-5.51.0.tar.xz new file mode 100644 index 0000000..8466c8d --- /dev/null +++ b/extra-cmake-modules-5.51.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96e4dde2f75a7b55f30eef35d0db40e1f87a67cc391ed36956bceb93f8253594 +size 323936 diff --git a/extra-cmake-modules.changes b/extra-cmake-modules.changes index aa3f46f..8af972a 100644 --- a/extra-cmake-modules.changes +++ b/extra-cmake-modules.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Tue Oct 16 08:01:44 UTC 2018 - Luca Beltrame + +- Run spec-cleaner + +------------------------------------------------------------------- +Mon Oct 15 11:51:45 UTC 2018 - lbeltrame@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: + * Compile python bindings with the same sip flags used by PyQt + * Android: Allow passing a relative path as the apk dir + * Android: Properly offer a fallback to applications that don't have a manifest + * l10n: Fix matching digits in the repository name + * Android: Make sure Qm translations get loaded + * Fix Android builds using cmake 3.12.1 + * Add QT_NO_NARROWING_CONVERSIONS_IN_CONNECT as default compile flags + * Python bindings: use cmake_parse_arguments, fix documentation + * Bindings: Correct handling of sources containing utf-8 + * autotests: actually iterate over the list, rather than checking item 0 all the time + * Actually iterate over CF_GENERATED, rather than checking item 0 all the time + * Fix minor EBN issues +- Refresh patches: + * bundle-lang.patch + ------------------------------------------------------------------- Thu Sep 13 21:58:44 UTC 2018 - lbeltrame@kde.org diff --git a/extra-cmake-modules.spec b/extra-cmake-modules.spec index 320a133..ef24506 100644 --- a/extra-cmake-modules.spec +++ b/extra-cmake-modules.spec @@ -12,11 +12,11 @@ # 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 _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) @@ -27,12 +27,12 @@ %bcond_with doc %endif Name: extra-cmake-modules -Version: 5.50.0 +Version: 5.51.0 Release: 0 Summary: CMake modules License: BSD-3-Clause Group: Development/Tools/Other -URL: http://www.kde.org +URL: https://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE Patch0: bundle-lang.patch