[SCM] kwindowsystem packaging branch, kubuntu_unstable, updated. debian/5.9.0-1-9-g584ba3f
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Fri May 29 08:40:32 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kwindowsystem.git;a=commitdiff;h=584ba3f
The following commit has been merged in the kubuntu_unstable branch:
commit 584ba3fd1f857f348f9f2e343bd010da73651706
Author: Harald Sitter <sitter at kde.org>
Date: Fri May 29 10:40:12 2015 +0200
remove patch
the upstream code portion affected by this is gone
---
debian/patches/series | 1 -
debian/patches/test_depends_on_stack_pointer | 19 -------------------
2 files changed, 20 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d981302..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-test_depends_on_stack_pointer
diff --git a/debian/patches/test_depends_on_stack_pointer b/debian/patches/test_depends_on_stack_pointer
deleted file mode 100644
index 23fca0e..0000000
--- a/debian/patches/test_depends_on_stack_pointer
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: kwindowsystem/autotests/kwindowsystemx11test.cpp
-===================================================================
---- kwindowsystem.orig/autotests/kwindowsystemx11test.cpp 2015-03-14 12:17:52.249187796 +0100
-+++ kwindowsystem/autotests/kwindowsystemx11test.cpp 2015-03-14 19:35:10.000782148 +0100
-@@ -312,10 +312,11 @@
- continue;
- }
- if ((*it).at(0).toULongLong() == widget.winId()) {
-- const unsigned long *props = (*it).at(1).value<const unsigned long *>();
-- if (props[0] & NET::WMName) {
-+ // This was emited from a stack pointer, so not really useful
-+ // const unsigned long *props = (*it).at(1).value<const unsigned long *>();
-+ // if (props[0] & NET::WMName) {
- gotWMName = true;
-- }
-+ // }
- }
- if (gotWMName) {
- break;
--
kwindowsystem packaging
More information about the pkg-kde-commits
mailing list