Hello community, here is the log from the commit of package kdeclarative for openSUSE:Factory checked in at 2016-07-15 12:33:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeclarative (Old) and /work/SRC/openSUSE:Factory/.kdeclarative.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdeclarative" Changes: -------- --- /work/SRC/openSUSE:Factory/kdeclarative/kdeclarative.changes 2016-07-03 12:21:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdeclarative.new/kdeclarative.changes 2016-07-15 12:33:11.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Jul 6 15:02:47 UTC 2016 - [email protected] + +- Update to 5.24.0 + * Make epoxy optional + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.24.0.php + +------------------------------------------------------------------- Old: ---- kdeclarative-5.23.0.tar.xz New: ---- kdeclarative-5.24.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeclarative.spec ++++++ --- /var/tmp/diff_new_pack.bJsrYh/_old 2016-07-15 12:33:12.000000000 +0200 +++ /var/tmp/diff_new_pack.bJsrYh/_new 2016-07-15 12:33:12.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Declarative5 -%define _tar_path 5.23 +%define _tar_path 5.24 Name: kdeclarative -Version: 5.23.0 +Version: 5.24.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 ++++++ kdeclarative-5.23.0.tar.xz -> kdeclarative-5.24.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.23.0/CMakeLists.txt new/kdeclarative-5.24.0/CMakeLists.txt --- old/kdeclarative-5.23.0/CMakeLists.txt 2016-06-06 13:30:33.000000000 +0200 +++ new/kdeclarative-5.24.0/CMakeLists.txt 2016-07-03 02:04:45.000000000 +0200 @@ -4,15 +4,15 @@ # Dependencies include(FeatureSummary) -find_package(ECM 5.23.0 NO_MODULE) +find_package(ECM 5.24.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) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) set(REQUIRED_QT_VERSION 5.4.0) -set(KF5_VERSION "5.23.0") # handled by release scripts -set(KF5_DEP_VERSION "5.23.0") # handled by release scripts +set(KF5_VERSION "5.24.0") # handled by release scripts +set(KF5_DEP_VERSION "5.24.0") # handled by release scripts find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Qml Quick Gui) include(KDEInstallDirs) @@ -64,13 +64,16 @@ ki18n_install(po) endif() -if (NOT WIN32) find_package(epoxy) set_package_properties(epoxy PROPERTIES DESCRIPTION "libepoxy" URL "http://github.com/anholt/libepoxy"; - TYPE REQUIRED + TYPE OPTIONAL PURPOSE "OpenGL dispatch library" ) + +set(HAVE_EPOXY 0) +if(epoxy_FOUND) + set(HAVE_EPOXY 1) endif() add_subdirectory(autotests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.23.0/metainfo.yaml new/kdeclarative-5.24.0/metainfo.yaml --- old/kdeclarative-5.23.0/metainfo.yaml 2016-06-06 13:30:33.000000000 +0200 +++ new/kdeclarative-5.24.0/metainfo.yaml 2016-07-03 02:04:45.000000000 +0200 @@ -3,7 +3,9 @@ tier: 3 type: functional platforms: - - name: All + - name: Linux + - name: Windows + - name: MacOSX note: The supported remote Urls depends from what runtime kio slaves plugins are installed portingAid: false deprecated: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.23.0/po/ca/kdeclarative5.po new/kdeclarative-5.24.0/po/ca/kdeclarative5.po --- old/kdeclarative-5.23.0/po/ca/kdeclarative5.po 2016-06-06 13:30:33.000000000 +0200 +++ new/kdeclarative-5.24.0/po/ca/kdeclarative5.po 2016-07-03 02:04:45.000000000 +0200 @@ -1,12 +1,12 @@ # Translation of kdeclarative5.po to Catalan -# Copyright (C) 2014-2015 This_file_is_part_of_KDE +# Copyright (C) 2014-2016 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # # Sebastià Pla i Sanz <[email protected]>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007. # Antoni Bella Pérez <[email protected]>, 2003, 2006, 2011, 2012, 2013, 2014. # Albert Astals Cid <[email protected]>, 2004, 2005, 2007. -# Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. +# Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016. # Robert Millan <[email protected]>, 2009. # Orestes Mas <[email protected]>, 2010. msgid "" @@ -14,7 +14,7 @@ "Project-Id-Version: kdeclarative5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-05-08 07:20+0000\n" -"PO-Revision-Date: 2015-10-18 16:02+0200\n" +"PO-Revision-Date: 2016-06-07 20:30+0200\n" "Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca\n" @@ -95,8 +95,8 @@ #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:407 msgid "The key you just pressed is not supported by Qt." -msgstr "La tecla que heu premut no està implementada a les Qt." +msgstr "La tecla que heu premut no està admesa a les Qt." #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:408 msgid "Unsupported Key" -msgstr "Tecla no implementada" +msgstr "Tecla no admesa" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.23.0/po/ca@valencia/kdeclarative5.po new/kdeclarative-5.24.0/po/ca@valencia/kdeclarative5.po --- old/kdeclarative-5.23.0/po/ca@valencia/kdeclarative5.po 2016-06-06 13:30:33.000000000 +0200 +++ new/kdeclarative-5.24.0/po/ca@valencia/kdeclarative5.po 2016-07-03 02:04:45.000000000 +0200 @@ -6,7 +6,7 @@ # Sebastià Pla i Sanz <[email protected]>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007. # Antoni Bella Pérez <[email protected]>, 2003, 2006, 2011, 2012, 2013, 2014. # Albert Astals Cid <[email protected]>, 2004, 2005, 2007. -# Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. +# Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016. # Robert Millan <[email protected]>, 2009. # Orestes Mas <[email protected]>, 2010. msgid "" @@ -14,7 +14,7 @@ "Project-Id-Version: kdeclarative5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-05-08 07:20+0000\n" -"PO-Revision-Date: 2015-10-18 16:02+0200\n" +"PO-Revision-Date: 2016-06-07 20:30+0200\n" "Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" @@ -95,8 +95,8 @@ #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:407 msgid "The key you just pressed is not supported by Qt." -msgstr "La tecla que heu premut no està implementada a les Qt." +msgstr "La tecla que heu premut no està admesa a les Qt." #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:408 msgid "Unsupported Key" -msgstr "Tecla no implementada" +msgstr "Tecla no admesa" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.23.0/po/it/kdeclarative5.po new/kdeclarative-5.24.0/po/it/kdeclarative5.po --- old/kdeclarative-5.23.0/po/it/kdeclarative5.po 2016-06-06 13:30:33.000000000 +0200 +++ new/kdeclarative-5.24.0/po/it/kdeclarative5.po 2016-07-03 02:04:45.000000000 +0200 @@ -23,7 +23,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.23.0/src/qmlcontrols/kquickcontrolsaddons/CMakeLists.txt new/kdeclarative-5.24.0/src/qmlcontrols/kquickcontrolsaddons/CMakeLists.txt --- old/kdeclarative-5.23.0/src/qmlcontrols/kquickcontrolsaddons/CMakeLists.txt 2016-06-06 13:30:33.000000000 +0200 +++ new/kdeclarative-5.24.0/src/qmlcontrols/kquickcontrolsaddons/CMakeLists.txt 2016-07-03 02:04:45.000000000 +0200 @@ -1,5 +1,7 @@ project(kquickcontrolsaddons) +configure_file(config-kquickcontrolsaddons.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kquickcontrolsaddons.h) + set(kquickcontrolsaddons_SRCS kquickcontrolsaddonsplugin.cpp qpixmapitem.cpp @@ -14,7 +16,7 @@ icondialog.cpp ) -if (NOT WIN32) +if (HAVE_EPOXY) set(kquickcontrolsaddons_SRCS ${kquickcontrolsaddons_SRCS} plotter.cpp) set(KQUICKCONTROLSADDONS_EXTRA_LIBS ${epoxy_LIBRARY}) include_directories(${epoxy_INCLUDE_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.23.0/src/qmlcontrols/kquickcontrolsaddons/config-kquickcontrolsaddons.h.cmake new/kdeclarative-5.24.0/src/qmlcontrols/kquickcontrolsaddons/config-kquickcontrolsaddons.h.cmake --- old/kdeclarative-5.23.0/src/qmlcontrols/kquickcontrolsaddons/config-kquickcontrolsaddons.h.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeclarative-5.24.0/src/qmlcontrols/kquickcontrolsaddons/config-kquickcontrolsaddons.h.cmake 2016-07-03 02:04:45.000000000 +0200 @@ -0,0 +1,2 @@ +// epoxy library available? +#cmakedefine01 HAVE_EPOXY diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.23.0/src/qmlcontrols/kquickcontrolsaddons/kquickcontrolsaddonsplugin.cpp new/kdeclarative-5.24.0/src/qmlcontrols/kquickcontrolsaddons/kquickcontrolsaddonsplugin.cpp --- old/kdeclarative-5.23.0/src/qmlcontrols/kquickcontrolsaddons/kquickcontrolsaddonsplugin.cpp 2016-06-06 13:30:33.000000000 +0200 +++ new/kdeclarative-5.24.0/src/qmlcontrols/kquickcontrolsaddons/kquickcontrolsaddonsplugin.cpp 2016-07-03 02:04:45.000000000 +0200 @@ -20,6 +20,7 @@ */ #include "kquickcontrolsaddonsplugin.h" +#include "config-kquickcontrolsaddons.h" #include <QtQml> #include <QDebug> @@ -35,7 +36,7 @@ #include "icondialog.h" #include "eventgenerator.h" -#ifndef Q_OS_WIN +#if HAVE_EPOXY #include "plotter.h" #endif @@ -62,8 +63,7 @@ qmlRegisterType<IconDialog>(uri, 2, 0, "IconDialog"); qmlRegisterType<EventGenerator>(uri, 2, 0, "EventGenerator"); -//TODO: make this work under Windows -#ifndef Q_OS_WIN +#if HAVE_EPOXY qmlRegisterType<PlotData>(uri, 2, 0, "PlotData"); qmlRegisterType<Plotter>(uri, 2, 0, "Plotter"); #endif
