[SCM] plasma-workspace packaging branch, master, updated. debian/5.3.2-4-14-gf88000d
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Sep 4 12:16:51 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-workspace.git;a=commitdiff;h=d96d0e6
The following commit has been merged in the master branch:
commit d96d0e6b9caa62ffe40c31205c29d519cb88d8db
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Fri Sep 4 09:42:52 2015 +0200
Refresh patches.
---
debian/changelog | 2 +
debian/patches/check_signals_defined.diff | 34 ----------
debian/patches/fix_crash_on_shutdown.patch | 25 -------
debian/patches/install_missing_header | 6 +-
debian/patches/kubuntu_startkde-qtpath.diff | 23 ++-----
...place_reference_to_license_with_the_bsd_license | 78 ----------------------
debian/patches/series | 3 -
7 files changed, 12 insertions(+), 159 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ea83d29..22c6f73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
plasma-workspace (4:5.4.0-1~) UNRELEASED; urgency=medium
* New upstream release (5.4.0).
+ * Refresh patches.
+ * Remove upstream applied patches.
-- Maximiliano Curia <maxy at debian.org> Wed, 02 Sep 2015 23:54:38 +0200
diff --git a/debian/patches/check_signals_defined.diff b/debian/patches/check_signals_defined.diff
deleted file mode 100644
index 66592a6..0000000
--- a/debian/patches/check_signals_defined.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Test if signals are defined before using them.
-Author: Felix Geyer <fgeyer at debian.org>
-Forwarded: https://git.reviewboard.kde.org/r/124395/
-
---- plasma-workspace-5.3.2.orig/ksmserver/screenlocker/greeter/autotests/killtest.cpp
-+++ plasma-workspace-5.3.2/ksmserver/screenlocker/greeter/autotests/killtest.cpp
-@@ -76,9 +76,13 @@ void KillTest::testKill_data()
- //QTest::newRow("SIGPWR") << SIGPWR;
- QTest::newRow("SIGSYS") << SIGSYS << true << QProcess::CrashExit;
- #ifdef Q_OS_LINUX
-+#ifdef SIGUNUSED
- QTest::newRow("SIGUNUSED") << SIGUNUSED << true << QProcess::CrashExit;
-+#endif
-+#ifdef SIGSTKFLT
- QTest::newRow("SIGSTKFLT") << SIGSTKFLT << true << QProcess::CrashExit;
- #endif
-+#endif
- }
-
- void KillTest::testKill()
-@@ -148,9 +152,13 @@ void KillTest::testImmediateKill_data()
- //QTest::newRow("SIGPWR") << SIGPWR;
- QTest::newRow("SIGSYS") << SIGSYS;
- #ifdef Q_OS_LINUX
-+#ifdef SIGSTKFLT
- QTest::newRow("SIGSTKFLT") << SIGSTKFLT;
-+#endif
-+#ifdef SIGUNUSED
- QTest::newRow("SIGUNUSED") << SIGUNUSED;
- #endif
-+#endif
- }
-
- void KillTest::testImmediateKill()
diff --git a/debian/patches/fix_crash_on_shutdown.patch b/debian/patches/fix_crash_on_shutdown.patch
deleted file mode 100644
index fa1f364..0000000
--- a/debian/patches/fix_crash_on_shutdown.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Kai Uwe Broulik <kde at privat.broulik.de>
-Date: Sat, 11 Jul 2015 00:06:52 +0000
-Subject: Clear view lists in destructor
-
-This fixes a crash on shutdown when it has already deleted its
-views but someone calls into availableScreenRect
-
-Origin: upstream, http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=4942878b67c6a5ae82df11264eb751944cea4a69
-Bug: https://bugs.kde.org/show_bug.cgi?id=348511
-Bug-Debian: http://bugs.debian.org/793513
-
---- a/shell/shellcorona.cpp
-+++ b/shell/shellcorona.cpp
-@@ -196,8 +196,10 @@
- ShellCorona::~ShellCorona()
- {
- qDeleteAll(m_views);
-+ m_views.clear();
- qDeleteAll(containments());
- qDeleteAll(m_panelViews);
-+ m_panelViews.clear();
- }
-
- KPackage::Package ShellCorona::lookAndFeelPackage()
-
diff --git a/debian/patches/install_missing_header b/debian/patches/install_missing_header
index be17fb1..0d32fd7 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-07-08 10:13:42.967795813 +0200
-+++ plasma-workspace/CMakeLists.txt 2015-07-08 10:13:42.967795813 +0200
-@@ -106,7 +106,10 @@
+--- 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 @@
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 0266ff5..8a67a3d 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-05-18 11:09:54.324595359 +0200
-+++ plasma-workspace/startkde/startkde.cmake 2015-05-18 11:09:54.276597285 +0200
+--- 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
@@ -3,6 +3,8 @@
# DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
#
@@ -24,7 +24,7 @@ Index: plasma-workspace/startkde/startkde.cmake
qdbus=$qbindir/qdbus
case $PATH in
$bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
-@@ -206,7 +208,7 @@
+@@ -201,7 +203,7 @@
# better use the Autostart folder.
# TODO: Use GenericConfigLocation once we depend on Qt 5.4
@@ -33,19 +33,10 @@ Index: plasma-workspace/startkde/startkde.cmake
# Add /env/ to the directory to locate the scripts to be sourced
for prefix in `echo $scriptpath`; do
-@@ -216,7 +218,7 @@
- done
-
- # Set the path for Qt plugins provided by KDE
--QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir`
-+QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`${QTPATHS} --plugin-dir`
- # TODO: Do we really need this?
- QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
- export QT_PLUGIN_PATH
Index: plasma-workspace/startkde/CMakeLists.txt
===================================================================
---- plasma-workspace.orig/startkde/CMakeLists.txt 2015-05-18 11:09:54.324595359 +0200
-+++ plasma-workspace/startkde/CMakeLists.txt 2015-05-18 11:09:54.304596162 +0200
+--- 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
@@ -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()
@@ -53,5 +44,5 @@ Index: plasma-workspace/startkde/CMakeLists.txt
+execute_process( COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH OUTPUT_VARIABLE DEB_HOST_MULTIARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+
configure_file(startkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/startkde @ONLY)
-
- if(NOT WIN32)
+ configure_file(startplasmacompositor.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasmacompositor @ONLY)
+ configure_file(startplasma.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasma @ONLY)
diff --git a/debian/patches/plasma-workspace-upstream-replace_reference_to_license_with_the_bsd_license b/debian/patches/plasma-workspace-upstream-replace_reference_to_license_with_the_bsd_license
deleted file mode 100644
index 69e2731..0000000
--- a/debian/patches/plasma-workspace-upstream-replace_reference_to_license_with_the_bsd_license
+++ /dev/null
@@ -1,78 +0,0 @@
-commit 6882f14e7b3175a3db66436a9a31c0c7470af9dd
-Author: Jonathan Riddell <jr at jriddell.org>
-Date: Thu Apr 23 16:10:01 2015 +0200
-
- replace reference to licence with the bsd licence as the reference often goes missing
-
-diff --git a/cmake/FindQalculate.cmake b/cmake/FindQalculate.cmake
-index 707a9f7..72d65bc 100644
---- a/cmake/FindQalculate.cmake
-+++ b/cmake/FindQalculate.cmake
-@@ -12,8 +12,29 @@
- #
- # Copyright (c) 2007, Vladimir Kuznetsov, <ks.vladimir at gmail.com>
- #
--# Redistribution and use is allowed according to the terms of the BSD license.
--# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions
-+# are met:
-+# 1. Redistributions of source code must retain the above copyright
-+# notice, this list of conditions and the following disclaimer.
-+# 2. Redistributions in binary form must reproduce the above copyright
-+# notice, this list of conditions and the following disclaimer in the
-+# documentation and/or other materials provided with the distribution.
-+# 3. Neither the name of the University nor the names of its contributors
-+# may be used to endorse or promote products derived from this software
-+# without specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+# SUCH DAMAGE.
-
- if(QALCULATE_CFLAGS AND QALCULATE_LIBRARIES)
-
-diff --git a/cmake/MacroPushRequiredVars.cmake b/cmake/MacroPushRequiredVars.cmake
-index 650b566..54c2b3a 100644
---- a/cmake/MacroPushRequiredVars.cmake
-+++ b/cmake/MacroPushRequiredVars.cmake
-@@ -13,8 +13,29 @@
-
- # Copyright (c) 2006, Alexander Neundorf, <neundorf at kde.org>
- #
--# Redistribution and use is allowed according to the terms of the BSD license.
--# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions
-+# are met:
-+# 1. Redistributions of source code must retain the above copyright
-+# notice, this list of conditions and the following disclaimer.
-+# 2. Redistributions in binary form must reproduce the above copyright
-+# notice, this list of conditions and the following disclaimer in the
-+# documentation and/or other materials provided with the distribution.
-+# 3. Neither the name of the University nor the names of its contributors
-+# may be used to endorse or promote products derived from this software
-+# without specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+# SUCH DAMAGE.
-
- MACRO(MACRO_PUSH_REQUIRED_VARS)
-
diff --git a/debian/patches/series b/debian/patches/series
index d9a16a6..92b14d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
kubuntu_startkde-qtpath.diff
install_missing_header
-plasma-workspace-upstream-replace_reference_to_license_with_the_bsd_license
-check_signals_defined.diff
plasmoid_creation_fix_null_check.patch
-fix_crash_on_shutdown.patch
--
plasma-workspace packaging
More information about the pkg-kde-commits
mailing list