From 7b347883a1105926de6bcc103bc5a9e2c849da7b807fbd63e2a43c3f64296929 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 8 Nov 2015 17:05:09 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdesignerplugin?expand=0&rev=71 --- fix-build-with-cmake-less-than-3.0.0.diff | 13 ------------- kdesignerplugin.changes | 1 + 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 fix-build-with-cmake-less-than-3.0.0.diff diff --git a/fix-build-with-cmake-less-than-3.0.0.diff b/fix-build-with-cmake-less-than-3.0.0.diff deleted file mode 100644 index 5054261..0000000 --- a/fix-build-with-cmake-less-than-3.0.0.diff +++ /dev/null @@ -1,13 +0,0 @@ -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" diff --git a/kdesignerplugin.changes b/kdesignerplugin.changes index 646fe5e..8183282 100644 --- a/kdesignerplugin.changes +++ b/kdesignerplugin.changes @@ -4,6 +4,7 @@ Sun Nov 8 16:59:42 UTC 2015 - hrvoje.senjan@gmail.com - Update to 5.16.0 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.16.0.php +- Drop fix-build-with-cmake-less-than-3.0.0.diff, upstreamed ------------------------------------------------------------------- Thu Oct 8 14:30:46 UTC 2015 - alarrosa@suse.com