KDE Frameworks 5.68.
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/extra-cmake-modules?expand=0&rev=213
This commit is contained in:
parent
3f676ae3e8
commit
b71c312634
@ -9,29 +9,29 @@ So look there too if a translation was not found in /usr/share/locale/.
|
|||||||
modules/ECMQmLoader.cpp.in | 10 +++++++---
|
modules/ECMQmLoader.cpp.in | 10 +++++++---
|
||||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
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.56.0git.20200226T180944~040504d.orig/modules/ECMQmLoader.cpp.in 2020-02-27 07:10:58.979815190 +0100
|
||||||
+++ extra-cmake-modules-5.50.0git.20181015T134434~72aa6e1/modules/ECMQmLoader.cpp.in
|
+++ extra-cmake-modules-5.56.0git.20200226T180944~040504d/modules/ECMQmLoader.cpp.in 2020-02-27 07:13:15.674038108 +0100
|
||||||
@@ -44,14 +44,18 @@ namespace {
|
@@ -44,15 +44,19 @@
|
||||||
QString subPath = QStringLiteral("locale/") + localeDirName + QStringLiteral("/LC_MESSAGES/@QM_LOADER_CATALOG_NAME@.qm");
|
QString subPath = QStringLiteral("locale/") + localeDirName + QStringLiteral("/LC_MESSAGES/@QM_LOADER_CATALOG_NAME@.qm");
|
||||||
|
|
||||||
#if defined(Q_OS_ANDROID)
|
#if defined(Q_OS_ANDROID)
|
||||||
- const QString fullPath = QDir::homePath() + QStringLiteral("/../qt-reserved-files/share/") + subPath;
|
- const QString fullPath = QStringLiteral("assets:/share/") + subPath;
|
||||||
+ QString fullPath = QDir::homePath() + QStringLiteral("/../qt-reserved-files/share/") + subPath;
|
+ QString fullPath = QStringLiteral("assets:/share/") + subPath;
|
||||||
if (!QFile::exists(fullPath)) {
|
if (!QFile::exists(fullPath)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
- const QString fullPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, subPath);
|
- const QString fullPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, subPath);
|
||||||
+ QString fullPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, subPath);
|
+ QString fullPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, subPath);
|
||||||
if (fullPath.isEmpty()) {
|
+ if (fullPath.isEmpty()) {
|
||||||
- return false;
|
|
||||||
+ subPath = QStringLiteral("locale-bundle/") + localeDirName + QStringLiteral("/LC_MESSAGES/@QM_LOADER_CATALOG_NAME@.qm");
|
+ subPath = QStringLiteral("locale-bundle/") + localeDirName + QStringLiteral("/LC_MESSAGES/@QM_LOADER_CATALOG_NAME@.qm");
|
||||||
+ fullPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, subPath);
|
+ fullPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, subPath);
|
||||||
+ if (fullPath.isEmpty()) {
|
if (fullPath.isEmpty()) {
|
||||||
+ return false;
|
return false;
|
||||||
+ }
|
|
||||||
}
|
}
|
||||||
|
+ }
|
||||||
#endif
|
#endif
|
||||||
QTranslator *translator = new QTranslator(QCoreApplication::instance());
|
QTranslator *translator = new QTranslator(QCoreApplication::instance());
|
||||||
|
if (!translator->load(fullPath)) {
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:e803f8740819a5620095c161883c26aaf1267d6f919d547fdd6414e7cccc0150
|
|
||||||
size 339812
|
|
@ -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-----
|
|
3
extra-cmake-modules-5.68.0.tar.xz
Normal file
3
extra-cmake-modules-5.68.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:4d60869ca96a323b56f00b40c4728a70dfebe2132bbae040442a6a2ef90e2d6e
|
||||||
|
size 342556
|
11
extra-cmake-modules-5.68.0.tar.xz.sig
Normal file
11
extra-cmake-modules-5.68.0.tar.xz.sig
Normal file
@ -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-----
|
@ -1,3 +1,17 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Mar 8 09:17:32 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||||
|
|
||||||
|
- 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 <christophe@krop.fr>
|
Sun Feb 2 18:06:41 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%define _tar_path 5.67
|
%define _tar_path 5.68
|
||||||
# Full KF5 version (e.g. 5.33.0)
|
# Full KF5 version (e.g. 5.33.0)
|
||||||
%{!?_kf5_version: %global _kf5_version %{version}}
|
%{!?_kf5_version: %global _kf5_version %{version}}
|
||||||
# Last major and minor KF5 version (e.g. 5.33)
|
# Last major and minor KF5 version (e.g. 5.33)
|
||||||
@ -29,7 +29,7 @@
|
|||||||
# Only needed for the package signature condition
|
# Only needed for the package signature condition
|
||||||
%bcond_without lang
|
%bcond_without lang
|
||||||
Name: extra-cmake-modules
|
Name: extra-cmake-modules
|
||||||
Version: 5.67.0
|
Version: 5.68.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: CMake modules
|
Summary: CMake modules
|
||||||
License: BSD-3-Clause
|
License: BSD-3-Clause
|
||||||
|
Loading…
Reference in New Issue
Block a user