Date: Sunday, January 21, 2018 @ 00:55:44
Author: bisson
Revision: 315190
archrelease: copy trunk to extra-x86_64
Added:
conky/repos/extra-x86_64/PKGBUILD
(from rev 315189, conky/trunk/PKGBUILD)
conky/repos/extra-x86_64/lua53.patch
(from rev 315189, conky/trunk/lua53.patch)
conky/repos/extra-x86_64/mouse.patch
(from rev 315189, conky/trunk/mouse.patch)
Deleted:
conky/repos/extra-x86_64/PKGBUILD
conky/repos/extra-x86_64/gcc7.patch
conky/repos/extra-x86_64/lua53.patch
-------------+
PKGBUILD | 118 +++++++++++++++++++++++++++++-----------------------------
gcc7.patch | 11 -----
lua53.patch | 92 ++++++++++++++++++++++-----------------------
mouse.patch | 86 ++++++++++++++++++++++++++++++++++++++++++
4 files changed, 191 insertions(+), 116 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-21 00:54:54 UTC (rev 315189)
+++ PKGBUILD 2018-01-21 00:55:44 UTC (rev 315190)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <[email protected]>
-# Contributor: Giovanni Scafora <[email protected]>
-# Contributor: James Rayner <[email protected]>
-# Contributor: Partha Chowdhury <[email protected]>
-
-pkgname=conky
-pkgver=1.10.6
-pkgrel=3
-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')
-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')
-
-options=('!strip' 'debug')
-
-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
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- cmake \
- -D CMAKE_BUILD_TYPE=Release \
- -D MAINTAINER_MODE=ON \
- -D BUILD_WLAN=ON \
- -D BUILD_XDBE=ON \
- -D BUILD_IMLIB2=ON \
- -D BUILD_CURL=ON \
- -D BUILD_RSS=ON \
- -D BUILD_WEATHER_METAR=ON \
- -D BUILD_WEATHER_XOAP=ON \
- -D BUILD_PULSEAUDIO=ON \
- -D BUILD_JOURNAL=ON \
- -D CMAKE_INSTALL_PREFIX=/usr \
- .
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- install -Dm644 extras/vim/syntax/conkyrc.vim
"${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim
- install -Dm644 extras/vim/ftdetect/conkyrc.vim
"${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim
-}
Copied: conky/repos/extra-x86_64/PKGBUILD (from rev 315189,
conky/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-01-21 00:55:44 UTC (rev 315190)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Gaetan Bisson <[email protected]>
+# Contributor: Giovanni Scafora <[email protected]>
+# Contributor: James Rayner <[email protected]>
+# Contributor: Partha Chowdhury <[email protected]>
+
+pkgname=conky
+pkgver=1.10.7
+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')
+depends=('glib2' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft'
+ 'imlib2' 'libxml2' 'libpulse')
+source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz";
+ 'mouse.patch'
+ 'lua53.patch')
+sha256sums=('23bb9609c522f248cba287146943a872cc045b45cecfa5668bca76e95ecc06ac'
+ '9c323485e130d253b9e68af4880eed6bcc4ce8866b216224aaf550a31f4bb63c'
+ '16516bdae848f85be949185746418fa5810d426e1f25b6dbbcefdbf4a0b8e6f3')
+
+options=('!strip' 'debug')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../lua53.patch # lua_gettable returns an int in lua-5.3
+ patch -p1 -i ../mouse.patch --reverse #
https://github.com/brndnmtthws/conky/issues/454
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ cmake \
+ -D CMAKE_BUILD_TYPE=Release \
+ -D MAINTAINER_MODE=ON \
+ -D BUILD_WLAN=ON \
+ -D BUILD_XDBE=ON \
+ -D BUILD_IMLIB2=ON \
+ -D BUILD_CURL=ON \
+ -D BUILD_RSS=ON \
+ -D BUILD_WEATHER_METAR=ON \
+ -D BUILD_WEATHER_XOAP=ON \
+ -D BUILD_PULSEAUDIO=ON \
+ -D BUILD_JOURNAL=ON \
+ -D CMAKE_INSTALL_PREFIX=/usr \
+ .
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -Dm644 extras/vim/syntax/conkyrc.vim
"${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim
+ install -Dm644 extras/vim/ftdetect/conkyrc.vim
"${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim
+}
Deleted: gcc7.patch
===================================================================
--- gcc7.patch 2018-01-21 00:54:54 UTC (rev 315189)
+++ gcc7.patch 2018-01-21 00:55:44 UTC (rev 315190)
@@ -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>
-
Deleted: lua53.patch
===================================================================
--- lua53.patch 2018-01-21 00:54:54 UTC (rev 315189)
+++ lua53.patch 2018-01-21 00:55:44 UTC (rev 315190)
@@ -1,46 +0,0 @@
-diff -aur old/src/luamm.cc new/src/luamm.cc
---- old/src/luamm.cc 2015-06-28 16:38:47.793615922 -1000
-+++ new/src/luamm.cc 2015-06-29 09:05:44.646667638 -1000
-@@ -165,7 +165,14 @@
- }
-
- template<void (*misc)(lua_State *, int), int nresults>
-- int safe_misc_trampoline(lua_State *l)
-+ int safe_misc_trampoline_set(lua_State *l)
-+ {
-+ misc(l, 1);
-+ return nresults;
-+ }
-+
-+ template<int (*misc)(lua_State *, int), int nresults>
-+ int safe_misc_trampoline_get(lua_State *l)
- {
- misc(l, 1);
- return nresults;
-@@ -326,7 +333,7 @@
- if( rawequal(index1, index2) )
- return true;
-
-- return safe_compare(&safe_compare_trampoline<lua_equal>,
index1, index2);
-+ return safe_compare(&safe_compare_trampoline<&lua_equal>,
index1, index2);
- }
-
- int state::gc(int what, int data)
-@@ -367,7 +374,7 @@
- checkstack(2);
- pushvalue(index);
- insert(-2);
-- lua_pushcfunction(cobj.get(),
(&safe_misc_trampoline<&lua_gettable, 1>));
-+ lua_pushcfunction(cobj.get(),
(&safe_misc_trampoline_get<&lua_gettable, 1>));
- insert(-3);
- call(2, 1, 0);
- }
-@@ -492,7 +499,7 @@
- checkstack(2);
- pushvalue(index);
- insert(-3);
-- lua_pushcfunction(cobj.get(),
(&safe_misc_trampoline<&lua_settable, 0>));
-+ lua_pushcfunction(cobj.get(),
(&safe_misc_trampoline_set<&lua_settable, 0>));
- insert(-4);
- call(3, 0, 0);
- }
Copied: conky/repos/extra-x86_64/lua53.patch (from rev 315189,
conky/trunk/lua53.patch)
===================================================================
--- lua53.patch (rev 0)
+++ lua53.patch 2018-01-21 00:55:44 UTC (rev 315190)
@@ -0,0 +1,46 @@
+diff -aur old/src/luamm.cc new/src/luamm.cc
+--- old/src/luamm.cc 2015-06-28 16:38:47.793615922 -1000
++++ new/src/luamm.cc 2015-06-29 09:05:44.646667638 -1000
+@@ -165,7 +165,14 @@
+ }
+
+ template<void (*misc)(lua_State *, int), int nresults>
+- int safe_misc_trampoline(lua_State *l)
++ int safe_misc_trampoline_set(lua_State *l)
++ {
++ misc(l, 1);
++ return nresults;
++ }
++
++ template<int (*misc)(lua_State *, int), int nresults>
++ int safe_misc_trampoline_get(lua_State *l)
+ {
+ misc(l, 1);
+ return nresults;
+@@ -326,7 +333,7 @@
+ if( rawequal(index1, index2) )
+ return true;
+
+- return safe_compare(&safe_compare_trampoline<lua_equal>,
index1, index2);
++ return safe_compare(&safe_compare_trampoline<&lua_equal>,
index1, index2);
+ }
+
+ int state::gc(int what, int data)
+@@ -367,7 +374,7 @@
+ checkstack(2);
+ pushvalue(index);
+ insert(-2);
+- lua_pushcfunction(cobj.get(),
(&safe_misc_trampoline<&lua_gettable, 1>));
++ lua_pushcfunction(cobj.get(),
(&safe_misc_trampoline_get<&lua_gettable, 1>));
+ insert(-3);
+ call(2, 1, 0);
+ }
+@@ -492,7 +499,7 @@
+ checkstack(2);
+ pushvalue(index);
+ insert(-3);
+- lua_pushcfunction(cobj.get(),
(&safe_misc_trampoline<&lua_settable, 0>));
++ lua_pushcfunction(cobj.get(),
(&safe_misc_trampoline_set<&lua_settable, 0>));
+ insert(-4);
+ call(3, 0, 0);
+ }
Copied: conky/repos/extra-x86_64/mouse.patch (from rev 315189,
conky/trunk/mouse.patch)
===================================================================
--- mouse.patch (rev 0)
+++ mouse.patch 2018-01-21 00:55:44 UTC (rev 315190)
@@ -0,0 +1,86 @@
+From d97f4dfd8a4f395ef65abfd67d5a758aadb46042 Mon Sep 17 00:00:00 2001
+From: Alexey Korop <[email protected]>
+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 {
