From owner-svn-ports-all@freebsd.org Wed Jan 31 12:46:45 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7AEC8EC93C5; Wed, 31 Jan 2018 12:46:45 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2C2F38220C; Wed, 31 Jan 2018 12:46:45 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0824A261A9; Wed, 31 Jan 2018 12:46:45 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0VCki71076390; Wed, 31 Jan 2018 12:46:44 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0VCkitZ076388; Wed, 31 Jan 2018 12:46:44 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201801311246.w0VCkitZ076388@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Wed, 31 Jan 2018 12:46:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460469 - in head/sysutils/conky: . files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in head/sysutils/conky: . files X-SVN-Commit-Revision: 460469 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Jan 2018 12:46:45 -0000 Author: madpilot Date: Wed Jan 31 12:46:44 2018 New Revision: 460469 URL: https://svnweb.freebsd.org/changeset/ports/460469 Log: Import upstream patch to fix runtime crash. PR: 225523 Submitted by: Hatronmorus Obtained from: https://github.com/brndnmtthws/conky/commit/562c7375883445acb58388ff16d9eb126b7e12a1 Modified: head/sysutils/conky/Makefile head/sysutils/conky/files/patch-src_conky.cc Modified: head/sysutils/conky/Makefile ============================================================================== --- head/sysutils/conky/Makefile Wed Jan 31 12:23:11 2018 (r460468) +++ head/sysutils/conky/Makefile Wed Jan 31 12:46:44 2018 (r460469) @@ -3,6 +3,7 @@ PORTNAME= conky PORTVERSION= 1.10.7 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= sysutils Modified: head/sysutils/conky/files/patch-src_conky.cc ============================================================================== --- head/sysutils/conky/files/patch-src_conky.cc Wed Jan 31 12:23:11 2018 (r460468) +++ head/sysutils/conky/files/patch-src_conky.cc Wed Jan 31 12:46:44 2018 (r460469) @@ -1,6 +1,6 @@ ---- src/conky.cc.orig 2016-10-04 07:49:19 UTC +--- src/conky.cc.orig 2018-01-19 14:12:08 UTC +++ src/conky.cc -@@ -129,7 +129,7 @@ +@@ -132,7 +132,7 @@ #include #endif @@ -9,3 +9,38 @@ #include #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());