snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

conky: Add upstream segfault fix

This commit is contained in:
Toyam Cox 2018-01-24 19:02:14 -05:00
parent 7ef6c783c0
commit 6864a1c14d
2 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
srcpkgs/conky/patches/455.patch Normal file
View File

@ -0,0 +1,53 @@
The below patch matches the following URL, else something is wrong.
https://github.com/brndnmtthws/conky/pull/455
Committed by Vaelatern
From b0f02c20a039f6c33dbc631102bf7d891f620bcc Mon Sep 17 00:00:00 2001
From: Brenden Matthews <brenden@diddyinc.com>
Date: Tue, 23 Jan 2018 08:04:39 -0500
Subject: [PATCH] Fix segfault when out_to_x = false.
This resolves #454.
---
src/conky.cc | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/conky.cc b/src/conky.cc
index 48256ecc..f10d08fb 100644
--- src/conky.cc
+++ src/conky.cc
@@ -2076,20 +2076,24 @@ static void main_loop(void)
sigaddset(&newmask, SIGUSR1);
#endif
+#ifdef BUILD_X11
#ifdef BUILD_XSHAPE
- /* allow only decorated windows to be given mouse input */
- int major_version, minor_version;
- if (!XShapeQueryVersion(display, &major_version, &minor_version)) {
- NORM_ERR("Input shapes are not supported");
- } else {
- if (own_window.get(*state) &&
- (own_window_type.get(*state) != TYPE_NORMAL ||
- (TEST_HINT(own_window_hints.get(*state), HINT_UNDECORATED)))) {
- XShapeCombineRectangles(display, window.window, ShapeInput, 0, 0,
- NULL, 0, ShapeSet, Unsorted);
+ if (out_to_x.get(*state)) {
+ /* allow only decorated windows to be given mouse input */
+ int major_version, minor_version;
+ if (!XShapeQueryVersion(display, &major_version, &minor_version)) {
+ NORM_ERR("Input shapes are not supported");
+ } else {
+ if (own_window.get(*state) &&
+ (own_window_type.get(*state) != TYPE_NORMAL ||
+ (TEST_HINT(own_window_hints.get(*state), HINT_UNDECORATED)))) {
+ XShapeCombineRectangles(display, window.window, ShapeInput, 0, 0,
+ NULL, 0, ShapeSet, Unsorted);
+ }
}
}
#endif /* BUILD_XSHAPE */
+#endif /* BUILD_X11 */
last_update_time = 0.0;
next_update_time = get_time() - fmod(get_time(), active_update_interval());

2
srcpkgs/conky/template
View File

@ -1,7 +1,7 @@
# Template file for 'conky'
pkgname=conky
version=1.10.7
revision=1
revision=2
build_style=cmake
configure_args="
-DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON -DDOC_PATH=share/${pkgname}