pool/kdesignerplugin
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 337636 from KDE:Frameworks5

Browse Source 
Update to 5.15.0

OBS-URL: https://build.opensuse.org/request/show/337636
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdesignerplugin?expand=0&rev=22
This commit is contained in:
Dominique Leuenberger
2015-10-19 20:23:52 +00:00
committed by Git OBS Bridge
parent e2a45282c8 245759f940
commit a42e3f0037
5 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
fix-build-with-cmake-less-than-3.0.0.diff Normal file
View 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"

3
kdesignerplugin-5.14.0.tar.xz
View File

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

3
kdesignerplugin-5.15.0.tar.xz Normal file
View File

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

15
kdesignerplugin.changes
View File

@@ -1,3 +1,18 @@
-------------------------------------------------------------------
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
- Update to 5.15.0
* Qt moc can't handle macros (QT_VERSION_CHECK)
* For more details please see:
https://www.kde.org/announcements/kde-frameworks-5.15.0.php
-------------------------------------------------------------------
Tue Sep 8 17:12:58 UTC 2015 - hrvoje.senjan@gmail.com

7
kdesignerplugin.spec
View File

@@ -17,9 +17,9 @@
%bcond_without lang
%define _tar_path 5.14
%define _tar_path 5.15
Name: kdesignerplugin
Version: 5.14.0
Version: 5.15.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 2.8.12
@@ -55,6 +55,8 @@ License: LGPL-2.1+
Group: System/GUI/KDE
Url: http://www.kde.org
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
%description
@@ -79,6 +81,7 @@ from ini-style description files. Development files.
%lang_package
%prep
%setup -q
%patch0 -p1
%build
%cmake_kf5 -d build