rpm/extra-cmake-modules
SHA256
1
0
Fork 0
forked from pool/extra-cmake-modules
Code Pull Requests Activity

Accepting request 510148 from KDE:Frameworks5

Browse Source 
- Add bundle-lang.patch to find .qm translations in
  /usr/share/locale-bundle/ (boo#1027925, boo#1048030)

- Update to 5.36.0
  * New feature release
  * For more details please see:
  * https://www.kde.org/announcements/kde-frameworks-5.36.0.php
- Changes since 5.35.0:
  * FindQHelpGenerator: avoid picking up Qt4 version
  * ECMAddQch: fail hard if needed tools are not present, to avoid surprises
  * Drop perl as dep for ecm_add_qch, not needed/used
  * (always include CheckCXXCompilerFlag before calling it)
  * guess less, test more
  * detect Xcode <= 6.2 from Clang version only
  * scan the whole install folder for qml dependencies
  * New: ECMAddQch, for generating qch & doxygen tag files
  * tests: improve error reporting for ECMAddAppIconTest
  * tests: fix output directory for KDEFetchTranslations
  * tests: fix last change on KDEFetchTranslations
  * tests: hopefully fix KDEFetchTranslations on Windows
  * Fix KDEInstallDirsTest.relative_or_absolute_usr, avoid Qt paths being used

OBS-URL: https://build.opensuse.org/request/show/510148
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/extra-cmake-modules?expand=0&rev=43
This commit is contained in:
Dominique Leuenberger
2017-07-17 08:27:12 +00:00
committed by Git OBS Bridge
parent f33f5cba1c 7ef93e6492
commit 70810e2be9
5 changed files with 70 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
bundle-lang.patch Normal file
View File

@@ -0,0 +1,34 @@
From 8c4c416228acf30862792b4a0da24d865988ea0f Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
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.
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(-)
diff --git a/modules/ECMQmLoader.cpp.in b/modules/ECMQmLoader.cpp.in
index 12a2d14..81fb6fb 100644
--- a/modules/ECMQmLoader.cpp.in
+++ b/modules/ECMQmLoader.cpp.in
@@ -43,7 +43,11 @@ namespace {
QString subPath = QStringLiteral("locale/") + localeDirName + QStringLiteral("/LC_MESSAGES/@QM_LOADER_CATALOG_NAME@.qm");
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");
+ fullPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, subPath);
+ if (fullPath.isEmpty()) {
+ return false;
+ }
}
QTranslator *translator = new QTranslator(QCoreApplication::instance());
if (!translator->load(fullPath)) {
--
2.12.3

3
extra-cmake-modules-5.35.0.tar.xz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b020fd5451f4aae9702b575dda07a125b5c1fcfb04e4c840f76063989e80ec30
size 302176

3
extra-cmake-modules-5.36.0.tar.xz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6e120bb40411ef559583ef693c0c03a41df3bb40a932bf7444c97e04266d5daf
size 311140

28
extra-cmake-modules.changes
View File

@@ -1,3 +1,31 @@
-------------------------------------------------------------------
Thu Jul 13 14:22:07 UTC 2017 - wbauer@tmo.at
- Add bundle-lang.patch to find .qm translations in
/usr/share/locale-bundle/ (boo#1027925, boo#1048030)
-------------------------------------------------------------------
Wed Jul 12 07:13:58 CEST 2017 - lbeltrame@kde.org
- Update to 5.36.0
* New feature release
* For more details please see:
* https://www.kde.org/announcements/kde-frameworks-5.36.0.php
- Changes since 5.35.0:
* FindQHelpGenerator: avoid picking up Qt4 version
* ECMAddQch: fail hard if needed tools are not present, to avoid surprises
* Drop perl as dep for ecm_add_qch, not needed/used
* (always include CheckCXXCompilerFlag before calling it)
* guess less, test more
* detect Xcode <= 6.2 from Clang version only
* scan the whole install folder for qml dependencies
* New: ECMAddQch, for generating qch & doxygen tag files
* tests: improve error reporting for ECMAddAppIconTest
* tests: fix output directory for KDEFetchTranslations
* tests: fix last change on KDEFetchTranslations
* tests: hopefully fix KDEFetchTranslations on Windows
* Fix KDEInstallDirsTest.relative_or_absolute_usr, avoid Qt paths being used
-------------------------------------------------------------------
Sun Jun 11 09:27:42 CEST 2017 - lbeltrame@kde.org

7
extra-cmake-modules.spec
View File

@@ -16,15 +16,17 @@
#
%define _tar_path 5.35
%define _tar_path 5.36
Name: extra-cmake-modules
Summary: CMake modules
License: BSD-3-Clause
Group: Development/Tools/Other
Url: https://projects.kde.org/projects/kdesupport/extra-cmake-modules
Version: 5.35.0
Version: 5.36.0
Release: 0
Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE
Patch0: bundle-lang.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake >= 3.0
BuildRequires: gcc-c++
@@ -58,6 +60,7 @@ This package provides documentation for extra-cmake-modules
%prep
%setup -q
%patch0 -p1
%build
%cmake_kf5 -d build