From a603773e637a6a0841b2a321d4f81c81ba829fd11c7ee23019e2a95d80202641 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 2 Aug 2014 13:04:01 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/extra-cmake-modules?expand=0&rev=27 --- extra-cmake-modules-1.0.0.tar.xz | 3 --- extra-cmake-modules-1.1.0.tar.xz | 3 +++ extra-cmake-modules.changes | 7 +++++++ extra-cmake-modules.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 extra-cmake-modules-1.0.0.tar.xz create mode 100644 extra-cmake-modules-1.1.0.tar.xz diff --git a/extra-cmake-modules-1.0.0.tar.xz b/extra-cmake-modules-1.0.0.tar.xz deleted file mode 100644 index 8db6d5a..0000000 --- a/extra-cmake-modules-1.0.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41434c8c8f79efe4a9e44ef18daa0bc3ecc86834f5f8f2ae3c2acc612127093c -size 116972 diff --git a/extra-cmake-modules-1.1.0.tar.xz b/extra-cmake-modules-1.1.0.tar.xz new file mode 100644 index 0000000..028f40e --- /dev/null +++ b/extra-cmake-modules-1.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b460126dfc5faabb64fe4f0f9ec0d247fe75cf66c2a8a5f0d66d4a45f73e303 +size 117380 diff --git a/extra-cmake-modules.changes b/extra-cmake-modules.changes index ddd0719..9b99840 100644 --- a/extra-cmake-modules.changes +++ b/extra-cmake-modules.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Tue Jul 1 21:35:28 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/extra-cmake-modules.spec b/extra-cmake-modules.spec index afe93d9..ba12a57 100644 --- a/extra-cmake-modules.spec +++ b/extra-cmake-modules.spec @@ -21,7 +21,7 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build From b1510a79a0ecb0bc104693785856222d41759ba9976a4819ff1a3bc82135fbef Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Thu, 7 Aug 2014 22:34:51 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/extra-cmake-modules?expand=0&rev=28 --- ...-debugfull-hack-from-ECMConfig.cmake.patch | 38 +++++++++++++++++++ extra-cmake-modules.changes | 4 ++ extra-cmake-modules.spec | 6 ++- 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 0001-Remove-Qt5-debugfull-hack-from-ECMConfig.cmake.patch diff --git a/0001-Remove-Qt5-debugfull-hack-from-ECMConfig.cmake.patch b/0001-Remove-Qt5-debugfull-hack-from-ECMConfig.cmake.patch new file mode 100644 index 0000000..37a3c6f --- /dev/null +++ b/0001-Remove-Qt5-debugfull-hack-from-ECMConfig.cmake.patch @@ -0,0 +1,38 @@ +From 5b43e2def89b278d84344e0adf8d91b235d0f89a Mon Sep 17 00:00:00 2001 +From: Alex Merry +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 $<$,$>>:QT_NO_DEBUG>) +-else() +- message(FATAL_ERROR \"Remove this hack. Set CMAKE_MAP_IMPORTED_TARGET_DEBUGFULL to DEBUG instead.\") +-endif() +-- +2.0.3 + diff --git a/extra-cmake-modules.changes b/extra-cmake-modules.changes index 9b99840..a990cdb 100644 --- a/extra-cmake-modules.changes +++ b/extra-cmake-modules.changes @@ -4,6 +4,10 @@ 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 diff --git a/extra-cmake-modules.spec b/extra-cmake-modules.spec index ba12a57..bd0ae1a 100644 --- a/extra-cmake-modules.spec +++ b/extra-cmake-modules.spec @@ -23,13 +23,16 @@ Group: Development/Tools/Other Url: https://projects.kde.org/projects/kdesupport/extra-cmake-modules 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 @@ -55,6 +58,7 @@ This package provides documentation for extra-cmake-modules %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build From 6f87c12bd6e40a43862cf1570ca1795be39bf97574ea7afc677bab9b62811894 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Thu, 7 Aug 2014 22:35:55 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/extra-cmake-modules?expand=0&rev=29 --- extra-cmake-modules.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/extra-cmake-modules.spec b/extra-cmake-modules.spec index bd0ae1a..35b79da 100644 --- a/extra-cmake-modules.spec +++ b/extra-cmake-modules.spec @@ -34,7 +34,6 @@ 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