[SCM] kwayland packaging branch, master, updated. debian/4%5.37.0-2-118-ge964566

Maximiliano Curia maxy at moszumanska.debian.org
Tue Jan 2 18:54:58 UTC 2018


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kwayland.git;a=commitdiff;h=4334a95

The following commit has been merged in the master branch:
commit 4334a950867ae61e1604ca60803fcf0b17ab8c68
Author: Rik Mills <rikmills at kubuntu.org>
Date:   Sun Jul 30 10:04:04 2017 +0100

    refresh patch
---
 debian/patches/kubuntu_disable-tests.diff | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/kubuntu_disable-tests.diff b/debian/patches/kubuntu_disable-tests.diff
index d6d4cf5..865a7ec 100644
--- a/debian/patches/kubuntu_disable-tests.diff
+++ b/debian/patches/kubuntu_disable-tests.diff
@@ -1,21 +1,21 @@
-diff --git a/autotests/client/CMakeLists.txt b/autotests/client/CMakeLists.txt
-index a52e297..fdc65b0 100644
+Index: b/autotests/client/CMakeLists.txt
+===================================================================
 --- a/autotests/client/CMakeLists.txt
 +++ b/autotests/client/CMakeLists.txt
-@@ -29,8 +29,6 @@ if(Wayland_VERSION VERSION_GREATER "1.4.0")
+@@ -29,8 +29,6 @@
          )
      add_executable(testWaylandFullscreenShell ${testWaylandFullscreenShell_SRCS})
      target_link_libraries( testWaylandFullscreenShell Qt5::Test KF5::WaylandClient Wayland::Client)
--    add_test(kwayland-testWaylandFullscreenShell testWaylandFullscreenShell)
+-    add_test(NAME kwayland-testWaylandFullscreenShell COMMAND testWaylandFullscreenShell)
 -    ecm_mark_as_test(testWaylandFullscreenShell)
  endif()
  
  ########################################################
-@@ -75,8 +73,6 @@ if (HAVE_LINUX_INPUT_H)
+@@ -75,8 +73,6 @@
          )
      add_executable(testWaylandSeat ${testWaylandSeat_SRCS})
      target_link_libraries( testWaylandSeat Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client Wayland::Server)
--    add_test(kwayland-testWaylandSeat testWaylandSeat)
+-    add_test(NAME kwayland-testWaylandSeat COMMAND testWaylandSeat)
 -    ecm_mark_as_test(testWaylandSeat)
  endif()
  

-- 
kwayland packaging



More information about the pkg-kde-commits mailing list