Hello community, here is the log from the commit of package kwindowsystem for openSUSE:Factory checked in at 2016-01-20 09:48:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwindowsystem (Old) and /work/SRC/openSUSE:Factory/.kwindowsystem.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwindowsystem" Changes: -------- --- /work/SRC/openSUSE:Factory/kwindowsystem/kwindowsystem.changes 2015-12-29 12:55:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kwindowsystem.new/kwindowsystem.changes 2016-01-20 09:48:39.000000000 +0100 @@ -1,0 +2,8 @@ +Sat Jan 2 17:45:41 UTC 2016 - [email protected] + +- Update to 5.18.0 + * Add xcb variant for static KStartupInfo::sendFoo methods + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.18.0.php + +------------------------------------------------------------------- Old: ---- kwindowsystem-5.17.0.tar.xz New: ---- kwindowsystem-5.18.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwindowsystem.spec ++++++ --- /var/tmp/diff_new_pack.Os4O3E/_old 2016-01-20 09:48:40.000000000 +0100 +++ /var/tmp/diff_new_pack.Os4O3E/_new 2016-01-20 09:48:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kwindowsystem # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5WindowSystem5 -%define _tar_path 5.17 +%define _tar_path 5.18 Name: kwindowsystem -Version: 5.17.0 +Version: 5.18.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} ++++++ kwindowsystem-5.17.0.tar.xz -> kwindowsystem-5.18.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.17.0/CMakeLists.txt new/kwindowsystem-5.18.0/CMakeLists.txt --- old/kwindowsystem-5.17.0/CMakeLists.txt 2015-12-06 22:42:00.000000000 +0100 +++ new/kwindowsystem-5.18.0/CMakeLists.txt 2016-01-02 17:54:06.000000000 +0100 @@ -4,7 +4,7 @@ # ECM setup include(FeatureSummary) -find_package(ECM 5.17.0 NO_MODULE) +find_package(ECM 5.18.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) @@ -19,7 +19,7 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.17.0") # handled by release scripts +set(KF5_VERSION "5.18.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KWINDOWSYSTEM VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kwindowsystem_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.17.0/po/lt/kwindowsystem5_qt.po new/kwindowsystem-5.18.0/po/lt/kwindowsystem5_qt.po --- old/kwindowsystem-5.17.0/po/lt/kwindowsystem5_qt.po 2015-12-06 22:42:00.000000000 +0100 +++ new/kwindowsystem-5.18.0/po/lt/kwindowsystem5_qt.po 2016-01-02 17:54:06.000000000 +0100 @@ -29,4 +29,4 @@ #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" -msgstr "Darbastalis %1" +msgstr "Darbalaukis %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.17.0/src/kstartupinfo.cpp new/kwindowsystem-5.18.0/src/kstartupinfo.cpp --- old/kwindowsystem-5.17.0/src/kstartupinfo.cpp 2015-12-06 22:42:00.000000000 +0100 +++ new/kwindowsystem-5.18.0/src/kstartupinfo.cpp 2016-01-02 17:54:06.000000000 +0100 @@ -468,18 +468,14 @@ return false; } #if KWINDOWSYSTEM_HAVE_X11 - KXMessages msgs; - QString msg = QString::fromLatin1("new: %1 %2") - .arg(id_P.d->to_text()).arg(data_P.d->to_text()); - msg = Private::check_required_startup_fields(msg, data_P, QX11Info::appScreen()); - //qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg; - msgs.broadcastMessage(NET_STARTUP_MSG, msg); + return sendStartupXcb(QX11Info::connection(), QX11Info::appScreen(), id_P, data_P); #else Q_UNUSED(data_P) #endif return true; } +#ifndef KWINDOWSYSTEM_NO_DEPRECATED bool KStartupInfo::sendStartupX(Display *disp_P, const KStartupInfoId &id_P, const KStartupInfoData &data_P) { @@ -500,6 +496,29 @@ return true; #endif } +#endif + +bool KStartupInfo::sendStartupXcb(xcb_connection_t *conn, int screen, const KStartupInfoId &id_P, + const KStartupInfoData &data_P) +{ + if (id_P.isNull()) { + return false; + } +#if KWINDOWSYSTEM_HAVE_X11 + QString msg = QString::fromLatin1("new: %1 %2") + .arg(id_P.d->to_text()).arg(data_P.d->to_text()); + msg = Private::check_required_startup_fields(msg, data_P, screen); +#ifdef KSTARTUPINFO_ALL_DEBUG + qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg; +#endif + return KXMessages::broadcastMessageX(conn, NET_STARTUP_MSG, msg, screen); +#else + Q_UNUSED(conn) + Q_UNUSED(screen) + Q_UNUSED(data_P) + return true; +#endif +} QString KStartupInfo::Private::check_required_startup_fields(const QString &msg, const KStartupInfoData &data_P, int screen) @@ -525,17 +544,14 @@ return false; } #if KWINDOWSYSTEM_HAVE_X11 - KXMessages msgs; - QString msg = QString::fromLatin1("change: %1 %2") - .arg(id_P.d->to_text()).arg(data_P.d->to_text()); - //qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg; - msgs.broadcastMessage(NET_STARTUP_MSG, msg); + return sendChangeXcb(QX11Info::connection(), QX11Info::appScreen(), id_P, data_P); #else Q_UNUSED(data_P) #endif return true; } +#ifndef KWINDOWSYSTEM_NO_DEPRECATED bool KStartupInfo::sendChangeX(Display *disp_P, const KStartupInfoId &id_P, const KStartupInfoData &data_P) { @@ -555,6 +571,28 @@ return true; #endif } +#endif + +bool KStartupInfo::sendChangeXcb(xcb_connection_t *conn, int screen, + const KStartupInfoId &id_P, const KStartupInfoData &data_P) +{ + if (id_P.isNull()) { + return false; + } +#if KWINDOWSYSTEM_HAVE_X11 + QString msg = QString::fromLatin1("change: %1 %2") + .arg(id_P.d->to_text()).arg(data_P.d->to_text()); +#ifdef KSTARTUPINFO_ALL_DEBUG + qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg; +#endif + return KXMessages::broadcastMessageX(conn, NET_STARTUP_MSG, msg, screen); +#else + Q_UNUSED(conn) + Q_UNUSED(screen) + Q_UNUSED(data_P) + return true; +#endif +} bool KStartupInfo::sendFinish(const KStartupInfoId &id_P) { @@ -562,14 +600,12 @@ return false; } #if KWINDOWSYSTEM_HAVE_X11 - KXMessages msgs; - QString msg = QString::fromLatin1("remove: %1").arg(id_P.d->to_text()); - //qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg; - msgs.broadcastMessage(NET_STARTUP_MSG, msg); + return sendFinishXcb(QX11Info::connection(), QX11Info::appScreen(), id_P); #endif return true; } +#ifndef KWINDOWSYSTEM_NO_DEPRECATED bool KStartupInfo::sendFinishX(Display *disp_P, const KStartupInfoId &id_P) { if (id_P.isNull()) { @@ -586,17 +622,32 @@ return true; #endif } +#endif + +bool KStartupInfo::sendFinishXcb(xcb_connection_t *conn, int screen, const KStartupInfoId &id_P) +{ + if (id_P.isNull()) { + return false; + } +#if KWINDOWSYSTEM_HAVE_X11 + QString msg = QString::fromLatin1("remove: %1").arg(id_P.d->to_text()); +#ifdef KSTARTUPINFO_ALL_DEBUG + qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg; +#endif + return KXMessages::broadcastMessageX(conn, NET_STARTUP_MSG, msg, screen); +#else + Q_UNUSED(conn) + Q_UNUSED(screen) + return true; +#endif +} bool KStartupInfo::sendFinish(const KStartupInfoId &id_P, const KStartupInfoData &data_P) { // if( id_P.isNull()) // id may be null, the pids and hostname matter then // return false; #if KWINDOWSYSTEM_HAVE_X11 - KXMessages msgs; - QString msg = QString::fromLatin1("remove: %1 %2") - .arg(id_P.d->to_text()).arg(data_P.d->to_text()); - //qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg; - msgs.broadcastMessage(NET_STARTUP_MSG, msg); + return sendFinishXcb(QX11Info::connection(), QX11Info::appScreen(), id_P, data_P); #else Q_UNUSED(id_P) Q_UNUSED(data_P) @@ -604,6 +655,7 @@ return true; } +#ifndef KWINDOWSYSTEM_NO_DEPRECATED bool KStartupInfo::sendFinishX(Display *disp_P, const KStartupInfoId &id_P, const KStartupInfoData &data_P) { @@ -621,6 +673,28 @@ Q_UNUSED(id_P) Q_UNUSED(data_P) return true; +#endif +} +#endif + +bool KStartupInfo::sendFinishXcb(xcb_connection_t *conn, int screen, + const KStartupInfoId &id_P, const KStartupInfoData &data_P) +{ +// if( id_P.isNull()) // id may be null, the pids and hostname matter then +// return false; +#if KWINDOWSYSTEM_HAVE_X11 + QString msg = QString::fromLatin1("remove: %1 %2") + .arg(id_P.d->to_text()).arg(data_P.d->to_text()); +#ifdef KSTARTUPINFO_ALL_DEBUG + qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg; +#endif + return KXMessages::broadcastMessageX(conn, NET_STARTUP_MSG, msg, screen); +#else + Q_UNUSED(conn) + Q_UNUSED(screen) + Q_UNUSED(id_P) + Q_UNUSED(data_P) + return true; #endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.17.0/src/kstartupinfo.h new/kwindowsystem-5.18.0/src/kstartupinfo.h --- old/kwindowsystem-5.17.0/src/kstartupinfo.h 2015-12-06 22:42:00.000000000 +0100 +++ new/kwindowsystem-5.18.0/src/kstartupinfo.h 2016-01-02 17:54:06.000000000 +0100 @@ -36,6 +36,8 @@ typedef struct _XDisplay Display; +struct xcb_connection_t; + #ifdef Q_CC_MSVC typedef int pid_t; #endif @@ -202,9 +204,25 @@ * @param id the id of the application * @param data the application's data * @return true if successful, false otherwise + * @deprecated since 5.18 use sendStartupXcb */ - static bool sendStartupX(Display *dpy, const KStartupInfoId &id, +#ifndef KWINDOWSYSTEM_NO_DEPRECATED + KWINDOWSYSTEM_DEPRECATED static bool sendStartupX(Display *dpy, const KStartupInfoId &id, const KStartupInfoData &data); +#endif + + /** + * Like sendStartup , uses @p conn instead of QX11Info::connection() for sending the info. + * @param conn the xcb connection of the application. Note that the name field + * in data is required. + * @param screen The x11 screen the connection belongs to + * @param id the id of the application + * @param data the application's data + * @return true if successful, false otherwise + * @since 5.18 + */ + static bool sendStartupXcb(xcb_connection_t *conn, int screen, + const KStartupInfoId &id, const KStartupInfoData &data); /** * Sends given notification data about started application @@ -224,9 +242,24 @@ * @param id the id of the application * @param data the application's data * @return true if successful, false otherwise + * @deprecated since 5.18 use sendChangeXcb */ - static bool sendChangeX(Display *dpy, const KStartupInfoId &id, +#ifndef KWINDOWSYSTEM_NO_DEPRECATED + KWINDOWSYSTEM_DEPRECATED static bool sendChangeX(Display *dpy, const KStartupInfoId &id, const KStartupInfoData &data); +#endif + + /** + * Like sendChange , uses @p conn instead of QX11Info::connection() for sending the info. + * @param conn the xcb connection of the application. + * @param screen The x11 screen the connection belongs to + * @param id the id of the application + * @param data the application's data + * @return true if successful, false otherwise + * @since 5.18 + */ + static bool sendChangeXcb(xcb_connection_t *conn, int screen, const KStartupInfoId &id, + const KStartupInfoData &data); /** * Ends startup notification with the given identification. @@ -240,8 +273,21 @@ * @param dpy the display of the application. * @param id the id of the application * @return true if successful, false otherwise + * @deprecated since 5.18 use sendFinishXcb + */ +#ifndef KWINDOWSYSTEM_NO_DEPRECATED + KWINDOWSYSTEM_DEPRECATED static bool sendFinishX(Display *dpy, const KStartupInfoId &id); +#endif + + /** + * Like sendFinish , uses @p conn instead of QX11Info::connection() for sending the info. + * @param conn the xcb connection of the application. + * @param screen The x11 screen the connection belongs to + * @param id the id of the application + * @return true if successful, false otherwise + * @since 5.18 */ - static bool sendFinishX(Display *dpy, const KStartupInfoId &id); + static bool sendFinishXcb(xcb_connection_t *conn, int screen, const KStartupInfoId &id); /** * Ends startup notification with the given identification and the given data ( e.g. @@ -258,9 +304,24 @@ * @param id the id of the application * @param data the application's data * @return true if successful, false otherwise + * @deprecated since 5.18 use sendFinishXcb */ - static bool sendFinishX(Display *dpy, const KStartupInfoId &id, +#ifndef KWINDOWSYSTEM_NO_DEPRECATED + KWINDOWSYSTEM_DEPRECATED static bool sendFinishX(Display *dpy, const KStartupInfoId &id, const KStartupInfoData &data); +#endif + + /** + * Like sendFinish , uses @p conn instead of QX11Info::connection() for sending the info. + * @param conn the xcb connection of the application. + * @param screen The x11 screen the connection belongs to + * @param id the id of the application + * @param data the application's data + * @return true if successful, false otherwise + * @since 5.18 + */ + static bool sendFinishXcb(xcb_connection_t *conn, int screen, + const KStartupInfoId &id, const KStartupInfoData &data); /** * Returns the current startup notification identification for the current
