Date: Tuesday, March 17, 2015 @ 06:08:18 Author: bisson Revision: 233962
fix FS#44187 Added: conky/trunk/argb.patch Modified: conky/trunk/PKGBUILD ------------+ PKGBUILD | 13 ++++++++++--- argb.patch | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-03-16 22:23:47 UTC (rev 233961) +++ PKGBUILD 2015-03-17 05:08:18 UTC (rev 233962) @@ -6,7 +6,7 @@ pkgname=conky pkgver=1.9.0 -pkgrel=4 +pkgrel=5 pkgdesc='Lightweight system monitor for X' url='http://conky.sourceforge.net/' license=('BSD' 'GPL') @@ -13,12 +13,19 @@ arch=('i686' 'x86_64') makedepends=('docbook2x') depends=('glib2' 'curl' 'lua' 'wireless_tools' 'libxml2' 'libxft' 'libxdamage' 'imlib2') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz";) -sha1sums=('a8d26d002370c9b877ae77ad3a3bbd2566b38e5d') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"; + 'argb.patch') +sha1sums=('a8d26d002370c9b877ae77ad3a3bbd2566b38e5d' + '9f3d73695c11f88ea7a212acdd746a78f9e51168') backup=('etc/conky/'conky{,_no_x11}.conf) options=('!emptydirs') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i ../argb.patch +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" Added: argb.patch =================================================================== --- argb.patch (rev 0) +++ argb.patch 2015-03-17 05:08:18 UTC (rev 233962) @@ -0,0 +1,51 @@ +diff -Naur src/conky.c src/conky.c +--- src/conky.c 2015-03-11 22:02:31.000000000 -0400 ++++ src/conky.c 2015-03-11 22:00:06.922599010 -0400 +@@ -5064,6 +5064,11 @@ + #ifdef USE_ARGB + CONF("own_window_argb_visual") { + use_argb_visual = string_to_bool(value); ++#ifdef IMLIB2 ++ /* disable blending to the empty window to avoid image ++ * opacity problems */ ++ cimlib_set_blend_drawable(0); ++#endif + } + CONF("own_window_argb_value") { + own_window_argb_value = strtol(value, 0, 0); +diff -Naur src/imlib2.c src/imlib2.c +--- src/imlib2.c 2012-05-03 17:08:27.000000000 -0400 ++++ src/imlib2.c 2015-03-11 22:01:36.538530347 -0400 +@@ -59,6 +59,9 @@ + + #define DEFAULT_IMLIB2_CACHE_SIZE 4096 * 1024 /* default cache size for loaded images */ + ++/* whether to blend images to drawable or not */ ++static int cimlib_blend_drawable = 1; ++ + void cimlib_set_cache_size(long size) + { + imlib_set_cache_size(size); +@@ -74,6 +77,11 @@ + } + } + ++void cimlib_set_blend_drawable(int blend) ++{ ++ cimlib_blend_drawable = blend; ++} ++ + void cimlib_cleanup(void) + { + struct image_list_s *cur = image_list_start, *last = NULL; +@@ -247,8 +255,8 @@ + /* clear our buffer */ + imlib_context_set_image(buffer); + imlib_image_clear(); +- /* we can blend stuff now */ +- imlib_context_set_blend(1); ++ /* we can blend stuff now if enabled */ ++ imlib_context_set_blend(cimlib_blend_drawable); + /* turn alpha channel on */ + imlib_image_set_has_alpha(1); +
