Hello community,
here is the log from the commit of package frameworkintegration for
openSUSE:Factory checked in at 2020-01-14 20:59:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/frameworkintegration (Old)
and /work/SRC/openSUSE:Factory/.frameworkintegration.new.6675 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "frameworkintegration"
Tue Jan 14 20:59:24 2020 rev:79 rq:763433 version:5.66.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/frameworkintegration/frameworkintegration.changes
2019-12-18 14:41:37.545754945 +0100
+++
/work/SRC/openSUSE:Factory/.frameworkintegration.new.6675/frameworkintegration.changes
2020-01-14 21:02:45.446637170 +0100
@@ -1,0 +2,12 @@
+Sun Jan 5 09:01:56 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.66.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.66.0.php
+- Changes since 5.65.0:
+ * Update the obsolete projects.kde.org URL
+ * We don't need xcb anymore
+ * Remove ColorSchemeFilter from KStyle
+
+-------------------------------------------------------------------
Old:
----
frameworkintegration-5.65.0.tar.xz
frameworkintegration-5.65.0.tar.xz.sig
New:
----
frameworkintegration-5.66.0.tar.xz
frameworkintegration-5.66.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ frameworkintegration.spec ++++++
--- /var/tmp/diff_new_pack.QSxAJy/_old 2020-01-14 21:02:46.094637470 +0100
+++ /var/tmp/diff_new_pack.QSxAJy/_new 2020-01-14 21:02:46.102637474 +0100
@@ -1,7 +1,7 @@
#
# spec file for package frameworkintegration
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
%define lname libKF5Style5
-%define _tar_path 5.65
+%define _tar_path 5.66
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -25,7 +25,7 @@
# Only needed for the package signature condition
%bcond_without lang
Name: frameworkintegration
-Version: 5.65.0
+Version: 5.66.0
Release: 0
Summary: Plugins responsible for better integration of Qt applications
in KDE Workspace
License: LGPL-2.1-or-later
@@ -55,9 +55,6 @@
BuildRequires: cmake(Qt5Widgets) >= 5.11.0
BuildRequires: cmake(Qt5X11Extras) >= 5.11.0
BuildRequires: cmake(packagekitqt5)
-BuildRequires: pkgconfig(x11)
-BuildRequires: pkgconfig(xcb)
-BuildRequires: pkgconfig(xcursor)
%if 0%{?suse_version} >= 1330 || (0%{?sle_version} >= 120200 &&
0%{?is_opensuse})
BuildRequires: cmake(AppStreamQt) >= 0.10.4
%endif
++++++ frameworkintegration-5.65.0.tar.xz -> frameworkintegration-5.66.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.65.0/CMakeLists.txt
new/frameworkintegration-5.66.0/CMakeLists.txt
--- old/frameworkintegration-5.65.0/CMakeLists.txt 2019-12-07
20:40:54.000000000 +0100
+++ new/frameworkintegration-5.66.0/CMakeLists.txt 2020-01-04
00:09:23.000000000 +0100
@@ -1,16 +1,16 @@
cmake_minimum_required(VERSION 3.5)
-set(KF5_VERSION "5.65.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.65.0") # handled by release scripts
+set(KF5_VERSION "5.66.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.66.0") # handled by release scripts
project(FrameworkIntegration VERSION ${KF5_VERSION})
include(FeatureSummary)
-find_package(ECM 5.65.0 NO_MODULE)
-set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL
"https://projects.kde.org/projects/kdesupport/extra-cmake-modules";)
+find_package(ECM 5.66.0 NO_MODULE)
+set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL "https://commits.kde.org/extra-cmake-modules";)
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND
FATAL_ON_MISSING_REQUIRED_PACKAGES)
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
include(GenerateExportHeader)
@@ -22,7 +22,7 @@
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
-set(REQUIRED_QT_VERSION 5.11.0)
+set(REQUIRED_QT_VERSION 5.12.0)
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus Widgets)
@@ -48,7 +48,7 @@
find_package(AppStreamQt 0.10.4)
endif()
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
-add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x053f00)
+add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054100)
add_definitions(-DQT_NO_FOREACH)
add_subdirectory(src)
if (BUILD_TESTING)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.65.0/src/kstyle/CMakeLists.txt
new/frameworkintegration-5.66.0/src/kstyle/CMakeLists.txt
--- old/frameworkintegration-5.65.0/src/kstyle/CMakeLists.txt 2019-12-07
20:40:54.000000000 +0100
+++ new/frameworkintegration-5.66.0/src/kstyle/CMakeLists.txt 2020-01-04
00:09:23.000000000 +0100
@@ -1,19 +1,3 @@
-
-find_package(XCB COMPONENTS XCB)
-set_package_properties(XCB PROPERTIES
- DESCRIPTION "X protocol C-language Binding"
- URL "http://xcb.freedesktop.org";
- TYPE OPTIONAL
- PURPOSE "Required to pass style properties to native Windows on X11
Platform"
-)
-
-if(NOT APPLE)
- set(HAVE_X11 ${XCB_XCB_FOUND})
- if (XCB_XCB_FOUND)
- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
- endif()
-endif()
-
# create a Config.cmake and a ConfigVersion.cmake file and install them
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Style")
@@ -35,10 +19,6 @@
KF5::IconThemes
)
-if(HAVE_X11)
- target_link_libraries(KF5Style PRIVATE Qt5::X11Extras ${XCB_XCB_LIBRARY})
-endif()
-
set_target_properties(KF5Style PROPERTIES VERSION
${FRAMEWORKINTEGRATION_VERSION_STRING}
SOVERSION
${FRAMEWORKINTEGRATION_SOVERSION}
EXPORT_NAME Style
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.65.0/src/kstyle/kstyle.cpp
new/frameworkintegration-5.66.0/src/kstyle/kstyle.cpp
--- old/frameworkintegration-5.65.0/src/kstyle/kstyle.cpp 2019-12-07
20:40:54.000000000 +0100
+++ new/frameworkintegration-5.66.0/src/kstyle/kstyle.cpp 2020-01-04
00:09:23.000000000 +0100
@@ -68,73 +68,6 @@
static const QStyle::StyleHint SH_KCustomStyleElement =
(QStyle::StyleHint)0xff000001;
static const int X_KdeBase = 0xff000000;
-static const char s_schemePropertyName[] = "KDE_COLOR_SCHEME_PATH";
-
-/**
- * An event filter intended to be used for all toplevel QWidgets.
- * The filter checks for Show and PaletteChange events and passes the
- * KDE_COLOR_SCHEME_PATH property on the QApplication to the native window.
- * The application property is set by e.g. the KColorSchemeManager and the
- * information is needed by KDE's window manager to use the same color scheme
- * on e.g. the window decoration to provide a consistent look and feel.
- */
-class ColorSchemeFilter : public QObject
-{
-public:
- ColorSchemeFilter(QObject *parent = nullptr);
- bool eventFilter(QObject *object, QEvent *event) override;
-private:
- void installColorScheme(QWidget *w);
-};
-
-ColorSchemeFilter::ColorSchemeFilter(QObject *parent)
- : QObject(parent)
-{
-}
-
-bool ColorSchemeFilter::eventFilter(QObject *object, QEvent *event)
-{
- QWidget *w = static_cast<QWidget*>(object);
- if ((event->type() == QEvent::Show &&
qApp->property(s_schemePropertyName).isValid()) ||
- (event->type() == QEvent::PaletteChange)) {
- installColorScheme(w);
- }
- return QObject::eventFilter(object, event);
-}
-
-void ColorSchemeFilter::installColorScheme(QWidget *w)
-{
- // ensure we don't call winId() on non-native widgets, bug 412675
- if (!w || !w->isTopLevel() || !w->windowHandle()) {
- return;
- }
-#if HAVE_X11
- static const bool s_x11 = QX11Info::isPlatformX11();
- if (!s_x11) {
- return;
- }
- static xcb_atom_t atom = XCB_ATOM_NONE;
- xcb_connection_t *c = QX11Info::connection();
- if (atom == XCB_ATOM_NONE) {
- const QByteArray name = QByteArrayLiteral("_KDE_NET_WM_COLOR_SCHEME");
- const xcb_intern_atom_cookie_t cookie = xcb_intern_atom(c, false,
name.length(), name.constData());
- QScopedPointer<xcb_intern_atom_reply_t, QScopedPointerPodDeleter>
reply(xcb_intern_atom_reply(c, cookie, nullptr));
- if (!reply.isNull()) {
- atom = reply->atom;
- } else {
- // no point in continuing, we don't have the atom
- return;
- }
- }
- const QString path = qApp->property(s_schemePropertyName).toString();
- if (path.isEmpty()) {
- xcb_delete_property(c, w->winId(), atom);
- } else {
- xcb_change_property(c, XCB_PROP_MODE_REPLACE, w->winId(), atom,
XCB_ATOM_STRING,
- 8, path.size(), qPrintable(path));
- }
-#endif
-}
class KStylePrivate
{
@@ -143,11 +76,9 @@
QHash<QString, int> styleElements;
int hintCounter, controlCounter, subElementCounter;
- QScopedPointer<ColorSchemeFilter> colorSchemeFilter;
};
KStylePrivate::KStylePrivate()
- : colorSchemeFilter(new ColorSchemeFilter())
{
controlCounter = subElementCounter = X_KdeBase;
hintCounter = X_KdeBase + 1; //sic! X_KdeBase is covered by
SH_KCustomStyleElement
@@ -282,12 +213,6 @@
QObject::connect(shortcut, &QShortcut::activated, button,
&QPushButton::click);
}
}
-
- // install the event filter to pass the color scheme app property to all
toplevel native windows
- if (w->isTopLevel()) {
- w->installEventFilter(d->colorSchemeFilter.data());
- }
-
QCommonStyle::polish(w);
}
