kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update conky to 1.10.8

Browse source 
- Remove local patch included upstream
This commit is contained in:
Guido Falsi 2018-02-09 20:25:35 +00:00
parent 0c9a140307
commit b587ce3502
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=461335
3 changed files with 5 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sysutils/conky/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= conky
PORTVERSION= 1.10.7
PORTREVISION= 1
PORTVERSION= 1.10.8
DISTVERSIONPREFIX= v
CATEGORIES= sysutils

6
sysutils/conky/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1516559609
SHA256 (brndnmtthws-conky-v1.10.7_GH0.tar.gz) = 23bb9609c522f248cba287146943a872cc045b45cecfa5668bca76e95ecc06ac
SIZE (brndnmtthws-conky-v1.10.7_GH0.tar.gz) = 371881
TIMESTAMP = 1518106982
SHA256 (brndnmtthws-conky-v1.10.8_GH0.tar.gz) = 2ebd655a27c816bd613538b71d4ec1c096252cb522feaa05f64781dcedea8857
SIZE (brndnmtthws-conky-v1.10.8_GH0.tar.gz) = 373075

37
sysutils/conky/files/patch-src_conky.cc
View file

@ -1,4 +1,4 @@
--- src/conky.cc.orig 2018-01-19 14:12:08 UTC
--- src/conky.cc.orig 2018-02-07 14:16:39 UTC
+++ src/conky.cc
@@ -132,7 +132,7 @@
#include <microhttpd.h>
@ -9,38 +9,3 @@
#include <bsd/bsd.h>
#endif
@@ -2073,20 +2073,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());