[arch-commits] Commit in conky/trunk (PKGBUILD gcc7.patch mouse.patch)

[Gaëtan Bisson]

    Date: Sunday, January 21, 2018 @ 00:54:54
  Author: bisson
Revision: 315189

upstream update

Added:
  conky/trunk/mouse.patch
Modified:
  conky/trunk/PKGBUILD
Deleted:
  conky/trunk/gcc7.patch

-------------+
 PKGBUILD    |   16 +++++-----
 gcc7.patch  |   11 -------
 mouse.patch |   86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 94 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-20 22:19:18 UTC (rev 315188)
+++ PKGBUILD	2018-01-21 00:54:54 UTC (rev 315189)
@@ -5,8 +5,8 @@
 # Contributor: Partha Chowdhury <kira.laucas at gmail.com>
 
 pkgname=conky
-pkgver=1.10.6
-pkgrel=3
+pkgver=1.10.7
+pkgrel=1
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
 license=('BSD' 'GPL')
@@ -15,11 +15,11 @@
 depends=('glib2' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft'
          'imlib2' 'libxml2' 'libpulse')
 source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz"
-        'lua53.patch'
-        'gcc7.patch')
-sha256sums=('4c80982960b2a72e3e33cef33347c97b9239ed110d9584da4e7f17f28faf60ca'
-            '16516bdae848f85be949185746418fa5810d426e1f25b6dbbcefdbf4a0b8e6f3'
-            '1f54b8c570c43a34ede9b3cb25848bd80d27ebc68cf973c082937f9b3fc1a411')
+        'mouse.patch'
+        'lua53.patch')
+sha256sums=('23bb9609c522f248cba287146943a872cc045b45cecfa5668bca76e95ecc06ac'
+            '9c323485e130d253b9e68af4880eed6bcc4ce8866b216224aaf550a31f4bb63c'
+            '16516bdae848f85be949185746418fa5810d426e1f25b6dbbcefdbf4a0b8e6f3')
 
 options=('!strip' 'debug')
 
@@ -26,7 +26,7 @@
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	patch -p1 -i ../lua53.patch # lua_gettable returns an int in lua-5.3
-	patch -p1 -i ../gcc7.patch # FS#54223
+	patch -p1 -i ../mouse.patch --reverse # https://github.com/brndnmtthws/conky/issues/454
 }
 
 build() {

Deleted: gcc7.patch
===================================================================
--- gcc7.patch	2018-01-20 22:19:18 UTC (rev 315188)
+++ gcc7.patch	2018-01-21 00:54:54 UTC (rev 315189)
@@ -1,11 +0,0 @@
-diff -Naur old/src/luamm.hh new/src/luamm.hh
---- old/src/luamm.hh	2016-12-04 05:13:57.000000000 -1000
-+++ new/src/luamm.hh	2017-11-21 09:11:20.993164069 -1000
-@@ -28,6 +28,7 @@
- #include <exception>
- #include <stdexcept>
- #include <string>
-+#include <functional>
- 
- #include <lua.hpp>
- 

Added: mouse.patch
===================================================================
--- mouse.patch	                        (rev 0)
+++ mouse.patch	2018-01-21 00:54:54 UTC (rev 315189)
@@ -0,0 +1,86 @@
+From d97f4dfd8a4f395ef65abfd67d5a758aadb46042 Mon Sep 17 00:00:00 2001
+From: Alexey Korop <akorop at gmail.com>
+Date: Fri, 19 Jan 2018 16:12:08 +0200
+Subject: [PATCH] Make mouse-through workable (#213)
+
+---
+ src/conky.cc | 18 ++++++++++++++++++
+ src/x11.cc   | 22 ----------------------
+ 2 files changed, 18 insertions(+), 22 deletions(-)
+
+diff --git a/src/conky.cc b/src/conky.cc
+index b483af33..7163d776 100644
+--- a/src/conky.cc
++++ b/src/conky.cc
+@@ -60,6 +60,9 @@
+ #ifdef BUILD_IMLIB2
+ #include "imlib2.h"
+ #endif /* BUILD_IMLIB2 */
++#ifdef BUILD_XSHAPE
++#include <X11/extensions/shape.h>
++#endif /* BUILD_XSHAPE */
+ #endif /* BUILD_X11 */
+ #ifdef BUILD_NCURSES
+ #include <ncurses.h>
+@@ -2070,6 +2073,21 @@ static void main_loop(void)
+ 	sigaddset(&newmask, SIGUSR1);
+ #endif
+ 
++#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);
++		}
++	}
++#endif /* BUILD_XSHAPE */
++
+ 	last_update_time = 0.0;
+ 	next_update_time = get_time() - fmod(get_time(), active_update_interval());
+ 	info.looped = 0;
+diff --git a/src/x11.cc b/src/x11.cc
+index 216fe22e..c245c25d 100644
+--- a/src/x11.cc
++++ b/src/x11.cc
+@@ -47,10 +47,6 @@
+ #ifdef BUILD_XFT
+ #include <X11/Xft/Xft.h>
+ #endif
+-#ifdef BUILD_XSHAPE
+-#include <X11/extensions/shape.h>
+-#include <X11/extensions/shapeconst.h>
+-#endif
+ #ifdef BUILD_XINERAMA
+ #include <X11/extensions/Xinerama.h>
+ #endif
+@@ -771,24 +767,6 @@ static void init_window(lua::state &l __attribute__((unused)), bool own)
+ 			/* allow decorated windows to be given input focus by WM */
+ 			wmHint.input =
+ 				TEST_HINT(hints, HINT_UNDECORATED) ? False : True;
+-#ifdef BUILD_XSHAPE
+-			if (!wmHint.input) {
+-				int event_base, error_base;
+-				if (XShapeQueryExtension(display, &event_base, &error_base)) {
+-					int major_version = 0, minor_version = 0;
+-					XShapeQueryVersion(display, &major_version, &minor_version);
+-					if ((major_version > 1) || ((major_version == 1) && (minor_version >=1))) {
+-						Region empty_region = XCreateRegion();
+-						XShapeCombineRegion(display, window.window, ShapeInput, 0, 0, empty_region, ShapeSet);
+-						XDestroyRegion(empty_region);
+-					} else {
+-						NORM_ERR("Input shapes are not supported");
+-					}
+-				} else {
+-					NORM_ERR("No shape extension found");
+-				}
+-			}
+-#endif
+ 			if (own_window_type.get(l) == TYPE_DOCK || own_window_type.get(l) == TYPE_PANEL) {
+ 				wmHint.initial_state = WithdrawnState;
+ 			} else {