Accepting request 337272 from home:alarrosa:branches:KDE:Frameworks5
- Added fix-build-with-cmake-less-than-3.0.0.diff to not include Qt5UiPlugin module if we don't have cmake 3.0.0 since that module requires it OBS-URL: https://build.opensuse.org/request/show/337272 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdesignerplugin?expand=0&rev=67
This commit is contained in:
parent
da14f23aef
commit
2e2b52777f
13
fix-build-with-cmake-less-than-3.0.0.diff
Normal file
13
fix-build-with-cmake-less-than-3.0.0.diff
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
Index: kdesignerplugin-5.15.0/KF5DesignerPluginMacros.cmake
|
||||||
|
===================================================================
|
||||||
|
--- kdesignerplugin-5.15.0.orig/KF5DesignerPluginMacros.cmake
|
||||||
|
+++ kdesignerplugin-5.15.0/KF5DesignerPluginMacros.cmake
|
||||||
|
@@ -87,7 +87,7 @@ macro(kf5designerplugin_add_plugin targe
|
||||||
|
PURPOSE "Required to build Qt Designer plugins"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
- if(NOT Qt5Designer_VERSION_STRING VERSION_LESS 5.5.0 AND NOT Qt5UiPlugin_FOUND)
|
||||||
|
+ if(NOT Qt5Designer_VERSION_STRING VERSION_LESS 5.5.0 AND NOT Qt5UiPlugin_FOUND AND NOT CMAKE_VERSION VERSION_LESS 3.0.0)
|
||||||
|
find_package(Qt5UiPlugin ${REQUIRED_QT_VERSION} ${_requiredarg} NO_MODULE)
|
||||||
|
set_package_properties(Qt5UiPlugin PROPERTIES
|
||||||
|
PURPOSE "Required to build Qt Designer plugins"
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 8 14:30:46 UTC 2015 - alarrosa@suse.com
|
||||||
|
|
||||||
|
- Added fix-build-with-cmake-less-than-3.0.0.diff to not include
|
||||||
|
Qt5UiPlugin module if we don't have cmake 3.0.0 since that module
|
||||||
|
requires it
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Oct 5 17:37:11 UTC 2015 - hrvoje.senjan@gmail.com
|
Mon Oct 5 17:37:11 UTC 2015 - hrvoje.senjan@gmail.com
|
||||||
|
|
||||||
|
@ -55,6 +55,8 @@ License: LGPL-2.1+
|
|||||||
Group: System/GUI/KDE
|
Group: System/GUI/KDE
|
||||||
Url: http://www.kde.org
|
Url: http://www.kde.org
|
||||||
Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
|
Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
|
||||||
|
# PATCH-FIX_OPENSUSE fix-build-with-cmake-less-than-3.0.0.diff alarrosa@suse.com -- Don't include cmake files that depend on newer cmake versions
|
||||||
|
Patch0: fix-build-with-cmake-less-than-3.0.0.diff
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -79,6 +81,7 @@ from ini-style description files. Development files.
|
|||||||
%lang_package
|
%lang_package
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake_kf5 -d build
|
%cmake_kf5 -d build
|
||||||
|
Loading…
Reference in New Issue
Block a user