summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-11-18 00:45:16 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-11-18 01:16:44 +0100
commitdd923de0e1dd632d52ebaaab703ddbbfa7e8ba21 (patch)
tree599e6273e2a6831cb0d2664d0615ab6bcf02b886 /kde-plasma
parentwww-plugins/adobe-flash: drop old (diff)
downloadgentoo-dd923de0e1dd632d52ebaaab703ddbbfa7e8ba21.tar.gz
gentoo-dd923de0e1dd632d52ebaaab703ddbbfa7e8ba21.tar.bz2
gentoo-dd923de0e1dd632d52ebaaab703ddbbfa7e8ba21.zip
kde-plasma/kwin: Initialize kcrash for xclipboardsync
Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma')
-rw-r--r--kde-plasma/kwin/files/kwin-5.14.3-kcrash-init.patch48
-rw-r--r--kde-plasma/kwin/kwin-5.14.3-r1.ebuild5
2 files changed, 51 insertions, 2 deletions
diff --git a/kde-plasma/kwin/files/kwin-5.14.3-kcrash-init.patch b/kde-plasma/kwin/files/kwin-5.14.3-kcrash-init.patch
new file mode 100644
index 000000000000..fc9c3007f840
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.14.3-kcrash-init.patch
@@ -0,0 +1,48 @@
+From aace9b1675819feab81d50f694391c7d854d9822 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Fri, 16 Nov 2018 12:50:53 +0100
+Subject: actually initialize kcrash for xclipboardsync
+
+Summary:
+to successfully use kcrash when linking with as-needed (which is a default
+flag on many linux distros) one also needs to call KCrash::initialize.
+
+https://markmail.org/thread/zv5pheijaze72bzs
+
+Test Plan: builds; correctly links kcrash
+
+Reviewers: davidedmundson
+
+Reviewed By: davidedmundson
+
+Subscribers: kwin
+
+Tags: #kwin
+
+Differential Revision: https://phabricator.kde.org/D16923
+---
+ helpers/xclipboardsync/main.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/helpers/xclipboardsync/main.cpp b/helpers/xclipboardsync/main.cpp
+index 2f06e9c..1a5e5ee 100644
+--- a/helpers/xclipboardsync/main.cpp
++++ b/helpers/xclipboardsync/main.cpp
+@@ -19,6 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *********************************************************************/
+ #include "waylandclipboard.h"
+
++#include <KCrash>
+ #include <QGuiApplication>
+
+ #include <config-kwin.h>
+@@ -40,6 +41,7 @@ int main(int argc, char *argv[])
+ argv[0], qPrintable(app.platformName()));
+ return 1;
+ }
++ KCrash::initialize();
+ new WaylandClipboard(&app);
+ return app.exec();
+ }
+--
+cgit v0.11.2
diff --git a/kde-plasma/kwin/kwin-5.14.3-r1.ebuild b/kde-plasma/kwin/kwin-5.14.3-r1.ebuild
index a2ab760c9bed..c74288ae8cb1 100644
--- a/kde-plasma/kwin/kwin-5.14.3-r1.ebuild
+++ b/kde-plasma/kwin/kwin-5.14.3-r1.ebuild
@@ -89,8 +89,9 @@ PDEPEND="
RESTRICT+=" test"
PATCHES=(
- "${FILESDIR}/${PN}-5.14.3-virtualdesktop-crash.patch"
- "${FILESDIR}/${PN}-5.14.3-resizewindows-crash.patch"
+ "${FILESDIR}/${P}-virtualdesktop-crash.patch"
+ "${FILESDIR}/${P}-resizewindows-crash.patch"
+ "${FILESDIR}/${P}-kcrash-init.patch"
)
src_prepare() {