diff --git a/bundle-lang.patch b/bundle-lang.patch index 7029de4..455a6cf 100644 --- a/bundle-lang.patch +++ b/bundle-lang.patch @@ -9,29 +9,29 @@ So look there too if a translation was not found in /usr/share/locale/. modules/ECMQmLoader.cpp.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -Index: extra-cmake-modules-5.50.0git.20181015T134434~72aa6e1/modules/ECMQmLoader.cpp.in +Index: extra-cmake-modules-5.56.0git.20200226T180944~040504d/modules/ECMQmLoader.cpp.in =================================================================== ---- extra-cmake-modules-5.50.0git.20181015T134434~72aa6e1.orig/modules/ECMQmLoader.cpp.in -+++ extra-cmake-modules-5.50.0git.20181015T134434~72aa6e1/modules/ECMQmLoader.cpp.in -@@ -44,14 +44,18 @@ namespace { +--- extra-cmake-modules-5.56.0git.20200226T180944~040504d.orig/modules/ECMQmLoader.cpp.in 2020-02-27 07:10:58.979815190 +0100 ++++ extra-cmake-modules-5.56.0git.20200226T180944~040504d/modules/ECMQmLoader.cpp.in 2020-02-27 07:13:15.674038108 +0100 +@@ -44,15 +44,19 @@ QString subPath = QStringLiteral("locale/") + localeDirName + QStringLiteral("/LC_MESSAGES/@QM_LOADER_CATALOG_NAME@.qm"); #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; +- const QString fullPath = QStringLiteral("assets:/share/") + subPath; ++ QString fullPath = QStringLiteral("assets:/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; ++ if (fullPath.isEmpty()) { + subPath = QStringLiteral("locale-bundle/") + localeDirName + QStringLiteral("/LC_MESSAGES/@QM_LOADER_CATALOG_NAME@.qm"); + fullPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, subPath); -+ if (fullPath.isEmpty()) { -+ return false; -+ } + if (fullPath.isEmpty()) { + return false; } ++ } #endif QTranslator *translator = new QTranslator(QCoreApplication::instance()); + if (!translator->load(fullPath)) { diff --git a/extra-cmake-modules-5.67.0.tar.xz b/extra-cmake-modules-5.67.0.tar.xz deleted file mode 100644 index 04240f3..0000000 --- a/extra-cmake-modules-5.67.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e803f8740819a5620095c161883c26aaf1267d6f919d547fdd6414e7cccc0150 -size 339812 diff --git a/extra-cmake-modules-5.67.0.tar.xz.sig b/extra-cmake-modules-5.67.0.tar.xz.sig deleted file mode 100644 index eca1f19..0000000 --- a/extra-cmake-modules-5.67.0.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAl420QYACgkQWNDuZIpI -s7vhYwf/X8WskxLJZz+M1oPYh2S3/8kjjxmfXEjOIOD1VM+5avJm+p7DVN6VS0Cj -cYf0T5UTYqMKhCjWRg4p7XvNDaacAqYSU2KlFlMLg4/1eZsNizDbY5WtfcukZFLD -al2SXcMLcXMvsjG0yNLDedrwiF2vQBrtip/PFNN0zIf9ML0ydnbPP177/89b3R12 -INjpYPt+lgquH1fQ6iFw35BaRQldiDw425tLm7E2HVymcRRqSd8uFKmDSF44r/VV -mn8+xhOLwWuaSACdwyd35uvN4litfPb05T+0nudm/RvqPTwwRX7z4i8d1CTuMQN1 -/fkENeBhwemNh5nJRrOhIR2OC88jgw== -=mOPp ------END PGP SIGNATURE----- diff --git a/extra-cmake-modules-5.68.0.tar.xz b/extra-cmake-modules-5.68.0.tar.xz new file mode 100644 index 0000000..5b6db0c --- /dev/null +++ b/extra-cmake-modules-5.68.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d60869ca96a323b56f00b40c4728a70dfebe2132bbae040442a6a2ef90e2d6e +size 342556 diff --git a/extra-cmake-modules-5.68.0.tar.xz.sig b/extra-cmake-modules-5.68.0.tar.xz.sig new file mode 100644 index 0000000..c05eb11 --- /dev/null +++ b/extra-cmake-modules-5.68.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAl5jlusACgkQWNDuZIpI +s7uzQggAr2jEqGwMk6Lwc0URJ+YedYEiACmazCVT3QQdPkBxy2oHILj3mHitPQat +grGVTREu63eeHBLChxhovkxX+0Evr47fA91n6ZF9M9FiQED4y05gu+oH5Xum0RSJ +TAU07j2WohfCxNzF+R1DYjqA/BCZqtJPIIGNs+mK+sKlgX1nVowNCiU6gqa7usa6 +Di8lyV1T6Znv40ag0Zkcnpncnh9F1BLZTeryHlDNxCGU9druMzmUERp+8WJmNLmp +x/LvIX8qdP+PY0ElKBL2JxIsyg1oZacVyCtAmw1AOU+etaIb1MlKE4QoXWOme5CJ +Jj7gv7daghT0uH9gOTT2zwRxNSMHfw== +=TYaO +-----END PGP SIGNATURE----- diff --git a/extra-cmake-modules.changes b/extra-cmake-modules.changes index 9bec398..01f4107 100644 --- a/extra-cmake-modules.changes +++ b/extra-cmake-modules.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sun Mar 8 09:17:32 UTC 2020 - Christophe Giboudeaux + +- Update to 5.68.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.68.0.php +- Changes since 5.67.0: + * Support NDK r20 and Qt 5.14 + * Load QM files from assets: URLs on Android + * Add ecm_qt_install_logging_categories & ecm_qt_export_logging_category + * ECMGeneratePriFile: unbreak for usages with LIB_NAME not a target name + * ECMGeneratePriFile: Fix static configurations + ------------------------------------------------------------------- Sun Feb 2 18:06:41 UTC 2020 - Christophe Giboudeaux diff --git a/extra-cmake-modules.spec b/extra-cmake-modules.spec index 649664d..5284c3f 100644 --- a/extra-cmake-modules.spec +++ b/extra-cmake-modules.spec @@ -16,7 +16,7 @@ # -%define _tar_path 5.67 +%define _tar_path 5.68 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -29,7 +29,7 @@ # Only needed for the package signature condition %bcond_without lang Name: extra-cmake-modules -Version: 5.67.0 +Version: 5.68.0 Release: 0 Summary: CMake modules License: BSD-3-Clause