From owner-svn-ports-head@freebsd.org Fri Feb 9 20:25:36 2018 Return-Path: Delivered-To: svn-ports-head@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 D9DA2F215B2; Fri, 9 Feb 2018 20:25:35 +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 8CF6C77783; Fri, 9 Feb 2018 20:25:35 +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 87EEB1AC4; Fri, 9 Feb 2018 20:25:35 +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 w19KPZr7059326; Fri, 9 Feb 2018 20:25:35 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w19KPZkt059323; Fri, 9 Feb 2018 20:25:35 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201802092025.w19KPZkt059323@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Fri, 9 Feb 2018 20:25:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r461335 - 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: 461335 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Feb 2018 20:25:36 -0000 Author: madpilot Date: Fri Feb 9 20:25:35 2018 New Revision: 461335 URL: https://svnweb.freebsd.org/changeset/ports/461335 Log: - Update conky to 1.10.8 - Remove local patch included upstream Modified: head/sysutils/conky/Makefile head/sysutils/conky/distinfo head/sysutils/conky/files/patch-src_conky.cc Modified: head/sysutils/conky/Makefile ============================================================================== --- head/sysutils/conky/Makefile Fri Feb 9 20:24:28 2018 (r461334) +++ head/sysutils/conky/Makefile Fri Feb 9 20:25:35 2018 (r461335) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= conky -PORTVERSION= 1.10.7 -PORTREVISION= 1 +PORTVERSION= 1.10.8 DISTVERSIONPREFIX= v CATEGORIES= sysutils Modified: head/sysutils/conky/distinfo ============================================================================== --- head/sysutils/conky/distinfo Fri Feb 9 20:24:28 2018 (r461334) +++ head/sysutils/conky/distinfo Fri Feb 9 20:25:35 2018 (r461335) @@ -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 Modified: head/sysutils/conky/files/patch-src_conky.cc ============================================================================== --- head/sysutils/conky/files/patch-src_conky.cc Fri Feb 9 20:24:28 2018 (r461334) +++ head/sysutils/conky/files/patch-src_conky.cc Fri Feb 9 20:25:35 2018 (r461335) @@ -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 @@ -9,38 +9,3 @@ #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());