Accepting request 244385 from KDE:Frameworks5

Update to 1.1.0

OBS-URL: https://build.opensuse.org/request/show/244385
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/extra-cmake-modules?expand=0&rev=7
This commit is contained in:
Ludwig Nussel 2014-08-16 13:41:30 +00:00 committed by Git OBS Bridge
commit 4d4b84b5dc
5 changed files with 58 additions and 6 deletions

View File

@ -0,0 +1,38 @@
From 5b43e2def89b278d84344e0adf8d91b235d0f89a Mon Sep 17 00:00:00 2001
From: Alex Merry <alex.merry@kde.org>
Date: Sun, 3 Aug 2014 17:30:32 +0100
Subject: [PATCH 1/1] Remove Qt5 debugfull hack from ECMConfig.cmake
The original purpose of this was to set the QT_NO_DEBUG macro if the old
DebugFull configuration was used. We got rid of DebugFull (instead just
using Debug), so it is no longer relevant, and this hack never belonged
in ECMConfig.cmake anyway (it should have been in KDECompilerSettings).
CHANGELOG: ECM now works when the required CMake version is set to
3.0.0 or higher, and does not require Qt5Core to be available.
BUG: 331849
REVIEW: 119588
---
ECMConfig.cmake.in | 7 -------
1 file changed, 7 deletions(-)
diff --git a/ECMConfig.cmake.in b/ECMConfig.cmake.in
index ea47abf..b163e3a 100644
--- a/ECMConfig.cmake.in
+++ b/ECMConfig.cmake.in
@@ -16,10 +16,3 @@ set(ECM_KDE_MODULE_DIR "@PACKAGE_KDE_MODULES_INSTALL_DIR@")
set(ECM_MODULE_PATH "${ECM_MODULE_DIR}" "${ECM_FIND_MODULE_DIR}" "${ECM_KDE_MODULE_DIR}")
include("${ECM_MODULE_DIR}/ECMUseFindModules.cmake")
-
-if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.13)
- find_package(Qt5Core 5.2.0 REQUIRED)
- set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_DEFINITIONS QT_CORE_LIB $<$<NOT:$<OR:$<CONFIG:Debug>,$<CONFIG:DebugFull>>>:QT_NO_DEBUG>)
-else()
- message(FATAL_ERROR \"Remove this hack. Set CMAKE_MAP_IMPORTED_TARGET_DEBUGFULL to DEBUG instead.\")
-endif()
--
2.0.3

View File

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

View File

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

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sat Aug 2 10:20:07 UTC 2014 - hrvoje.senjan@gmail.com
- Update to 1.1.0
* For more details please see:
http://www.kde.org/announcements/kde-frameworks-5.1.php
- Add Source URL
- Added 0001-Remove-Qt5-debugfull-hack-from-ECMConfig.cmake.patch from
upstream
- Per patch, pkgconfig(Qt5Core) >= 5.2.0 for gcc-c++ Requires
-------------------------------------------------------------------
Tue Jul 1 21:35:28 UTC 2014 - hrvoje.senjan@gmail.com

View File

@ -21,17 +21,19 @@ Summary: CMake modules
License: BSD-3-Clause
Group: Development/Tools/Other
Url: https://projects.kde.org/projects/kdesupport/extra-cmake-modules
Version: 1.0.0
Version: 1.1.0
Release: 0
Source0: %{name}-%{version}.tar.xz
Source: http://download.kde.org/stable/frameworks/5.1.0/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM 0001-Remove-Qt5-debugfull-hack-from-ECMConfig.cmake.patch
Patch0: 0001-Remove-Qt5-debugfull-hack-from-ECMConfig.cmake.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake >= 2.8.12
BuildRequires: gcc-c++
BuildRequires: kf5-filesystem >= 4.100.0
BuildRequires: python-Sphinx
Requires: cmake >= 2.8.12
Requires: gcc-c++
Requires: kf5-filesystem
Requires: pkgconfig(Qt5Core) >= 5.2.0
Provides: kf5umbrella = 4.99.0
Obsoletes: kf5umbrella < 4.99.0
Recommends: %{name}-doc
@ -55,6 +57,7 @@ This package provides documentation for extra-cmake-modules
%prep
%setup -q
%patch0 -p1
%build
%cmake_kf5 -d build