cr6git
GitHub
parent
46fa9aecf7
commit
ff1a332063
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'conky-cli'
|
||||
pkgname=conky-cli
|
||||
version=1.10.7
|
||||
version=1.10.8
|
||||
revision=1
|
||||
wrksrc="${pkgname/-cli/}-${version}"
|
||||
build_style=cmake
|
||||
|
|
@ -9,16 +9,16 @@ configure_args="
|
|||
-DBUILD_X11=OFF -DBUILD_CURL=ON -DBUILD_XDBE=OFF -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=OFF
|
||||
-DBUILD_WEATHER_XOAP=OFF -DBUILD_IMLIB2=OFF -DBUILD_WLAN=ON"
|
||||
hostmakedepends="libtool pkg-config docbook2x man-db git"
|
||||
makedepends="lua-devel ncurses-devel wireless_tools-devel libglib-devel libcurl-devel libxml2-devel"
|
||||
makedepends="libcurl-devel libglib-devel libxml2-devel lua-devel wireless_tools-devel"
|
||||
conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
|
||||
provides="conky-${version}_${revision}"
|
||||
conflicts="conky>=0"
|
||||
short_desc="Conky command line without X11"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
license="BSD, GPL-3"
|
||||
homepage="http://conky.sourceforge.net/"
|
||||
license="BSD-3-Clause, GPL-3.0-or-later"
|
||||
homepage="https://github.com/brndnmtthws/conky"
|
||||
distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz"
|
||||
checksum=23bb9609c522f248cba287146943a872cc045b45cecfa5668bca76e95ecc06ac
|
||||
checksum=2ebd655a27c816bd613538b71d4ec1c096252cb522feaa05f64781dcedea8857
|
||||
|
||||
post_extract() {
|
||||
sed -i -e '1iinclude(CheckIncludeFile)' \
|
||||
|
|
|
|||
|
|
@ -1,53 +0,0 @@
|
|||
The below patch matches the following URL, else something is wrong.
|
||||
https://github.com/brndnmtthws/conky/pull/455
|
||||
Committed by Vaelatern
|
||||
|
||||
From b0f02c20a039f6c33dbc631102bf7d891f620bcc Mon Sep 17 00:00:00 2001
|
||||
From: Brenden Matthews <brenden@diddyinc.com>
|
||||
Date: Tue, 23 Jan 2018 08:04:39 -0500
|
||||
Subject: [PATCH] Fix segfault when out_to_x = false.
|
||||
|
||||
This resolves #454.
|
||||
---
|
||||
src/conky.cc | 24 ++++++++++++++----------
|
||||
1 file changed, 14 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/conky.cc b/src/conky.cc
|
||||
index 48256ecc..f10d08fb 100644
|
||||
--- src/conky.cc
|
||||
+++ 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());
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'conky'
|
||||
pkgname=conky
|
||||
version=1.10.7
|
||||
revision=2
|
||||
version=1.10.8
|
||||
revision=1
|
||||
build_style=cmake
|
||||
configure_args="
|
||||
-DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON -DDOC_PATH=share/${pkgname}
|
||||
|
|
@ -9,28 +9,15 @@ configure_args="
|
|||
-DBUILD_WEATHER_XOAP=ON -DBUILD_IMLIB2=ON -DBUILD_WLAN=ON -DBUILD_LUA_CAIRO=ON
|
||||
-DBUILD_LUA_IMLIB2=ON -DBUILD_LUA_RSVG=ON -DBUILD_XSHAPE=ON"
|
||||
hostmakedepends="libtool pkg-config docbook2x man-db git toluapp"
|
||||
makedepends="lua51-devel toluapp-devel librsvg-devel alsa-lib-devel
|
||||
libxml2-devel libXft-devel libXdamage-devel libXinerama-devel imlib2-devel
|
||||
wireless_tools-devel libcurl-devel ncurses-devel"
|
||||
makedepends="alsa-lib-devel imlib2-devel libXdamage-devel libXft-devel libXinerama-devel
|
||||
libcurl-devel librsvg-devel lua51-devel toluapp-devel wireless_tools-devel"
|
||||
conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
|
||||
short_desc="Lightweight system monitor for X"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
license="BSD, GPL-3"
|
||||
homepage="http://conky.sourceforge.net/"
|
||||
distfiles="https://github.com/brndnmtthws/${pkgname}/archive/v${version}.tar.gz"
|
||||
checksum=23bb9609c522f248cba287146943a872cc045b45cecfa5668bca76e95ecc06ac
|
||||
|
||||
post_extract() {
|
||||
sed -i \
|
||||
-e '1iinclude(CheckIncludeFile)' \
|
||||
-e 's/(LUA REQUIRED lua5.2 lua-5.2 lua>=5.1 lua5.1 lua-5.1)/(LUA REQUIRED lua5.1 lua-5.1)/g' \
|
||||
-e 's/(APP_TOLUA NAMES tolua++ tolua++5.1 tolua++-5.1)/(APP_TOLUA NAMES toluapp)/g' \
|
||||
-e 's/(FATAL_ERROR "Unable to find program '\''tolua++'\''")/(FATAL_ERROR "Unable to find program '\''toluapp'\''")/g' \
|
||||
-e 's/(TOLUA_LIBS NAMES tolua++ tolua++5.1 tolua++-5.1)/(TOLUA_LIBS NAMES toluapp)/g' \
|
||||
-e 's/(FATAL_ERROR "Unable to find tolua++ library")/(FATAL_ERROR "Unable to find toluapp library")/g' \
|
||||
-e 's/NCURSES ncurses/NCURSES ncursesw/g' \
|
||||
cmake/ConkyPlatformChecks.cmake
|
||||
}
|
||||
license="BSD-3-Clause, GPL-3.0-or-later"
|
||||
homepage="https://github.com/brndnmtthws/conky"
|
||||
distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz"
|
||||
checksum=2ebd655a27c816bd613538b71d4ec1c096252cb522feaa05f64781dcedea8857
|
||||
|
||||
do_install() {
|
||||
make -C build DESTDIR=${DESTDIR} install
|
||||
|
|
|
|||
Loading…
Reference in New Issue