[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:54 UTC 2018


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

The following commit has been merged in the master branch:
commit 458fb901af14d4c324aefbf32f8726a959632b88
Author: Bhushan Shah <bhush94 at gmail.com>
Date:   Sat Aug 27 08:55:41 2016 +0530

    Update patch for unstable
---
 debian/patches/kubuntu_disable-tests.diff | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/patches/kubuntu_disable-tests.diff b/debian/patches/kubuntu_disable-tests.diff
index 0dc8e18..d6d4cf5 100644
--- a/debian/patches/kubuntu_disable-tests.diff
+++ b/debian/patches/kubuntu_disable-tests.diff
@@ -1,8 +1,8 @@
-Index: kwayland-5.3.2/autotests/client/CMakeLists.txt
-===================================================================
---- kwayland-5.3.2.orig/autotests/client/CMakeLists.txt
-+++ kwayland-5.3.2/autotests/client/CMakeLists.txt
-@@ -31,8 +31,6 @@ if(Wayland_VERSION VERSION_GREATER "1.4.
+diff --git a/autotests/client/CMakeLists.txt b/autotests/client/CMakeLists.txt
+index a52e297..fdc65b0 100644
+--- a/autotests/client/CMakeLists.txt
++++ b/autotests/client/CMakeLists.txt
+@@ -29,8 +29,6 @@ if(Wayland_VERSION VERSION_GREATER "1.4.0")
          )
      add_executable(testWaylandFullscreenShell ${testWaylandFullscreenShell_SRCS})
      target_link_libraries( testWaylandFullscreenShell Qt5::Test KF5::WaylandClient Wayland::Client)
@@ -11,12 +11,12 @@ Index: kwayland-5.3.2/autotests/client/CMakeLists.txt
  endif()
  
  ########################################################
-@@ -76,8 +74,6 @@ set( testWaylandSeat_SRCS
-     )
- 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)
--ecm_mark_as_test(testWaylandSeat)
+@@ -75,8 +73,6 @@ if (HAVE_LINUX_INPUT_H)
+         )
+     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)
+-    ecm_mark_as_test(testWaylandSeat)
+ endif()
  
  ########################################################
- # Test ShmPool

-- 
kwayland packaging



More information about the pkg-kde-commits mailing list