Hello community, here is the log from the commit of package kdeclarative for openSUSE:Factory checked in at 2018-03-20 21:44:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeclarative (Old) and /work/SRC/openSUSE:Factory/.kdeclarative.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdeclarative" Tue Mar 20 21:44:15 2018 rev:53 rq:586817 version:5.44.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdeclarative/kdeclarative.changes 2018-02-16 21:29:23.360183520 +0100 +++ /work/SRC/openSUSE:Factory/.kdeclarative.new/kdeclarative.changes 2018-03-20 21:45:11.278459297 +0100 @@ -1,0 +2,12 @@ +Mon Mar 12 23:29:41 CET 2018 - [email protected] + +- Update to 5.44.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.44.0.php +- Changes since 5.43.0: + * Fix the build failure on armhf/aarch64 + * Kill QmlObjectIncubationController + * disconnect render() on window change (kde#388508, kde#374280, kde#365052, kde#343576) + +------------------------------------------------------------------- Old: ---- kdeclarative-5.43.0.tar.xz New: ---- kdeclarative-5.44.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeclarative.spec ++++++ --- /var/tmp/diff_new_pack.7iPqwF/_old 2018-03-20 21:45:12.454416973 +0100 +++ /var/tmp/diff_new_pack.7iPqwF/_new 2018-03-20 21:45:12.454416973 +0100 @@ -18,20 +18,20 @@ %bcond_without lang %define lname libKF5Declarative5 -%define _tar_path 5.43 +%define _tar_path 5.44 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kdeclarative -Version: 5.43.0 +Version: 5.44.0 Release: 0 %define kf5_version %{version} Summary: Integration of QML and KDE workspaces # Note for legal: GPL-2.0+ files relicensed upstream with permission from the authors # See commits g7482bef08, g62b8e46 and gaf91457 in the upstream KDE repository. # They will be part of the next release (5.39) -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz ++++++ kdeclarative-5.43.0.tar.xz -> kdeclarative-5.44.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.43.0/CMakeLists.txt new/kdeclarative-5.44.0/CMakeLists.txt --- old/kdeclarative-5.43.0/CMakeLists.txt 2018-02-05 12:58:42.000000000 +0100 +++ new/kdeclarative-5.44.0/CMakeLists.txt 2018-03-03 11:02:11.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.43.0") # handled by release scripts -set(KF5_DEP_VERSION "5.43.0") # handled by release scripts +set(KF5_VERSION "5.44.0") # handled by release scripts +set(KF5_DEP_VERSION "5.44.0") # handled by release scripts project(KDeclarative VERSION ${KF5_VERSION}) # Dependencies include(FeatureSummary) -find_package(ECM 5.43.0 NO_MODULE) +find_package(ECM 5.44.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.43.0/po/id/kdeclarative5.po new/kdeclarative-5.44.0/po/id/kdeclarative5.po --- old/kdeclarative-5.43.0/po/id/kdeclarative5.po 2018-02-05 12:58:42.000000000 +0100 +++ new/kdeclarative-5.44.0/po/id/kdeclarative5.po 2018-03-03 11:02:11.000000000 +0100 @@ -17,7 +17,6 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 2.0\n" #, kde-format msgctxt "NAME OF TRANSLATORS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.43.0/po/nb/kdeclarative5.po new/kdeclarative-5.44.0/po/nb/kdeclarative5.po --- old/kdeclarative-5.43.0/po/nb/kdeclarative5.po 2018-02-05 12:58:42.000000000 +0100 +++ new/kdeclarative-5.44.0/po/nb/kdeclarative5.po 2018-03-03 11:02:11.000000000 +0100 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-06-30 03:05+0200\n" +"POT-Creation-Date: 2017-11-30 03:07+0100\n" "PO-Revision-Date: 2015-04-28 08:55+0200\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" @@ -40,7 +40,7 @@ msgid "KPackage QML application shell" msgstr "KPackage QML programskall" -#: kpackagelauncherqml/main.cpp:51 +#: kpackagelauncherqml/main.cpp:50 #, kde-format msgid "The unique name of the application (mandatory)" msgstr "Det entydige navnet på programmet (obligatorisk)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.43.0/po/zh_CN/kdeclarative5.po new/kdeclarative-5.44.0/po/zh_CN/kdeclarative5.po --- old/kdeclarative-5.43.0/po/zh_CN/kdeclarative5.po 2018-02-05 12:58:42.000000000 +0100 +++ new/kdeclarative-5.44.0/po/zh_CN/kdeclarative5.po 2018-03-03 11:02:11.000000000 +0100 @@ -15,7 +15,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-30 03:07+0100\n" -"PO-Revision-Date: 2018-02-01 07:11-0500\n" +"PO-Revision-Date: 2018-02-28 02:23-0500\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.43.0/src/kdeclarative/CMakeLists.txt new/kdeclarative-5.44.0/src/kdeclarative/CMakeLists.txt --- old/kdeclarative-5.43.0/src/kdeclarative/CMakeLists.txt 2018-02-05 12:58:42.000000000 +0100 +++ new/kdeclarative-5.44.0/src/kdeclarative/CMakeLists.txt 2018-03-03 11:02:11.000000000 +0100 @@ -6,7 +6,6 @@ kdeclarative.cpp private/kiconprovider.cpp private/kioaccessmanagerfactory.cpp - private/qmlobject_p.h ) add_library(KF5Declarative ${kdeclarative_SRCS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.43.0/src/kdeclarative/private/qmlobject_p.h new/kdeclarative-5.44.0/src/kdeclarative/private/qmlobject_p.h --- old/kdeclarative-5.43.0/src/kdeclarative/private/qmlobject_p.h 2018-02-05 12:58:42.000000000 +0100 +++ new/kdeclarative-5.44.0/src/kdeclarative/private/qmlobject_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,89 +0,0 @@ -/* - * Copyright 2013 Marco Martin <[email protected]> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details - * - * You should have received a copy of the GNU Library General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef QMLOBJECT_P_H -#define QMLOBJECT_P_H - -#include <QObject> -#include <QQmlIncubationController> - -#include <QWindow> -#include <QAnimationDriver> -#include <QGuiApplication> -#include <QScreen> - -class QQmlEngine; -class QQmlComponent; - -namespace KDeclarative { - -class QmlObjectIncubationController : public QObject, public QQmlIncubationController -{ - Q_OBJECT - -public: - QmlObjectIncubationController(QObject *parent) - : QObject(parent), - QQmlIncubationController() - { - // Allow incubation for 1/3 of a frame. - m_incubation_time = qMax(1, int(1000 / QGuiApplication::primaryScreen()->refreshRate()) / 3); - } - -protected: - bool event(QEvent *e) Q_DECL_OVERRIDE - { - if (e->type() == QEvent::User) { - incubate(); - return true; - } - return QObject::event(e); - } - -public Q_SLOTS: - void incubate() - { - if (incubatingObjectCount()) { - incubateFor(m_incubation_time * 2); - if (incubatingObjectCount()) { - QCoreApplication::postEvent(this, new QEvent(QEvent::User)); - } - } - } - - void animationStopped() - { - incubate(); - } - -protected: - void incubatingObjectCountChanged(int count) Q_DECL_OVERRIDE - { - if (count) { - incubate(); - } - QQmlIncubationController::incubatingObjectCountChanged(count); - } -private: - int m_incubation_time; -}; - -} - -#endif // multiple inclusion guard diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.43.0/src/kdeclarative/qmlobject.cpp new/kdeclarative-5.44.0/src/kdeclarative/qmlobject.cpp --- old/kdeclarative-5.43.0/src/kdeclarative/qmlobject.cpp 2018-02-05 12:58:42.000000000 +0100 +++ new/kdeclarative-5.44.0/src/kdeclarative/qmlobject.cpp 2018-03-03 11:02:11.000000000 +0100 @@ -18,7 +18,6 @@ */ #include "qmlobject.h" -#include "private/qmlobject_p.h" #include "private/kdeclarative_p.h" #include <QQmlComponent> @@ -151,7 +150,6 @@ d->kdeclarative.d->qmlObj = this; //binds things like kconfig and icons d->kdeclarative.setupBindings(); - d->engine->setIncubationController(new QmlObjectIncubationController(this)); } QmlObject::QmlObject(QQmlEngine *engine, QObject *parent) @@ -162,7 +160,6 @@ d->engine = engine; } else { d->engine = new QQmlEngine(this); - d->engine->setIncubationController(new QmlObjectIncubationController(this)); } d->rootContext = d->engine->rootContext(); d->kdeclarative.setDeclarativeEngine(d->engine); @@ -179,7 +176,6 @@ d->engine = engine; } else { d->engine = new QQmlEngine(this); - d->engine->setIncubationController(new QmlObjectIncubationController(0)); } if (rootContext) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.43.0/src/kdeclarative/qmlobjectsharedengine.cpp new/kdeclarative-5.44.0/src/kdeclarative/qmlobjectsharedengine.cpp --- old/kdeclarative-5.43.0/src/kdeclarative/qmlobjectsharedengine.cpp 2018-02-05 12:58:42.000000000 +0100 +++ new/kdeclarative-5.44.0/src/kdeclarative/qmlobjectsharedengine.cpp 2018-03-03 11:02:11.000000000 +0100 @@ -18,7 +18,6 @@ */ #include "qmlobjectsharedengine.h" -#include "private/qmlobject_p.h" #include <QQmlComponent> #include <QQmlEngine> @@ -54,7 +53,6 @@ { if (!s_engine) { s_engine = std::make_shared<QQmlEngine>(); - s_engine->setIncubationController(new QmlObjectIncubationController(0)); } return s_engine.get(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.43.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp new/kdeclarative-5.44.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp --- old/kdeclarative-5.43.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp 2018-02-05 12:58:42.000000000 +0100 +++ new/kdeclarative-5.44.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp 2018-03-03 11:02:11.000000000 +0100 @@ -285,6 +285,14 @@ m_autoRange(true) { setFlag(ItemHasContents); + connect(this, &Plotter::windowChanged, this, [this]() { + if (m_window) { + disconnect(m_window.data(), &QQuickWindow::beforeRendering, this, &Plotter::render); + } + m_window.clear(); + //when the window changes, the node gets deleted + m_node = nullptr; + }); } Plotter::~Plotter() @@ -715,7 +723,7 @@ return nullptr; } - QSGSimpleTextureNode *n = static_cast<QSGSimpleTextureNode *>(oldNode); + ManagedTextureNode *n = static_cast<ManagedTextureNode *>(oldNode); if (width() == 0 && height() == 0) { delete oldNode; @@ -724,7 +732,7 @@ if (!n) { n = new ManagedTextureNode(); - n->setTexture(new PlotTexture(window()->openglContext())); + n->setTexture(QSharedPointer<QSGTexture>(new PlotTexture(window()->openglContext()))); n->setFiltering(QSGTexture::Linear); m_node = n; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.43.0/src/qmlcontrols/kquickcontrolsaddons/plotter.h new/kdeclarative-5.44.0/src/qmlcontrols/kquickcontrolsaddons/plotter.h --- old/kdeclarative-5.43.0/src/qmlcontrols/kquickcontrolsaddons/plotter.h 2018-02-05 12:58:42.000000000 +0100 +++ new/kdeclarative-5.44.0/src/qmlcontrols/kquickcontrolsaddons/plotter.h 2018-03-03 11:02:11.000000000 +0100 @@ -26,6 +26,19 @@ #include <epoxy/gl.h> +// qopengl.h declares GLdouble as a typedef of float when Qt is built +// with GLES support. This conflicts with the epoxy/gl_generated.h +// declaration, so we have to prevent the Qt header from being #included. +#define QOPENGL_H + +#ifndef QOPENGLF_APIENTRY +#define QOPENGLF_APIENTRY GLAPIENTRY +#endif + +#ifndef QOPENGLF_APIENTRYP +#define QOPENGLF_APIENTRYP GLAPIENTRYP +#endif + #include <QSGTexture> #include <QSGSimpleTextureNode> #include <QQuickItem> @@ -34,6 +47,8 @@ #include <QQuickWindow> #include <QMutex> +class ManagedTextureNode; + /** * a Plotter can draw a graph of values arriving from an arbitrary number of data sources * to show their evoluton in time. @@ -227,7 +242,7 @@ QList<PlotData *> m_plotData; GLuint m_fbo = 0; - QSGSimpleTextureNode *m_node = nullptr; + ManagedTextureNode *m_node = nullptr; qreal m_min; qreal m_max; qreal m_rangeMax;
