[SCM] plasma-workspace packaging branch, master, updated. debian/5.4.3-1-17-g3bea816

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-workspace.git;a=commitdiff;h=9027458

The following commit has been merged in the master branch:
commit 90274581aba2939f739448490270739bfdd129db
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Dec 16 15:02:12 2015 +0100

    Refresh patches.
---
 debian/patches/disable_incompatible_tests   | 17 ++---------------
 debian/patches/install_missing_header       |  6 +++---
 debian/patches/kubuntu_startkde-qtpath.diff | 12 ++++++------
 3 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/debian/patches/disable_incompatible_tests b/debian/patches/disable_incompatible_tests
index 69cf470..79cf0db 100644
--- a/debian/patches/disable_incompatible_tests
+++ b/debian/patches/disable_incompatible_tests
@@ -1,7 +1,7 @@
 Index: plasma-workspace/kioslave/desktop/tests/CMakeLists.txt
 ===================================================================
---- plasma-workspace.orig/kioslave/desktop/tests/CMakeLists.txt	2015-09-04 09:33:27.368853292 +0200
-+++ plasma-workspace/kioslave/desktop/tests/CMakeLists.txt	2015-09-04 13:02:55.912620678 +0200
+--- plasma-workspace.orig/kioslave/desktop/tests/CMakeLists.txt	2015-12-16 14:59:09.833538037 +0100
++++ plasma-workspace/kioslave/desktop/tests/CMakeLists.txt	2015-12-16 14:59:09.833538037 +0100
 @@ -1,6 +1,6 @@
  add_executable(testdesktop kio_desktop_test.cpp)
  target_link_libraries(testdesktop KF5::KIOWidgets KF5::Solid Qt5::Test KF5::KDELibs4Support)
@@ -11,16 +11,3 @@ Index: plasma-workspace/kioslave/desktop/tests/CMakeLists.txt
 +# ecm_mark_as_test(testdesktop)
 +# add_test(testdesktop testdesktop)
  
-Index: plasma-workspace/ksmserver/screenlocker/autotests/lockwindowtest.cpp
-===================================================================
---- plasma-workspace.orig/ksmserver/screenlocker/autotests/lockwindowtest.cpp	2015-09-04 09:33:27.384852657 +0200
-+++ plasma-workspace/ksmserver/screenlocker/autotests/lockwindowtest.cpp	2015-09-04 12:58:42.826700134 +0200
-@@ -142,7 +142,7 @@
-     xcb_configure_window(c, widgetWindow.winId(), XCB_CONFIG_WINDOW_STACK_MODE, values);
-     xcb_flush(c);
-     QTest::qWait(1000);
--    QVERIFY(isBlack());
-+    // QVERIFY(isBlack());
- 
-     lockWindow.hideLockWindow();
- }
diff --git a/debian/patches/install_missing_header b/debian/patches/install_missing_header
index 0d32fd7..8a151d4 100644
--- a/debian/patches/install_missing_header
+++ b/debian/patches/install_missing_header
@@ -1,8 +1,8 @@
 Index: plasma-workspace/CMakeLists.txt
 ===================================================================
---- plasma-workspace.orig/CMakeLists.txt	2015-09-04 09:39:06.731389959 +0200
-+++ plasma-workspace/CMakeLists.txt	2015-09-04 09:39:06.727390117 +0200
-@@ -102,7 +102,10 @@
+--- plasma-workspace.orig/CMakeLists.txt	2015-12-16 14:57:29.253739122 +0100
++++ plasma-workspace/CMakeLists.txt	2015-12-16 14:57:29.249739289 +0100
+@@ -98,7 +98,10 @@
  configure_file(config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h)
  configure_file(config-unix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-unix.h )
  configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
diff --git a/debian/patches/kubuntu_startkde-qtpath.diff b/debian/patches/kubuntu_startkde-qtpath.diff
index 8a67a3d..1fcdf1e 100644
--- a/debian/patches/kubuntu_startkde-qtpath.diff
+++ b/debian/patches/kubuntu_startkde-qtpath.diff
@@ -4,8 +4,8 @@ Origin: vendor
 Author: Jonathan Riddell <jriddell at ubuntu.com>
 Index: plasma-workspace/startkde/startkde.cmake
 ===================================================================
---- plasma-workspace.orig/startkde/startkde.cmake	2015-09-04 09:36:58.624473064 +0200
-+++ plasma-workspace/startkde/startkde.cmake	2015-09-04 09:36:58.620473223 +0200
+--- plasma-workspace.orig/startkde/startkde.cmake	2015-12-16 14:57:10.226533877 +0100
++++ plasma-workspace/startkde/startkde.cmake	2015-12-16 14:57:10.214534378 +0100
 @@ -3,6 +3,8 @@
  #  DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
  #
@@ -15,7 +15,7 @@ Index: plasma-workspace/startkde/startkde.cmake
  if test "x$1" = x--failsafe; then
      KDE_FAILSAFE=1 # General failsafe flag
      KWIN_COMPOSE=N # Disable KWin's compositing
-@@ -19,7 +21,7 @@
+@@ -20,7 +22,7 @@
  # in case we have been started with full pathname spec without being in PATH
  bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,
,p'`
  if [ -n "$bindir" ]; then
@@ -24,7 +24,7 @@ Index: plasma-workspace/startkde/startkde.cmake
    qdbus=$qbindir/qdbus
    case $PATH in
      $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
-@@ -201,7 +203,7 @@
+@@ -202,7 +204,7 @@
  # better use the Autostart folder.
  
  # TODO: Use GenericConfigLocation once we depend on Qt 5.4
@@ -35,8 +35,8 @@ Index: plasma-workspace/startkde/startkde.cmake
  for prefix in `echo $scriptpath`; do
 Index: plasma-workspace/startkde/CMakeLists.txt
 ===================================================================
---- plasma-workspace.orig/startkde/CMakeLists.txt	2015-09-04 09:36:58.624473064 +0200
-+++ plasma-workspace/startkde/CMakeLists.txt	2015-09-04 09:36:58.620473223 +0200
+--- plasma-workspace.orig/startkde/CMakeLists.txt	2015-12-16 14:57:10.226533877 +0100
++++ plasma-workspace/startkde/CMakeLists.txt	2015-12-16 14:57:10.222534044 +0100
 @@ -7,6 +7,8 @@
      set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH")
  endif()

-- 
plasma-workspace packaging