diffstat of debian/ for libkscreen_5.8.2-1 libkscreen_5.10.5-0ubuntu1 changelog | 263 ++++++++++++++++++++++++++++ control | 32 +-- libkf5screen-dev.acc.in | 5 libkf5screen7.lintian-overrides | 1 libkf5screen7.symbols | 9 meta/upstream_scm.json | 4 patches/kubuntu_disable_failing_tests.patch | 17 + patches/make_kwayland_optional.diff | 42 ++-- patches/series | 2 patches/upstream_fix_scaling_test.diff | 38 ++++ tests/control | 3 tests/testsuite | 2 12 files changed, 373 insertions(+), 45 deletions(-) diff -Nru libkscreen-5.8.2/debian/changelog libkscreen-5.10.5/debian/changelog --- libkscreen-5.8.2/debian/changelog 2016-10-19 13:22:51.000000000 +0000 +++ libkscreen-5.10.5/debian/changelog 2017-08-23 13:40:32.000000000 +0000 @@ -1,3 +1,124 @@ +libkscreen (4:5.10.5-0ubuntu1) artful; urgency=low + + * New upstream release (5.10.5) + + -- Simon Quigley Wed, 23 Aug 2017 14:40:32 +0100 + +libkscreen (4:5.10.4-0ubuntu2) artful; urgency=medium + + * Disable failing/unreliable test + + -- Rik Mills Fri, 11 Aug 2017 16:22:19 +0100 + +libkscreen (4:5.10.4-0ubuntu1) artful; urgency=low + + * New upstream release (5.10.4) + + -- Rik Mills Wed, 19 Jul 2017 14:38:33 +0100 + +libkscreen (4:5.10.3-0ubuntu1) artful; urgency=low + + * New upstream release (5.10.3) + + -- Rik Mills Sat, 01 Jul 2017 10:17:06 +0100 + +libkscreen (4:5.10.2-0ubuntu1) artful; urgency=low + + * New upstream release (5.10.2) + + -- Rik Mills Thu, 15 Jun 2017 18:13:32 +0100 + +libkscreen (4:5.10.1-0ubuntu1) artful; urgency=low + + * New upstream release (5.10.1) + + -- Rik Mills Tue, 06 Jun 2017 19:10:15 +0100 + +libkscreen (4:5.10.0-0ubuntu1) artful; urgency=low + + [ Rik Mills ] + * New upstream release (5.9.95) + * New upstream release (5.10.0) + + [ José Manuel Santamaría Lema ] + * Add upstream_fix_scaling_test.diff + + -- Rik Mills Tue, 30 May 2017 09:50:33 +0100 + +libkscreen (4:5.9.5-0ubuntu1) artful; urgency=low + + * New upstream release (5.9.5) + + -- José Manuel Santamaría Lema Sun, 30 Apr 2017 11:33:16 +0100 + +libkscreen (4:5.9.4-0ubuntu1) zesty; urgency=low + + * New upstream bugfix release (5.9.4) + + -- Rik Mills Thu, 23 Mar 2017 19:59:35 +0000 + +libkscreen (4:5.9.3-0ubuntu1) zesty; urgency=low + + * New upstream bugfix release (5.9.3) + + -- Rik Mills Thu, 02 Mar 2017 09:53:28 +0000 + +libkscreen (4:5.9.2-0ubuntu1) zesty; urgency=low + + * New upstream bugfix release (5.9.2) + + -- Rik Mills Mon, 20 Feb 2017 11:06:36 +0000 + +libkscreen (4:5.9.1-0ubuntu1) zesty; urgency=medium + + [ José Manuel Santamaría Lema ] + * Pass '-fno-keep-inline-functions' to gcc in the acc test in order to + avoid possible spurious test failures. + + [ Rik Mills ] + * New upstream release (5.9.1) + + -- Rik Mills Tue, 14 Feb 2017 23:21:32 +0000 + +libkscreen (4:5.9.0-0ubuntu1) zesty; urgency=low + + * New upstream release (5.9.0) + * Update symbols from build logs + + -- Rik Mills Sat, 04 Feb 2017 00:55:59 +0000 + +libkscreen (4:5.8.5-0ubuntu1) zesty; urgency=low + + * New upstream release (5.8.5) + * Refresh patch make_kwayland_optional.diff + * Update symbols from build logs + + -- Rik Mills Thu, 29 Dec 2016 16:46:18 +0000 + +libkscreen (4:5.8.4-0ubuntu1) zesty; urgency=medium + + [ José Manuel Santamaría Lema ] + * Update Vcs-Git fields to use https:// instead of git:// + * Update lintian override for libkf5screen7 against 'symbols-declares- + dependency-on-other-package' + * Add in libkfscreen-bin Breaks/Replaces against libkf5screen7 (<< + 4:5.8.3) due to file moving (/usr/lib/*/qt5/plugins/kf5/kscreen/) + * Create XDG_RUNTIME_DIR when running tests + * Now libkf5screen-bin Breaks/Replaces libkf5screen6 (<< 4:5.8.3) instead of + (<< 4:5.5.4-2~) in order to make sure the upgrades are safe with regarding + to /usr/lib/*/qt5/plugins/kf5/kscreen/ file moving. + * Remove undesired Breaks after debian merge. + + [ Simon Quigley ] + * New upstream release (5.8.3) + * Merge from Debian + + [ Rik Mills ] + * New upstream release (5.8.4) + * Refresh patch make_kwayland_optional.diff + + -- Rik Mills Mon, 05 Dec 2016 19:55:23 +0000 + libkscreen (4:5.8.2-1) unstable; urgency=medium [ Automatic packaging ] @@ -31,6 +152,13 @@ -- Maximiliano Curia Fri, 07 Oct 2016 14:04:50 +0200 +libkscreen (4:5.7.5-0ubuntu1) yakkety; urgency=medium + + * New upstream release (5.7.4) + * New upstream release (5.7.5) + + -- Rik Mills Tue, 20 Sep 2016 20:28:08 -0500 + libkscreen (4:5.7.4-1) unstable; urgency=medium [ Automatic packaging ] @@ -41,6 +169,14 @@ -- Maximiliano Curia Fri, 26 Aug 2016 15:04:49 +0200 +libkscreen (4:5.7.2-0ubuntu1) yakkety; urgency=medium + + * New upstream release (5.7.1) + * Refreshing symbols + * New upstream release (5.7.2) + + -- Clive Johnston Thu, 28 Jul 2016 12:06:44 +0000 + libkscreen (4:5.7.0-1) unstable; urgency=medium [ Automatic packaging ] @@ -60,6 +196,12 @@ -- Maximiliano Curia Tue, 21 Jun 2016 19:53:25 +0200 +libkscreen (4:5.6.5-0ubuntu1) yakkety; urgency=medium + + * New upstream release (5.6.5) + + -- Clive Johnston Fri, 15 Jul 2016 20:48:18 +0100 + libkscreen (4:5.6.4-3) unstable; urgency=medium * New patch: make_kwayland_optional.diff @@ -93,6 +235,49 @@ -- Maximiliano Curia Thu, 19 May 2016 10:24:31 +0200 +libkscreen (4:5.6.4-0ubuntu1) yakkety; urgency=medium + + [ Clive Johnston ] + * New upstream release + * Adding kwayland-dev as a build dep + * Bumping soversion from 6 to 7 + - Renamed libkf5screen install, symbols and overrides files + - Bumped version from 6 to 7 + * Refreshed symbols and removed MISSING + * Removed duplicate files installed in two install files + + [ Philip Muškovac ] + * Update the Vcs URLs now that the repositories are hosted on + Launchpad + + [ Clive Johnston ] + * New upstream release (5.6.4) + + -- Clive Johnston Wed, 18 May 2016 13:21:36 -0700 + +libkscreen (4:5.5.5-0ubuntu1) xenial; urgency=medium + + [ Philip Muškovac ] + * New upstream bugfix release + + [ Clive Johnston ] + * Adding kwayland-dev as build dep + * Add usr/bin/kscreen-doctor to libkf5screen-bin.install + * Added lintian override for libkf5screen-bin being declared in + symbols file. + + -- Philip Muškovac Thu, 14 Apr 2016 13:47:51 -0700 + +libkscreen (4:5.5.4-2~ubuntu1) xenial; urgency=medium + + [ Clive Johnston ] + * Merge with debian git master + + [ Philip Muškovac ] + * libkf5kscreen-bin breaks/replaces libkf5screen6 << 4:5.5.4-2~ + + -- Philip Muškovac Mon, 07 Mar 2016 21:25:30 +0100 + libkscreen (4:5.5.4-1) experimental; urgency=medium * New upstream release (5.5.0). @@ -110,6 +295,17 @@ -- Maximiliano Curia Tue, 01 Dec 2015 11:45:49 +0100 +libkscreen (4:5.4.3-0ubuntu1) xenial; urgency=medium + + [ Scarlett Clark ] + * Vivid backport + * New upstream bugfix release + + [ Philip Muškovac ] + * New upstream bugfix release (LP: #1518598) + + -- Philip Muškovac Sun, 22 Nov 2015 16:36:03 +0100 + libkscreen (4:5.4.2-1) unstable; urgency=medium * New upstream release (5.4.2). @@ -117,12 +313,30 @@ -- Maximiliano Curia Tue, 06 Oct 2015 07:52:07 +0200 +libkscreen (4:5.4.2-0ubuntu2) xenial; urgency=medium + + * Fix autopackagetests by adding allow-stderr to the requirements. + + -- Philip Muškovac Tue, 03 Nov 2015 15:34:53 +0100 + +libkscreen (4:5.4.2-0ubuntu1) wily; urgency=medium + + * New upstream release + + -- Scarlett Clark Fri, 02 Oct 2015 15:57:41 +0100 + libkscreen (4:5.4.1-1) unstable; urgency=medium * New upstream release (5.4.1). -- Maximiliano Curia Fri, 11 Sep 2015 18:45:14 +0200 +libkscreen (4:5.4.1-0ubuntu1) wily; urgency=medium + + * new upstream release + + -- Jonathan Riddell Tue, 08 Sep 2015 10:20:02 +0100 + libkscreen (4:5.4.0-1) unstable; urgency=medium * New upstream release (5.4.0). @@ -130,6 +344,18 @@ -- Maximiliano Curia Thu, 03 Sep 2015 17:59:24 +0200 +libkscreen (4:5.4.0-0ubuntu1) wily; urgency=medium + + * new upstream release + + -- Jonathan Riddell Mon, 31 Aug 2015 15:53:03 +0100 + +libkscreen (4:5.3.95-0ubuntu1) wily; urgency=medium + + * new upstream beta release + + -- Jonathan Riddell Mon, 10 Aug 2015 23:17:17 +0200 + libkscreen (4:5.3.2-2) unstable; urgency=medium * Update symbols files for gcc5 compatibility. (Closes: #791728) @@ -143,6 +369,43 @@ -- Maximiliano Curia Tue, 30 Jun 2015 22:29:10 +0200 +libkscreen (4:5.3.2-0ubuntu2) wily; urgency=medium + + * Non-maintainer upload. + * Update symbols files: mark as optional the symbols gone after + building with GCC 5 + + -- José Manuel Santamaría Lema Wed, 22 Jul 2015 20:00:44 +0200 + +libkscreen (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium + + * Vivid backport + + -- Scarlett Clark Thu, 02 Jul 2015 11:41:59 -0700 + +libkscreen (4:5.3.2-0ubuntu1) wily; urgency=medium + + * New upstream release + + -- Jonathan Riddell Thu, 02 Jul 2015 12:40:13 +0000 + +libkscreen (4:5.3.1-0ubuntu1) wily; urgency=medium + + [ Scarlett Clark ] + * Manual merge kubuntu_stable. + + [ Jonathan Riddell ] + * Plasma 5.3 beta + * new upstream release + + [ Scarlett Clark ] + * Vivid backport + + [ Jonathan Riddell ] + * New upstream release + + -- Jonathan Riddell Fri, 05 Jun 2015 02:35:42 +0200 + libkscreen (4:5.3.1-1) unstable; urgency=medium * New upstream release (5.3.0). diff -Nru libkscreen-5.8.2/debian/control libkscreen-5.10.5/debian/control --- libkscreen-5.8.2/debian/control 2016-10-19 13:22:51.000000000 +0000 +++ libkscreen-5.10.5/debian/control 2017-08-23 13:40:32.000000000 +0000 @@ -5,9 +5,9 @@ Uploaders: Maximiliano Curia Build-Depends: cmake (>= 2.8.12), debhelper (>= 9), - extra-cmake-modules (>= 5.14.0~), - libkf5wayland-dev [linux-any], - libqt5x11extras5-dev (>= 5.4.0~), + extra-cmake-modules (>= 5.36.0~), + libkf5wayland-dev (>= 4:5.36.0~) [linux-any], + libqt5x11extras5-dev (>= 5.6.1~), libx11-dev, libx11-xcb-dev, libxcb-randr0-dev, @@ -15,17 +15,17 @@ libxrandr-dev, pkg-config, pkg-kde-tools (>= 0.15.15ubuntu1~), - qtbase5-dev (>= 5.4.0~) + qtbase5-dev (>= 5.6.1~) Standards-Version: 3.9.8 Homepage: https://projects.kde.org/projects/kde/workspace/libkscreen -Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/plasma/libkscreen.git -Vcs-Git: https://anonscm.debian.org/git/pkg-kde/plasma/libkscreen.git +Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/libkscreen +Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/libkscreen Package: libkf5screen-dev -Section: libdevel Architecture: any +Section: libdevel Depends: libkf5screen7 (= ${binary:Version}), - qtbase5-dev (>= 5.4.0~), + qtbase5-dev (>= 5.6.1~), ${misc:Depends} Description: library for screen management - development files The KDE multiple monitor support is trying be as smart as possible @@ -38,26 +38,24 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} +Breaks: libkf5screen5 (<< 4:5.2.0), libkf5screen6 +Replaces: libkf5screen5 (<< 4:5.2.0), libkf5screen6 Description: library for screen management - shared library The KDE multiple monitor support is trying be as smart as possible adapting the behavior of it to each use case making the configuration of monitors as simple as plugging them to your computer. . This package contains the shared library -Breaks: kscreen (<< 4:5.8), - libpowerdevilcore2 (<< 4:5.8), - plasma-workspace (<< 4:5.7) Package: libkf5screen-bin Architecture: any Multi-Arch: foreign Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: kscreen (<< 4:5.8), - libkf5screen5, - libkf5screen6, - libpowerdevilcore2 (<< 4:5.8), - plasma-workspace (<< 4:5.7) -Replaces: libkf5screen5, libkf5screen6 +Breaks: libkf5screen5, libkf5screen6 (<< 4:5.8.3), libkf5screen7 (<< 4:5.8.3) +Replaces: libkf5screen-bin (<< 4:5.8.3), + libkf5screen5, + libkf5screen6 (<< 4:5.8.3), + libkf5screen7 (<< 4:5.8.3) Description: library for screen management - helpers The KDE multiple monitor support is trying be as smart as possible adapting the behavior of it to each use case making the configuration diff -Nru libkscreen-5.8.2/debian/libkf5screen-dev.acc.in libkscreen-5.10.5/debian/libkf5screen-dev.acc.in --- libkscreen-5.8.2/debian/libkf5screen-dev.acc.in 2016-10-19 13:22:51.000000000 +0000 +++ libkscreen-5.10.5/debian/libkf5screen-dev.acc.in 2017-08-23 13:40:32.000000000 +0000 @@ -1,4 +1,4 @@ - + @@ -15,6 +15,7 @@ -fPIC + -fno-keep-inline-functions - + \ No newline at end of file diff -Nru libkscreen-5.8.2/debian/libkf5screen7.lintian-overrides libkscreen-5.10.5/debian/libkf5screen7.lintian-overrides --- libkscreen-5.8.2/debian/libkf5screen7.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ libkscreen-5.10.5/debian/libkf5screen7.lintian-overrides 2017-08-23 13:40:32.000000000 +0000 @@ -0,0 +1 @@ +libkf5screen7: symbols-declares-dependency-on-other-package libkf5screen-bin * diff -Nru libkscreen-5.8.2/debian/libkf5screen7.symbols libkscreen-5.10.5/debian/libkf5screen7.symbols --- libkscreen-5.8.2/debian/libkf5screen7.symbols 2016-10-19 13:22:51.000000000 +0000 +++ libkscreen-5.10.5/debian/libkf5screen7.symbols 2017-08-23 13:40:32.000000000 +0000 @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 4:5.8.0 amd64 armhf i386 +# SymbolsHelper-Confirmed: 4:5.9.0 amd64 arm64 armhf i386 ppc64el libKF5Screen.so.7 libkf5screen7 #MINVER#, libkf5screen-bin (>= 4:5.6.2~) _ZN7KScreen13ConfigMonitor11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.1.1 _ZN7KScreen13ConfigMonitor11qt_metacastEPKc@Base 5.1.1 @@ -54,7 +54,7 @@ _ZN7KScreen15AbstractBackend11qt_metacastEPKc@Base 5.1.1 _ZN7KScreen15AbstractBackend13configChangedERK14QSharedPointerINS_6ConfigEE@Base 5.1.1 _ZN7KScreen15AbstractBackend16staticMetaObjectE@Base 5.1.1 - _ZN7KScreen15AbstractBackend4initERK4QMapI7QString8QVariantE@Base 4:5.5.0 + _ZN7KScreen15AbstractBackend4initERK4QMapI7QString8QVariantE@Base 4:5.4.2+git20151012.1045 _ZN7KScreen15ConfigOperation10emitResultEv@Base 5.1.1 _ZN7KScreen15ConfigOperation11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.1.1 _ZN7KScreen15ConfigOperation11qt_metacastEPKc@Base 5.1.1 @@ -171,6 +171,8 @@ _ZN7KScreen6Output11qt_metacastEPKc@Base 5.1.1 _ZN7KScreen6Output11setRotationENS0_8RotationE@Base 5.1.1 _ZN7KScreen6Output11sizeChangedEv@Base 4:5.4.0 + _ZN7KScreen6Output12modesChangedEv@Base 4:5.8.5 + _ZN7KScreen6Output12scaleChangedEv@Base 4:5.9.0 _ZN7KScreen6Output12setConnectedEb@Base 5.1.1 _ZN7KScreen6Output13clonesChangedEv@Base 5.1.1 _ZN7KScreen6Output13outputChangedEv@Base 5.1.1 @@ -185,12 +187,14 @@ _ZN7KScreen6Output5applyERK14QSharedPointerIS0_E@Base 5.1.1 _ZN7KScreen6Output5setIdEi@Base 5.1.1 _ZN7KScreen6Output6setPosERK6QPoint@Base 5.1.1 + _ZN7KScreen6Output7Private15compareModeListERK4QMapI7QString14QSharedPointerINS_4ModeEEES9_@Base 4:5.8.5 _ZN7KScreen6Output7setEdidERK10QByteArray@Base 5.1.1 _ZN7KScreen6Output7setIconERK7QString@Base 5.1.1 _ZN7KScreen6Output7setNameERK7QString@Base 5.1.1 _ZN7KScreen6Output7setSizeERK5QSize@Base 4:5.4.0 _ZN7KScreen6Output7setTypeENS0_4TypeE@Base 5.1.1 _ZN7KScreen6Output8setModesERK4QMapI7QString14QSharedPointerINS_4ModeEEE@Base 5.1.1 + _ZN7KScreen6Output8setScaleEd@Base 4:5.9.0 _ZN7KScreen6Output9setClonesE5QListIiE@Base 5.1.1 _ZN7KScreen6Output9setSizeMmERK5QSize@Base 5.1.1 _ZN7KScreen6OutputC1EPNS0_7PrivateE@Base 5.1.1 @@ -288,6 +292,7 @@ _ZNK7KScreen6Output4typeEv@Base 5.1.1 _ZNK7KScreen6Output5cloneEv@Base 5.1.1 _ZNK7KScreen6Output5modesEv@Base 5.1.1 + _ZNK7KScreen6Output5scaleEv@Base 4:5.9.0 _ZNK7KScreen6Output6clonesEv@Base 5.1.1 _ZNK7KScreen6Output6sizeMmEv@Base 5.1.1 _ZNK7KScreen6Output7Private11biggestModeERK4QMapI7QString14QSharedPointerINS_4ModeEEE@Base 5.1.1 diff -Nru libkscreen-5.8.2/debian/meta/upstream_scm.json libkscreen-5.10.5/debian/meta/upstream_scm.json --- libkscreen-5.8.2/debian/meta/upstream_scm.json 2016-10-19 13:22:51.000000000 +0000 +++ libkscreen-5.10.5/debian/meta/upstream_scm.json 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -{ - "type" : "git", - "branch" : "frameworks" -} diff -Nru libkscreen-5.8.2/debian/patches/kubuntu_disable_failing_tests.patch libkscreen-5.10.5/debian/patches/kubuntu_disable_failing_tests.patch --- libkscreen-5.8.2/debian/patches/kubuntu_disable_failing_tests.patch 1970-01-01 00:00:00.000000000 +0000 +++ libkscreen-5.10.5/debian/patches/kubuntu_disable_failing_tests.patch 2017-08-23 13:40:32.000000000 +0000 @@ -0,0 +1,17 @@ +Author: Rik Mills +Description: Disable failing/unreliable tests. + + +Index: b/autotests/CMakeLists.txt +=================================================================== +--- a/autotests/CMakeLists.txt ++++ b/autotests/CMakeLists.txt +@@ -41,7 +41,7 @@ + + kscreen_add_test(testkwaylandbackend) + kscreen_add_test(testkwaylandconfig) +- kscreen_add_test(testkwaylanddpms) ++# kscreen_add_test(testkwaylanddpms) + + set(KSCREEN_WAYLAND_LIBS "") + set(KSCREEN_WAYLAND_SRCS "") diff -Nru libkscreen-5.8.2/debian/patches/make_kwayland_optional.diff libkscreen-5.10.5/debian/patches/make_kwayland_optional.diff --- libkscreen-5.8.2/debian/patches/make_kwayland_optional.diff 2016-10-19 13:22:51.000000000 +0000 +++ libkscreen-5.10.5/debian/patches/make_kwayland_optional.diff 2017-08-23 13:40:32.000000000 +0000 @@ -9,11 +9,12 @@ tests/CMakeLists.txt | 4 +++- 4 files changed, 27 insertions(+), 19 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 25c41b9..5f80a7d 100644 + +Index: b/CMakeLists.txt +=================================================================== --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -20,7 +20,7 @@ set(REQUIRED_QT_VERSION 5.4.0) +@@ -20,7 +20,7 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Gui Test X11Extras) # Wayland backend @@ -22,8 +23,8 @@ add_feature_info("KF5Wayland" KF5Wayland_FOUND "Required for building libkscreen's KWayland backend") # xrandr backend -diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt -index 9f8cea7..3a3bc20 100644 +Index: b/autotests/CMakeLists.txt +=================================================================== --- a/autotests/CMakeLists.txt +++ b/autotests/CMakeLists.txt @@ -1,6 +1,9 @@ @@ -37,9 +38,9 @@ macro(KSCREEN_ADD_TEST) foreach(_testname ${ARGN}) -@@ -23,24 +26,25 @@ kscreen_add_test(testinprocess) - kscreen_add_test(testbackendloader) +@@ -24,24 +27,25 @@ kscreen_add_test(testlog) + kscreen_add_test(testmodelistchange) -set(KSCREEN_WAYLAND_LIBS - KF5::WaylandServer KF5::WaylandClient @@ -51,35 +52,38 @@ - ${CMAKE_SOURCE_DIR}/tests/kwayland/waylandtestserver.cpp -) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../backends/kwayland) +- +-kscreen_add_test(testkwaylandbackend) +-kscreen_add_test(testkwaylandconfig) +-kscreen_add_test(testkwaylanddpms) +- +-set(KSCREEN_WAYLAND_LIBS "") +-set(KSCREEN_WAYLAND_SRCS "") +- +if(${KF5Wayland_FOUND}) + set(KSCREEN_WAYLAND_LIBS + KF5::WaylandServer KF5::WaylandClient + ) - --kscreen_add_test(testkwaylandbackend) --kscreen_add_test(testkwaylandconfig) --kscreen_add_test(testkwaylanddpms) ++ + # For WaylandConfigReader and TestServer + set(KSCREEN_WAYLAND_SRCS + ${CMAKE_SOURCE_DIR}/tests/kwayland/waylandconfigreader.cpp + ${CMAKE_SOURCE_DIR}/tests/kwayland/waylandtestserver.cpp + ) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../backends/kwayland) - --set(KSCREEN_WAYLAND_LIBS "") --set(KSCREEN_WAYLAND_SRCS "") ++ + kscreen_add_test(testkwaylandbackend) + kscreen_add_test(testkwaylandconfig) + kscreen_add_test(testkwaylanddpms) - ++ + set(KSCREEN_WAYLAND_LIBS "") + set(KSCREEN_WAYLAND_SRCS "") +endif() if (ENABLE_XRANDR_TESTS) kscreen_add_test(textxrandr) -diff --git a/backends/CMakeLists.txt b/backends/CMakeLists.txt -index 3563e13..5f44182 100644 +Index: b/backends/CMakeLists.txt +=================================================================== --- a/backends/CMakeLists.txt +++ b/backends/CMakeLists.txt @@ -1,6 +1,8 @@ @@ -92,8 +96,8 @@ if(${XCB_RANDR_FOUND}) message(STATUS "Will build xrandr backend.") -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 1489d21..e82f7f7 100644 +Index: b/tests/CMakeLists.txt +=================================================================== --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,4 +1,6 @@ diff -Nru libkscreen-5.8.2/debian/patches/series libkscreen-5.10.5/debian/patches/series --- libkscreen-5.8.2/debian/patches/series 2016-10-19 13:22:51.000000000 +0000 +++ libkscreen-5.10.5/debian/patches/series 2017-08-23 13:40:32.000000000 +0000 @@ -1 +1,3 @@ make_kwayland_optional.diff +upstream_fix_scaling_test.diff +kubuntu_disable_failing_tests.patch diff -Nru libkscreen-5.8.2/debian/patches/upstream_fix_scaling_test.diff libkscreen-5.10.5/debian/patches/upstream_fix_scaling_test.diff --- libkscreen-5.8.2/debian/patches/upstream_fix_scaling_test.diff 1970-01-01 00:00:00.000000000 +0000 +++ libkscreen-5.10.5/debian/patches/upstream_fix_scaling_test.diff 2017-08-23 13:40:32.000000000 +0000 @@ -0,0 +1,38 @@ +From 2bafd15756a12417d84f6041cbd759813738cc58 Mon Sep 17 00:00:00 2001 +From: David Edmundson +Date: Thu, 11 May 2017 16:37:11 +0200 +Subject: Update unit test to match scaling + +Summary: +Scaling wasn't implemented before, so the test passed despite being +technically wrong. + +Test Plan: Passes + +Reviewers: #plasma + +Subscribers: plasma-devel + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D5813 +--- + autotests/testscreenconfig.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/autotests/testscreenconfig.cpp b/autotests/testscreenconfig.cpp +index 968cf30..ac46331 100644 +--- a/autotests/testscreenconfig.cpp ++++ b/autotests/testscreenconfig.cpp +@@ -156,7 +156,7 @@ void testScreenConfig::multiOutput() + QCOMPARE(output->type(), Output::HDMI); + QCOMPARE(output->modes().count(), 4); + QCOMPARE(output->pos(), QPoint(1280, 0)); +- QCOMPARE(output->geometry(), QRect(1280, 0, 1920, 1080)); ++ QCOMPARE(output->geometry(), QRect(1280, 0, 1920 / 1.4, 1080 / 1.4)); + QCOMPARE(output->currentModeId(), QLatin1String("4")); + QCOMPARE(output->preferredModeId(), QLatin1String("4")); + QCOMPARE(output->rotation(), Output::None); +-- +cgit v0.11.2 + diff -Nru libkscreen-5.8.2/debian/tests/control libkscreen-5.10.5/debian/tests/control --- libkscreen-5.8.2/debian/tests/control 2016-10-19 13:22:51.000000000 +0000 +++ libkscreen-5.10.5/debian/tests/control 2017-08-23 13:40:32.000000000 +0000 @@ -1,5 +1,6 @@ Tests: testsuite -Depends: @, @builddeps@, build-essential, xvfb, xauth, dbus (>= 1.8), libgl1-mesa-dri +Depends: @, @builddeps@, build-essential, xvfb, xauth, dbus-x11, libgl1-mesa-dri, + kwin-wayland-backend-fbdev Restrictions: build-needed Tests: acc diff -Nru libkscreen-5.8.2/debian/tests/testsuite libkscreen-5.10.5/debian/tests/testsuite --- libkscreen-5.8.2/debian/tests/testsuite 2016-10-19 13:22:51.000000000 +0000 +++ libkscreen-5.10.5/debian/tests/testsuite 2017-08-23 13:40:32.000000000 +0000 @@ -4,6 +4,8 @@ export LC_ALL=C.UTF-8 export HOME=$(mktemp -d) trap "rm -rf ${HOME}" EXIT +export XDG_RUNTIME_DIR="${HOME}/runtime" +mkdir -p ${XDG_RUNTIME_DIR} || true xvfb-run -a --server-args="-screen 0 1024x768x24" \ dbus-run-session -- dh_auto_test