Hello community, here is the log from the commit of package kdesignerplugin for openSUSE:Factory checked in at 2015-10-19 22:23:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdesignerplugin (Old) and /work/SRC/openSUSE:Factory/.kdesignerplugin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdesignerplugin" Changes: -------- --- /work/SRC/openSUSE:Factory/kdesignerplugin/kdesignerplugin.changes 2015-09-24 07:11:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdesignerplugin.new/kdesignerplugin.changes 2015-10-19 22:23:53.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Oct 8 14:30:46 UTC 2015 - alarr...@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.sen...@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 + +------------------------------------------------------------------- Old: ---- kdesignerplugin-5.14.0.tar.xz New: ---- fix-build-with-cmake-less-than-3.0.0.diff kdesignerplugin-5.15.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesignerplugin.spec ++++++ --- /var/tmp/diff_new_pack.EJwXJA/_old 2015-10-19 22:23:53.000000000 +0200 +++ /var/tmp/diff_new_pack.EJwXJA/_new 2015-10-19 22:23:53.000000000 +0200 @@ -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 @@ 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 alarr...@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 @@ %lang_package %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build ++++++ fix-build-with-cmake-less-than-3.0.0.diff ++++++ 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" ++++++ kdesignerplugin-5.14.0.tar.xz -> kdesignerplugin-5.15.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesignerplugin-5.14.0/CMakeLists.txt new/kdesignerplugin-5.15.0/CMakeLists.txt --- old/kdesignerplugin-5.14.0/CMakeLists.txt 2015-09-05 10:57:42.000000000 +0200 +++ new/kdesignerplugin-5.15.0/CMakeLists.txt 2015-10-05 10:00:36.000000000 +0200 @@ -3,7 +3,7 @@ project(KDesignerPlugin) include(FeatureSummary) -find_package(ECM 5.14.0 NO_MODULE) +find_package(ECM 5.15.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -25,8 +25,8 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.14.0") # handled by release scripts -set(KF5_DEP_VERSION "5.14.0") # handled by release scripts +set(KF5_VERSION "5.15.0") # handled by release scripts +set(KF5_DEP_VERSION "5.15.0") # handled by release scripts find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED) find_package(KF5DocTools ${KF5_DEP_VERSION} REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesignerplugin-5.14.0/KF5DesignerPluginMacros.cmake new/kdesignerplugin-5.15.0/KF5DesignerPluginMacros.cmake --- old/kdesignerplugin-5.14.0/KF5DesignerPluginMacros.cmake 2015-09-05 10:57:42.000000000 +0200 +++ new/kdesignerplugin-5.15.0/KF5DesignerPluginMacros.cmake 2015-10-05 10:00:36.000000000 +0200 @@ -87,9 +87,22 @@ PURPOSE "Required to build Qt Designer plugins" ) endif() + if(NOT Qt5Designer_VERSION_STRING VERSION_LESS 5.5.0 AND NOT Qt5UiPlugin_FOUND) + find_package(Qt5UiPlugin ${REQUIRED_QT_VERSION} ${_requiredarg} NO_MODULE) + set_package_properties(Qt5UiPlugin PROPERTIES + PURPOSE "Required to build Qt Designer plugins" + ) + endif() + if (Qt5UiPlugin_FOUND) + # for some reason, Qt5UiPlugin does not set its _INCLUDE_DIRS variable. Fill it manually + get_target_property(Qt5UiPlugin_INCLUDE_DIRS Qt5::UiPlugin INTERFACE_INCLUDE_DIRECTORIES) + endif() if(Qt5Designer_FOUND) add_library(${target} MODULE ${_files}) - target_include_directories(${target} PRIVATE ${Qt5Designer_INCLUDE_DIRS}) + target_include_directories(${target} + PRIVATE ${Qt5UiPlugin_INCLUDE_DIRS} + PRIVATE ${Qt5Designer_INCLUDE_DIRS} + ) endif() endmacro() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesignerplugin-5.14.0/po/eo/kdesignerplugin5_qt.po new/kdesignerplugin-5.15.0/po/eo/kdesignerplugin5_qt.po --- old/kdesignerplugin-5.14.0/po/eo/kdesignerplugin5_qt.po 2015-09-05 10:57:42.000000000 +0200 +++ new/kdesignerplugin-5.15.0/po/eo/kdesignerplugin5_qt.po 2015-10-05 10:00:36.000000000 +0200 @@ -28,8 +28,6 @@ "X-Qt-Contexts: true\n" #: kgendesignerplugin.cpp:88 -#, fuzzy -#| msgid "Builds Qt widget plugins from an ini style description file." msgctxt "main|" msgid "Builds Qt widget plugins from an ini style description file." msgstr "" @@ -73,22 +71,16 @@ msgstr "" #: kgendesignerplugin.cpp:105 -#, fuzzy -#| msgid "(C) 2004-2005 Ian Reinhart Geiser" msgctxt "kgendesignerplugin about data|" msgid "(C) 2004-2005 Ian Reinhart Geiser" msgstr "(C) 2004-2005 Ian Reinhart Geiser" #: kgendesignerplugin.cpp:109 -#, fuzzy -#| msgid "Ian Reinhart Geiser" msgctxt "kgendesignerplugin about data|" msgid "Ian Reinhart Geiser" msgstr "Ian Reinhart Geiser" #: kgendesignerplugin.cpp:110 -#, fuzzy -#| msgid "Daniel Molkentin" msgctxt "kgendesignerplugin about data|" msgid "Daniel Molkentin" msgstr "Daniel Molkentin" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesignerplugin-5.14.0/po/nb/kdesignerplugin5_qt.po new/kdesignerplugin-5.15.0/po/nb/kdesignerplugin5_qt.po --- old/kdesignerplugin-5.14.0/po/nb/kdesignerplugin5_qt.po 2015-09-05 10:57:42.000000000 +0200 +++ new/kdesignerplugin-5.15.0/po/nb/kdesignerplugin5_qt.po 2015-10-05 10:00:36.000000000 +0200 @@ -1,5 +1,3 @@ -# Translation of kdesignerplugin5_qt to Norwegian Bokmål -# # Knut Yrvin <knut.yr...@gmail.com>, 2002, 2003, 2004, 2005. # Bjørn Steensrud <bjor...@skogkatt.homelinux.org>, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. # Eskild Hustvedt <zerod...@skolelinux.no>, 2004, 2005. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesignerplugin-5.14.0/po/se/kdesignerplugin5_qt.po new/kdesignerplugin-5.15.0/po/se/kdesignerplugin5_qt.po --- old/kdesignerplugin-5.14.0/po/se/kdesignerplugin5_qt.po 2015-09-05 10:57:42.000000000 +0200 +++ new/kdesignerplugin-5.15.0/po/se/kdesignerplugin5_qt.po 2015-10-05 10:00:36.000000000 +0200 @@ -1,5 +1,3 @@ -# Translation of kdesignerplugin5_qt to Northern Sami -# # Børre Gaup <boe...@skolelinux.no>, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012. msgid "" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesignerplugin-5.14.0/src/kde.widgets new/kdesignerplugin-5.15.0/src/kde.widgets --- old/kdesignerplugin-5.14.0/src/kde.widgets 2015-09-05 10:57:42.000000000 +0200 +++ new/kdesignerplugin-5.15.0/src/kde.widgets 2015-10-05 10:00:36.000000000 +0200 @@ -8,6 +8,13 @@ Group=Views (KDE) # KWidgetsAddons +[KMessageWidget] +IncludeFile=kmessagewidget.h +ToolTip=Display an information or error message in an animated bubble. +Group=Display (KDE) +ConstructorArgs=(parent) + +# KWidgetsAddons [KAnimatedButton] IncludeFile=kanimatedbutton.h ToolTip=An extended version of QToolButton which can display an animated icon. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesignerplugin-5.14.0/src/kgendesignerplugin.cpp new/kdesignerplugin-5.15.0/src/kgendesignerplugin.cpp --- old/kdesignerplugin-5.14.0/src/kgendesignerplugin.cpp 2015-09-05 10:57:42.000000000 +0200 +++ new/kdesignerplugin-5.15.0/src/kgendesignerplugin.cpp 2015-10-05 10:00:36.000000000 +0200 @@ -21,7 +21,7 @@ "*/\n" "#include <QIcon>\n" "#include <QtDesigner/QDesignerContainerExtension>\n" - "#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)\n" + "#if QT_VERSION >= 0x050500\n" "# include <QtUiPlugin/QDesignerCustomWidgetInterface>\n" "#else\n" "# include <QDesignerCustomWidgetInterface>\n"
