Hello community, here is the log from the commit of package kwayland for openSUSE:Factory checked in at 2016-01-03 13:25:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwayland (Old) and /work/SRC/openSUSE:Factory/.kwayland.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kwayland" Changes: -------- --- /work/SRC/openSUSE:Factory/kwayland/kwayland.changes 2015-12-29 12:56:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kwayland.new/kwayland.changes 2016-01-03 13:26:07.000000000 +0100 @@ -1,0 +2,15 @@ +Wed Dec 23 17:35:00 UTC 2015 - alarrosa@suse.com + +- Add fix-wayland-1.3-dependency.diff again, rebased to apply correctly + now that there are wayland packages for SLE12 updated with the new + requirements from wayland 1.7 + +------------------------------------------------------------------- +Tue Dec 22 22:35:09 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.5.2: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.2.php + +------------------------------------------------------------------- Old: ---- kwayland-5.5.1.tar.xz New: ---- fix-wayland-1.3-dependency.diff kwayland-5.5.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwayland.spec ++++++ --- /var/tmp/diff_new_pack.Wg1MW4/_old 2016-01-03 13:26:08.000000000 +0100 +++ /var/tmp/diff_new_pack.Wg1MW4/_new 2016-01-03 13:26:08.000000000 +0100 @@ -17,7 +17,7 @@ Name: kwayland -Version: 5.5.1 +Version: 5.5.2 Release: 0 Summary: KDE Wayland library License: LGPL-2.1+ @@ -25,6 +25,8 @@ Url: http://www.kde.org Source: %{name}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-OPENSUSE fix-wayland-1.3-dependency.diff alarrosa@suse.de -- Changes the wayland version kwayland depends on +Patch0: fix-wayland-1.3-dependency.diff BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= 1.4.0 BuildRequires: fdupes @@ -35,8 +37,14 @@ BuildRequires: cmake(Qt5Gui) >= 5.4.0 BuildRequires: cmake(Qt5Test) >= 5.4.0 BuildRequires: pkgconfig(egl) +%if 0%{?suse_version} == 1315 && ! 0%{?is_opensuse} +# We have a patched wayland 1.2.1 version in SLE12 with the required features from 1.7.0 +BuildRequires: pkgconfig(wayland-client) >= 1.2.1 +BuildRequires: pkgconfig(wayland-server) >= 1.2.1 +%else BuildRequires: pkgconfig(wayland-client) >= 1.7.0 BuildRequires: pkgconfig(wayland-server) >= 1.7.0 +%endif Provides: libKF5WaylandClient5 = %{version} Obsoletes: libKF5WaylandClient5 <= %{version} Provides: libKF5WaylandServer5 = %{version} @@ -59,6 +67,9 @@ %prep %setup -q +%if 0%{?suse_version} == 1315 && ! 0%{?is_opensuse} +%patch0 -p1 +%endif %build %cmake_kf5 -d build ++++++ fix-wayland-1.3-dependency.diff ++++++ Index: kwayland-5.4.1/CMakeLists.txt =================================================================== --- kwayland-5.4.1.orig/CMakeLists.txt +++ kwayland-5.4.1/CMakeLists.txt @@ -28,7 +28,7 @@ ecm_setup_version(${KF5_VERSION} VARIABL set(REQUIRED_QT_VERSION 5.4.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) -find_package(Wayland 1.7 COMPONENTS Client Server) +find_package(Wayland 1.2 COMPONENTS Client Server) set_package_properties(Wayland PROPERTIES TYPE REQUIRED ) ++++++ kwayland-5.5.1.tar.xz -> kwayland-5.5.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.5.1/CMakeLists.txt new/kwayland-5.5.2/CMakeLists.txt --- old/kwayland-5.5.1/CMakeLists.txt 2015-12-15 11:25:37.000000000 +0100 +++ new/kwayland-5.5.2/CMakeLists.txt 2015-12-22 11:36:00.000000000 +0100 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.8.12) -set(PROJECT_VERSION "5.5.1") +set(PROJECT_VERSION "5.5.2") set(PROJECT_VERSION_MAJOR 5) project(KWAYLAND) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.5.1/autotests/client/test_wayland_outputdevice.cpp new/kwayland-5.5.2/autotests/client/test_wayland_outputdevice.cpp --- old/kwayland-5.5.1/autotests/client/test_wayland_outputdevice.cpp 2015-12-15 11:25:37.000000000 +0100 +++ new/kwayland-5.5.2/autotests/client/test_wayland_outputdevice.cpp 2015-12-22 11:36:00.000000000 +0100 @@ -110,7 +110,7 @@ m_serverOutputDevice->setCurrentMode(1); - m_edid = "AP///////wAQrBbwTExLQQ4WAQOANCB46h7Frk80sSYOUFSlSwCBgKlA0QBxTwEBAQEBAQEBKDyAoHCwI0AwIDYABkQhAAAaAAAA/wBGNTI1TTI0NUFLTEwKAAAA/ABERUxMIFUyNDEwCiAgAAAA/QA4TB5REQAKICAgICAgAToCAynxUJAFBAMCBxYBHxITFCAVEQYjCQcHZwMMABAAOC2DAQAA4wUDAQI6gBhxOC1AWCxFAAZEIQAAHgEdgBhxHBYgWCwlAAZEIQAAngEdAHJR0B4gbihVAAZEIQAAHowK0Iog4C0QED6WAAZEIQAAGAAAAAAAAAAAAAAAAAAAPg=="; + m_edid = QByteArray::fromBase64("AP///////wAQrBbwTExLQQ4WAQOANCB46h7Frk80sSYOUFSlSwCBgKlA0QBxTwEBAQEBAQEBKDyAoHCwI0AwIDYABkQhAAAaAAAA/wBGNTI1TTI0NUFLTEwKAAAA/ABERUxMIFUyNDEwCiAgAAAA/QA4TB5REQAKICAgICAgAToCAynxUJAFBAMCBxYBHxITFCAVEQYjCQcHZwMMABAAOC2DAQAA4wUDAQI6gBhxOC1AWCxFAAZEIQAAHgEdgBhxHBYgWCwlAAZEIQAAngEdAHJR0B4gbihVAAZEIQAAHowK0Iog4C0QED6WAAZEIQAAGAAAAAAAAAAAAAAAAAAAPg=="); m_serverOutputDevice->setEdid(m_edid); m_serverOutputDevice->create(); @@ -183,7 +183,7 @@ QCOMPARE(output.transform(), KWayland::Client::OutputDevice::Transform::Normal); QCOMPARE(output.enabled(), OutputDevice::Enablement::Enabled); QCOMPARE(output.edid(), QByteArray()); - QSignalSpy outputChanged(&output, &KWayland::Client::OutputDevice::changed); + QSignalSpy outputChanged(&output, &KWayland::Client::OutputDevice::done); QVERIFY(outputChanged.isValid()); output.setup(registry.bindOutputDevice(announced.first().first().value<quint32>(), announced.first().last().value<quint32>())); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.5.1/src/client/outputdevice.cpp new/kwayland-5.5.2/src/client/outputdevice.cpp --- old/kwayland-5.5.1/src/client/outputdevice.cpp 2015-12-15 11:25:37.000000000 +0100 +++ new/kwayland-5.5.2/src/client/outputdevice.cpp 2015-12-22 11:36:00.000000000 +0100 @@ -257,7 +257,7 @@ void OutputDevice::Private::edidCallback(void* data, org_kde_kwin_outputdevice* output, const char* raw) { auto o = reinterpret_castOutputDevice::Private*(data); - o->edid = raw; + o->edid = QByteArray::fromBase64(raw); } void OutputDevice::Private::enabledCallback(void* data, org_kde_kwin_outputdevice* output, int32_t enabled) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.5.1/src/client/protocols/outputdevice.xml new/kwayland-5.5.2/src/client/protocols/outputdevice.xml --- old/kwayland-5.5.1/src/client/protocols/outputdevice.xml 2015-12-15 11:25:37.000000000 +0100 +++ new/kwayland-5.5.2/src/client/protocols/outputdevice.xml 2015-12-22 11:36:00.000000000 +0100 @@ -177,17 +177,15 @@ </event> <event name="edid"> - <description summary="advertise available modes for the output"> - The mode event encapsulates the EDID data for the output. + <description summary="advertise EDID data for the output"> + The edid event encapsulates the EDID data for the outputdevice. The event is sent when binding to the output object. The EDID data may be empty, in which case this event is fired, anyway. If the EDID information is empty, you can fall back to the name - et al. properties. - - The data argument can be used to decode custom EDID extensions. + et al. properties of the outputdevice. </description> - <arg name="raw" type="string" summary="raw EDID string"/> + <arg name="raw" type="string" summary="base64-encoded EDID string"/> </event> <enum name="enablement"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.5.1/src/server/outputdevice_interface.cpp new/kwayland-5.5.2/src/server/outputdevice_interface.cpp --- old/kwayland-5.5.1/src/server/outputdevice_interface.cpp 2015-12-15 11:25:37.000000000 +0100 +++ new/kwayland-5.5.2/src/server/outputdevice_interface.cpp 2015-12-22 11:36:00.000000000 +0100 @@ -561,7 +561,7 @@ { for (auto it = resources.constBegin(); it != resources.constEnd(); ++it) { org_kde_kwin_outputdevice_send_edid((*it).resource, - edid.constData()); + edid.toBase64().constData()); } }