Hello community, here is the log from the commit of package kwindowsystem for openSUSE:Factory checked in at 2015-01-29 12:53:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-12-21 11:58:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kwindowsystem.new/kwindowsystem.changes 2015-01-29 12:53:10.000000000 +0100 @@ -1,0 +2,11 @@ +Sat Jan 3 18:03:30 UTC 2015 - [email protected] + +- Update to 5.6.0 + * Add OnScreenDisplay window type + * Fix build on FreeBSD + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.6.0.php +- Make sure that devel package requires pkgconfig(x11) and + pkgconfig(xcb), they are now public dependencies + +------------------------------------------------------------------- Old: ---- kwindowsystem-5.5.0.tar.xz New: ---- kwindowsystem-5.6.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwindowsystem.spec ++++++ --- /var/tmp/diff_new_pack.uoo18I/_old 2015-01-29 12:53:10.000000000 +0100 +++ /var/tmp/diff_new_pack.uoo18I/_new 2015-01-29 12:53:10.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kwindowsystem # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products 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,10 +18,10 @@ %define lname libKF5WindowSystem5 Name: kwindowsystem -Version: 5.5.0 +Version: 5.6.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.5.0 +BuildRequires: extra-cmake-modules >= 1.6.0 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: libqt5-linguist-devel >= 5.2.0 @@ -37,7 +37,7 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/stable/frameworks/5.5/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/5.6/%{name}-%{version}.tar.xz Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -69,6 +69,8 @@ Requires: extra-cmake-modules Requires: pkgconfig(Qt5Core) >= 5.2.0 Requires: pkgconfig(Qt5Widgets) >= 5.2.0 +Requires: pkgconfig(x11) +Requires: pkgconfig(xcb) %description devel Convenience access to certain properties and features of the window manager. ++++++ kwindowsystem-5.5.0.tar.xz -> kwindowsystem-5.6.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.5.0/CMakeLists.txt new/kwindowsystem-5.6.0/CMakeLists.txt --- old/kwindowsystem-5.5.0/CMakeLists.txt 2014-12-06 13:47:31.000000000 +0100 +++ new/kwindowsystem-5.6.0/CMakeLists.txt 2015-01-03 13:16:34.000000000 +0100 @@ -3,7 +3,7 @@ project(KWindowSystem) # ECM setup -find_package(ECM 1.5.0 REQUIRED NO_MODULE) +find_package(ECM 1.6.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(FeatureSummary) @@ -15,7 +15,7 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.5.0") # handled by release scripts +set(KF5_VERSION "5.6.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.5.0/autotests/kwindowinfox11test.cpp new/kwindowsystem-5.6.0/autotests/kwindowinfox11test.cpp --- old/kwindowsystem-5.5.0/autotests/kwindowinfox11test.cpp 2014-12-06 13:47:31.000000000 +0100 +++ new/kwindowsystem-5.6.0/autotests/kwindowinfox11test.cpp 2015-01-03 13:16:34.000000000 +0100 @@ -385,6 +385,7 @@ QTest::newRow("notification") << NET::NotificationMask << NET::Notification << NET::Notification; QTest::newRow("ComboBox") << NET::ComboBoxMask << NET::ComboBox << NET::ComboBox; QTest::newRow("DNDIcon") << NET::DNDIconMask << NET::DNDIcon << NET::DNDIcon; + QTest::newRow("OnScreenDisplay") << NET::OnScreenDisplayMask << NET::OnScreenDisplay << NET::OnScreenDisplay; // incorrect masks QTest::newRow("desktop-unknown") << NET::NormalMask << NET::Desktop << NET::Unknown; @@ -402,6 +403,7 @@ QTest::newRow("notification-unknown") << NET::NormalMask << NET::Notification << NET::Unknown; QTest::newRow("ComboBox-unknown") << NET::NormalMask << NET::ComboBox << NET::Unknown; QTest::newRow("DNDIcon-unknown") << NET::NormalMask << NET::DNDIcon << NET::Unknown; + QTest::newRow("OnScreenDisplay-unknown") << NET::NormalMask << NET::OnScreenDisplay << NET::Unknown; } void KWindowInfoX11Test::testWindowType() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.5.0/autotests/netrootinfotestwm.cpp new/kwindowsystem-5.6.0/autotests/netrootinfotestwm.cpp --- old/kwindowsystem-5.5.0/autotests/netrootinfotestwm.cpp 2014-12-06 13:47:31.000000000 +0100 +++ new/kwindowsystem-5.6.0/autotests/netrootinfotestwm.cpp 2015-01-03 13:16:34.000000000 +0100 @@ -208,7 +208,7 @@ QVERIFY(rootInfo.isSupported(NET::Property2(1 << i))); count++; } - for (int i = 0; i < 16; ++i) { + for (int i = 0; i < 17; ++i) { QVERIFY(rootInfo.isSupported(NET::WindowTypeMask(1 << i))); count++; } @@ -236,7 +236,7 @@ // get the cookies of the things to check xcb_get_property_cookie_t supportedCookie = xcb_get_property_unchecked(connection(), false, rootInfo.rootWindow(), - supported, XCB_ATOM_ATOM, 0, 100); + supported, XCB_ATOM_ATOM, 0, 101); xcb_get_property_cookie_t wmCheckRootCookie = xcb_get_property_unchecked(connection(), false, rootInfo.rootWindow(), wmCheck, XCB_ATOM_WINDOW, 0, 1); xcb_get_property_cookie_t wmCheckSupportWinCookie = xcb_get_property_unchecked(connection(), false, m_supportWindow, @@ -273,23 +273,26 @@ rootInfo.setSupported(NET::ActionChangeDesktop, false); rootInfo.setSupported(NET::FullScreen, false); QVERIFY(rootInfo.isSupported(NET::ToolbarMask)); + QVERIFY(rootInfo.isSupported(NET::OnScreenDisplayMask)); QVERIFY(rootInfo.isSupported(NET::DockMask)); rootInfo.setSupported(NET::ToolbarMask, false); + rootInfo.setSupported(NET::OnScreenDisplayMask, false); QVERIFY(!rootInfo.isSupported(NET::WMFrameExtents)); QVERIFY(!rootInfo.isSupported(NET::WM2KDETemporaryRules)); QVERIFY(!rootInfo.isSupported(NET::ActionChangeDesktop)); QVERIFY(!rootInfo.isSupported(NET::FullScreen)); QVERIFY(!rootInfo.isSupported(NET::ToolbarMask)); + QVERIFY(!rootInfo.isSupported(NET::OnScreenDisplayMask)); QVERIFY(rootInfo.isSupported(NET::DockMask)); // lets get supported again supportedCookie = xcb_get_property_unchecked(connection(), false, rootInfo.rootWindow(), - supported, XCB_ATOM_ATOM, 0, 89); + supported, XCB_ATOM_ATOM, 0, 90); supportedReply.reset(xcb_get_property_reply(connection(), supportedCookie, Q_NULLPTR)); QVERIFY(!supportedReply.isNull()); QCOMPARE(supportedReply->format, uint8_t(32)); - QCOMPARE(supportedReply->value_len, uint32_t(count - 6)); + QCOMPARE(supportedReply->value_len, uint32_t(count - 7)); for (int i = 0; i < 5; ++i) { // we should have got some events @@ -301,11 +304,11 @@ rootInfo.setSupported(NET::WM2BlockCompositing, false); // lets get supported again supportedCookie = xcb_get_property_unchecked(connection(), false, rootInfo.rootWindow(), - supported, XCB_ATOM_ATOM, 0, 89); + supported, XCB_ATOM_ATOM, 0, 90); supportedReply.reset(xcb_get_property_reply(connection(), supportedCookie, Q_NULLPTR)); QVERIFY(!supportedReply.isNull()); QCOMPARE(supportedReply->format, uint8_t(32)); - QCOMPARE(supportedReply->value_len, uint32_t(count - 7)); + QCOMPARE(supportedReply->value_len, uint32_t(count - 8)); NETRootInfo clientInfo(connection(), NET::Supported | NET::SupportingWMCheck); waitForPropertyChange(&clientInfo, supported, NET::Supported); waitForPropertyChange(&clientInfo, wmCheck, NET::SupportingWMCheck); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.5.0/autotests/netwininfotestclient.cpp new/kwindowsystem-5.6.0/autotests/netwininfotestclient.cpp --- old/kwindowsystem-5.5.0/autotests/netwininfotestclient.cpp 2014-12-06 13:47:31.000000000 +0100 +++ new/kwindowsystem-5.6.0/autotests/netwininfotestclient.cpp 2015-01-03 13:16:34.000000000 +0100 @@ -600,6 +600,7 @@ QTest::newRow("ComboBox") << NET::ComboBox << 1 << QByteArrayLiteral("_NET_WM_WINDOW_TYPE_COMBOBOX") << QByteArray(); QTest::newRow("DNDIcon") << NET::DNDIcon << 1 << QByteArrayLiteral("_NET_WM_WINDOW_TYPE_DND") << QByteArray(); QTest::newRow("Normal") << NET::Normal << 1 << QByteArrayLiteral("_NET_WM_WINDOW_TYPE_NORMAL") << QByteArray(); + QTest::newRow("OnScreenDisplay") << NET::OnScreenDisplay << 1 << QByteArrayLiteral("_KDE_NET_WM_WINDOW_TYPE_ON_SCREEN_DISPLAY") << QByteArray(); } void NetWinInfoTestClient::testWindowType() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.5.0/po/ca/kwindowsystem5_qt.po new/kwindowsystem-5.6.0/po/ca/kwindowsystem5_qt.po --- old/kwindowsystem-5.5.0/po/ca/kwindowsystem5_qt.po 2014-12-06 13:47:31.000000000 +0100 +++ new/kwindowsystem-5.6.0/po/ca/kwindowsystem5_qt.po 2015-01-03 13:16:34.000000000 +0100 @@ -4,7 +4,7 @@ # 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. +# Antoni Bella Pérez <[email protected]>, 2003, 2006, 2011, 2012, 2013. # Albert Astals Cid <[email protected]>, 2004, 2005, 2007. # Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. # Robert Millan <[email protected]>, 2009. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.5.0/po/fi/kwindowsystem5_qt.po new/kwindowsystem-5.6.0/po/fi/kwindowsystem5_qt.po --- old/kwindowsystem-5.5.0/po/fi/kwindowsystem5_qt.po 2014-12-06 13:47:31.000000000 +0100 +++ new/kwindowsystem-5.6.0/po/fi/kwindowsystem5_qt.po 2015-01-03 13:16:34.000000000 +0100 @@ -14,7 +14,7 @@ # Tommi Nieminen <[email protected]>, 2009, 2010, 2011. # Tommi Nieminen <[email protected]>, 2009. # Jorma Karvonen <[email protected]>, 2010. -# Lasse Liehu <[email protected]>, 2006, 2010, 2011, 2012, 2013, 2014. +# Lasse Liehu <[email protected]>, 2006, 2010, 2011, 2012, 2013, 2014, 2015. # # KDE Finnish translation sprint participants: # Author: Artnay @@ -29,7 +29,7 @@ "POT-Creation-Date: 2014-03-23 01:50+0000\n" "PO-Revision-Date: 2014-03-30 00:13+0200\n" "Last-Translator: Lasse Liehu <[email protected]>\n" -"Language-Team: Finnish <[email protected]>\n" +"Language-Team: Finnish <[email protected]>\n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.5.0/po/gd/kwindowsystem5_qt.po new/kwindowsystem-5.6.0/po/gd/kwindowsystem5_qt.po --- old/kwindowsystem-5.5.0/po/gd/kwindowsystem5_qt.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kwindowsystem-5.6.0/po/gd/kwindowsystem5_qt.po 2015-01-03 13:16:34.000000000 +0100 @@ -0,0 +1,21 @@ +# GunChleoc <[email protected]>, 2014. +msgid "" +msgstr "" +"PO-Revision-Date: 2014-12-09 12:16+0100\n" +"Last-Translator: GunChleoc <[email protected]>\n" +"Language-Team: Fòram na Gàidhlig\n" +"Language: gd\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : " +"(n > 2 && n < 20) ? 2 : 3;\n" +"X-Generator: Virtaal 0.7.1\n" +"X-Qt-Contexts: true\n" + +#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 +#: kwindowsystem_x11.cpp:959 +#, qt-format +msgctxt "KWindowSystem|" +msgid "Desktop %1" +msgstr "Deasg %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.5.0/po/ko/kwindowsystem5_qt.po new/kwindowsystem-5.6.0/po/ko/kwindowsystem5_qt.po --- old/kwindowsystem-5.5.0/po/ko/kwindowsystem5_qt.po 2014-12-06 13:47:31.000000000 +0100 +++ new/kwindowsystem-5.6.0/po/ko/kwindowsystem5_qt.po 2015-01-03 13:16:34.000000000 +0100 @@ -18,7 +18,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 1.5\n" -"X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 #: kwindowsystem_x11.cpp:959 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.5.0/src/CMakeLists.txt new/kwindowsystem-5.6.0/src/CMakeLists.txt --- old/kwindowsystem-5.5.0/src/CMakeLists.txt 2014-12-06 13:47:31.000000000 +0100 +++ new/kwindowsystem-5.6.0/src/CMakeLists.txt 2015-01-03 13:16:34.000000000 +0100 @@ -74,6 +74,13 @@ PRIVATE ${platformLinkLibraries} ) +if(KWINDOWSYSTEM_HAVE_X11) + # we install kkeyserver_x11.h which needs the X11 headers available + # if we don't add the include path here code that includes kkeyserver.h will fail + # to compile unless X11 is installed in /usr/include + target_include_directories(KF5WindowSystem PUBLIC ${XCB_XCB_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) +endif() + if(IS_ABSOLUTE "${KF5_INCLUDE_INSTALL_DIR}") target_include_directories(KF5WindowSystem INTERFACE "$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}>" ) else() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.5.0/src/netwm.cpp new/kwindowsystem-5.6.0/src/netwm.cpp --- old/kwindowsystem-5.5.0/src/netwm.cpp 2014-12-06 13:47:31.000000000 +0100 +++ new/kwindowsystem-5.6.0/src/netwm.cpp 2015-01-03 13:16:34.000000000 +0100 @@ -24,7 +24,6 @@ */ //#define NETWMDEBUG - #include "netwm.h" #include <xcb/xcb.h> @@ -110,6 +109,7 @@ // KDE extensions static xcb_atom_t kde_net_wm_window_type_override = 0; static xcb_atom_t kde_net_wm_window_type_topmenu = 0; +static xcb_atom_t kde_net_wm_window_type_on_screen_display = 0; static xcb_atom_t kde_net_wm_temporary_rules = 0; static xcb_atom_t kde_net_wm_frame_overlap = 0; static xcb_atom_t kde_net_wm_activities = 0; @@ -387,7 +387,7 @@ } #endif -static const int netAtomCount = 92; +static const int netAtomCount = 93; static void create_netwm_atoms(xcb_connection_t *c) { @@ -481,6 +481,7 @@ { "_KDE_NET_WM_FRAME_STRUT", &kde_net_wm_frame_strut }, { "_KDE_NET_WM_WINDOW_TYPE_OVERRIDE", &kde_net_wm_window_type_override }, { "_KDE_NET_WM_WINDOW_TYPE_TOPMENU", &kde_net_wm_window_type_topmenu }, + { "_KDE_NET_WM_WINDOW_TYPE_ON_SCREEN_DISPLAY", &kde_net_wm_window_type_on_screen_display }, { "_KDE_NET_WM_TEMPORARY_RULES", &kde_net_wm_temporary_rules }, { "_NET_WM_FRAME_OVERLAP", &kde_net_wm_frame_overlap }, @@ -1176,6 +1177,9 @@ if (p->windowTypes & TopMenuMask) { atoms[pnum++] = kde_net_wm_window_type_topmenu; } + if (p->windowTypes & OnScreenDisplayMask) { + atoms[pnum++] = kde_net_wm_window_type_on_screen_display; + } } if (p->properties & WMState) { @@ -1488,6 +1492,8 @@ p->windowTypes |= OverrideMask; } else if (atom == kde_net_wm_window_type_topmenu) { p->windowTypes |= TopMenuMask; + } else if (atom == kde_net_wm_window_type_on_screen_display) { + p->windowTypes |= OnScreenDisplayMask; } else if (atom == net_wm_state) { @@ -3373,6 +3379,12 @@ len = 1; break; + case OnScreenDisplay: + data[0] = kde_net_wm_window_type_on_screen_display; + data[1] = net_wm_window_type_notification; + len = 1; + break; + default: case Normal: data[0] = net_wm_window_type_normal; @@ -4370,6 +4382,10 @@ else if (type == kde_net_wm_window_type_topmenu) { p->types[pos++] = TopMenu; } + + else if (type == kde_net_wm_window_type_on_screen_display) { + p->types[pos++] = OnScreenDisplay; + } } } } @@ -4711,6 +4727,7 @@ CHECK_TYPE_MASK(Notification) CHECK_TYPE_MASK(ComboBox) CHECK_TYPE_MASK(DNDIcon) + CHECK_TYPE_MASK(OnScreenDisplay) #undef CHECK_TYPE_MASK default: break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.5.0/src/netwm_def.h new/kwindowsystem-5.6.0/src/netwm_def.h --- old/kwindowsystem-5.5.0/src/netwm_def.h 2014-12-06 13:47:31.000000000 +0100 +++ new/kwindowsystem-5.6.0/src/netwm_def.h 2015-01-03 13:16:34.000000000 +0100 @@ -373,7 +373,12 @@ /** indicates a window that represents the dragged object during DND operation **/ - DNDIcon = 15 + DNDIcon = 15, + /** + indicates an On Screen Display window (such as volume feedback) + @since 5.6 + **/ + OnScreenDisplay = 16 // NON STANDARD }; /** @@ -397,6 +402,7 @@ NotificationMask = 1u << 13, ///< @see Notification ComboBoxMask = 1u << 14, ///< @see ComboBox DNDIconMask = 1u << 15, ///< @see DNDIcon + OnScreenDisplayMask = 1u << 16, ///< NON STANDARD @see OnScreenDisplay @since 5.6 AllTypesMask = 0U - 1 ///< All window types. }; Q_DECLARE_FLAGS(WindowTypes, WindowTypeMask) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
