Date: Thursday, February 15, 2018 @ 00:06:14 Author: bisson Revision: 317071
upstream update Modified: conky/trunk/PKGBUILD Deleted: conky/trunk/out_to_x.patch ----------------+ PKGBUILD | 11 ++++------- out_to_x.patch | 48 ------------------------------------------------ 2 files changed, 4 insertions(+), 55 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-02-14 23:57:00 UTC (rev 317070) +++ PKGBUILD 2018-02-15 00:06:14 UTC (rev 317071) @@ -5,20 +5,18 @@ # Contributor: Partha Chowdhury <kira.lau...@gmail.com> pkgname=conky -pkgver=1.10.7 -pkgrel=2 +pkgver=1.10.8 +pkgrel=1 pkgdesc='Lightweight system monitor for X' url='https://github.com/brndnmtthws/conky' license=('BSD' 'GPL') arch=('x86_64') -makedepends=('cmake' 'docbook2x' 'docbook-xml' 'man-db' 'git') +makedepends=('cmake' 'docbook2x' 'docbook-xsl' 'man-db' 'git') depends=('glib2' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft' 'imlib2' 'libxml2' 'libpulse') source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz"; - 'out_to_x.patch' 'lua53.patch') -sha256sums=('23bb9609c522f248cba287146943a872cc045b45cecfa5668bca76e95ecc06ac' - '0bf5851f9b7a4c8c40970a658625a72969f1f0b205c61ce2fc5295ebcc9ca847' +sha256sums=('2ebd655a27c816bd613538b71d4ec1c096252cb522feaa05f64781dcedea8857' '16516bdae848f85be949185746418fa5810d426e1f25b6dbbcefdbf4a0b8e6f3') options=('!strip' 'debug') @@ -26,7 +24,6 @@ prepare() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../lua53.patch # lua_gettable returns an int in lua-5.3 - patch -p1 -i ../out_to_x.patch } build() { Deleted: out_to_x.patch =================================================================== --- out_to_x.patch 2018-02-14 23:57:00 UTC (rev 317070) +++ out_to_x.patch 2018-02-15 00:06:14 UTC (rev 317071) @@ -1,48 +0,0 @@ -commit 562c7375883445acb58388ff16d9eb126b7e12a1 -Author: Brenden Matthews <bren...@diddyinc.com> -Date: Tue Jan 23 13:52:11 2018 -0500 - - Fix segfault when out_to_x = false. (#455) - - This resolves #454. - -diff --git a/src/conky.cc b/src/conky.cc -index 48256ecc..f10d08fb 100644 ---- a/src/conky.cc -+++ b/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()); -
