Date: Tuesday, March 17, 2015 @ 06:09:09
  Author: bisson
Revision: 233963

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  conky/repos/extra-i686/PKGBUILD
    (from rev 233962, conky/trunk/PKGBUILD)
  conky/repos/extra-i686/PKGBUILD.cmake
    (from rev 233962, conky/trunk/PKGBUILD.cmake)
  conky/repos/extra-i686/argb.patch
    (from rev 233962, conky/trunk/argb.patch)
  conky/repos/extra-x86_64/PKGBUILD
    (from rev 233962, conky/trunk/PKGBUILD)
  conky/repos/extra-x86_64/PKGBUILD.cmake
    (from rev 233962, conky/trunk/PKGBUILD.cmake)
  conky/repos/extra-x86_64/argb.patch
    (from rev 233962, conky/trunk/argb.patch)
Deleted:
  conky/repos/extra-i686/PKGBUILD
  conky/repos/extra-i686/PKGBUILD.cmake
  conky/repos/extra-x86_64/PKGBUILD
  conky/repos/extra-x86_64/PKGBUILD.cmake

-----------------------------+
 /PKGBUILD                   |  102 ++++++++++++++++++++++++++++++++++++++++++
 /PKGBUILD.cmake             |   98 ++++++++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD         |   44 ------------------
 extra-i686/PKGBUILD.cmake   |   49 --------------------
 extra-i686/argb.patch       |   51 +++++++++++++++++++++
 extra-x86_64/PKGBUILD       |   44 ------------------
 extra-x86_64/PKGBUILD.cmake |   49 --------------------
 extra-x86_64/argb.patch     |   51 +++++++++++++++++++++
 8 files changed, 302 insertions(+), 186 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-03-17 05:08:18 UTC (rev 233962)
+++ extra-i686/PKGBUILD 2015-03-17 05:09:09 UTC (rev 233963)
@@ -1,44 +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.9.0
-pkgrel=4
-pkgdesc='Lightweight system monitor for X'
-url='http://conky.sourceforge.net/'
-license=('BSD' 'GPL')
-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')
-
-backup=('etc/conky/'conky{,_no_x11}.conf)
-options=('!emptydirs')
-
-build() {
-       cd "${srcdir}/${pkgname}-${pkgver}"
-
-       CPPFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}" ./configure \
-               --prefix=/usr \
-               --sysconfdir=/etc \
-               --enable-ibm \
-               --enable-curl \
-               --enable-rss \
-               --enable-weather-xoap \
-               --enable-imlib2 \
-               --enable-wlan \
-
-       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-i686/PKGBUILD (from rev 233962, conky/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD                         (rev 0)
+++ extra-i686/PKGBUILD 2015-03-17 05:09:09 UTC (rev 233963)
@@ -0,0 +1,51 @@
+# $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.9.0
+pkgrel=5
+pkgdesc='Lightweight system monitor for X'
+url='http://conky.sourceforge.net/'
+license=('BSD' 'GPL')
+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";
+        '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}"
+
+       CPPFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}" ./configure \
+               --prefix=/usr \
+               --sysconfdir=/etc \
+               --enable-ibm \
+               --enable-curl \
+               --enable-rss \
+               --enable-weather-xoap \
+               --enable-imlib2 \
+               --enable-wlan \
+
+       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: extra-i686/PKGBUILD.cmake
===================================================================
--- extra-i686/PKGBUILD.cmake   2015-03-17 05:08:18 UTC (rev 233962)
+++ extra-i686/PKGBUILD.cmake   2015-03-17 05:09:09 UTC (rev 233963)
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $
-# Contributor: Giovanni Scafora <[email protected]>
-# Contributor: James Rayner <[email protected]>
-# Contributor: Partha Chowdhury <[email protected]>
-# Maintainer: Gaetan Bisson <[email protected]>
-
-pkgname=conky
-pkgver=1.8.2git20111021
-pkgrel=1
-pkgdesc='Lightweight system monitor for X'
-url='http://conky.sourceforge.net/'
-license=('BSD' 'GPL')
-arch=('i686' 'x86_64')
-makedepends=('pkg-config' 'cmake' 'git' 'docbook2x')
-depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'libxdamage' 
'imlib2' 'lua')
-
-replaces=('torsmo')
-
-build() {
-       cd "${srcdir}"
-
-       cd conky && { git pull origin; cd ..; } || git clone 
git://git.omp.am/conky.git
-       rm -fr build; mkdir build; cd build
-
-       cmake \
-               -D CMAKE_BUILD_TYPE:STRING="Release" \
-               -D MAINTAINER_MODE:BOOL=ON \
-               -D BUILD_CURL:BOOL=ON \
-               -D BUILD_IMLIB2:BOOL=ON \
-               -D BUILD_LUA_IMLIB2:BOOL=OFF \
-               -D BUILD_MYSQL:BOOL=OFF \
-               -D BUILD_RSS:BOOL=ON \
-               -D BUILD_WEATHER_METAR:BOOL=ON \
-               -D BUILD_WEATHER_XOAP:BOOL=ON \
-               -D BUILD_WLAN:BOOL=ON \
-               -D CMAKE_INSTALL_PREFIX:PATH=/usr \
-               ../conky
-
-       make
-}
-
-package() {
-       cd "${srcdir}/build"
-       make DESTDIR="${pkgdir}" install
-       install -d "${pkgdir}/usr/share/licenses/${pkgname}"
-       install -m644 ../conky/{COPYING,LICENSE}* 
"${pkgdir}/usr/share/licenses/${pkgname}"
-       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-i686/PKGBUILD.cmake (from rev 233962, 
conky/trunk/PKGBUILD.cmake)
===================================================================
--- extra-i686/PKGBUILD.cmake                           (rev 0)
+++ extra-i686/PKGBUILD.cmake   2015-03-17 05:09:09 UTC (rev 233963)
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $
+# Contributor: Giovanni Scafora <[email protected]>
+# Contributor: James Rayner <[email protected]>
+# Contributor: Partha Chowdhury <[email protected]>
+# Maintainer: Gaetan Bisson <[email protected]>
+
+pkgname=conky
+pkgver=1.8.2git20111021
+pkgrel=1
+pkgdesc='Lightweight system monitor for X'
+url='http://conky.sourceforge.net/'
+license=('BSD' 'GPL')
+arch=('i686' 'x86_64')
+makedepends=('pkg-config' 'cmake' 'git' 'docbook2x')
+depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'libxdamage' 
'imlib2' 'lua')
+
+replaces=('torsmo')
+
+build() {
+       cd "${srcdir}"
+
+       cd conky && { git pull origin; cd ..; } || git clone 
git://git.omp.am/conky.git
+       rm -fr build; mkdir build; cd build
+
+       cmake \
+               -D CMAKE_BUILD_TYPE:STRING="Release" \
+               -D MAINTAINER_MODE:BOOL=ON \
+               -D BUILD_CURL:BOOL=ON \
+               -D BUILD_IMLIB2:BOOL=ON \
+               -D BUILD_LUA_IMLIB2:BOOL=OFF \
+               -D BUILD_MYSQL:BOOL=OFF \
+               -D BUILD_RSS:BOOL=ON \
+               -D BUILD_WEATHER_METAR:BOOL=ON \
+               -D BUILD_WEATHER_XOAP:BOOL=ON \
+               -D BUILD_WLAN:BOOL=ON \
+               -D CMAKE_INSTALL_PREFIX:PATH=/usr \
+               ../conky
+
+       make
+}
+
+package() {
+       cd "${srcdir}/build"
+       make DESTDIR="${pkgdir}" install
+       install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+       install -m644 ../conky/{COPYING,LICENSE}* 
"${pkgdir}/usr/share/licenses/${pkgname}"
+       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-i686/argb.patch (from rev 233962, 
conky/trunk/argb.patch)
===================================================================
--- extra-i686/argb.patch                               (rev 0)
+++ extra-i686/argb.patch       2015-03-17 05:09:09 UTC (rev 233963)
@@ -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);
+ 

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD       2015-03-17 05:08:18 UTC (rev 233962)
+++ extra-x86_64/PKGBUILD       2015-03-17 05:09:09 UTC (rev 233963)
@@ -1,44 +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.9.0
-pkgrel=4
-pkgdesc='Lightweight system monitor for X'
-url='http://conky.sourceforge.net/'
-license=('BSD' 'GPL')
-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')
-
-backup=('etc/conky/'conky{,_no_x11}.conf)
-options=('!emptydirs')
-
-build() {
-       cd "${srcdir}/${pkgname}-${pkgver}"
-
-       CPPFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}" ./configure \
-               --prefix=/usr \
-               --sysconfdir=/etc \
-               --enable-ibm \
-               --enable-curl \
-               --enable-rss \
-               --enable-weather-xoap \
-               --enable-imlib2 \
-               --enable-wlan \
-
-       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 233962, 
conky/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD                               (rev 0)
+++ extra-x86_64/PKGBUILD       2015-03-17 05:09:09 UTC (rev 233963)
@@ -0,0 +1,51 @@
+# $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.9.0
+pkgrel=5
+pkgdesc='Lightweight system monitor for X'
+url='http://conky.sourceforge.net/'
+license=('BSD' 'GPL')
+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";
+        '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}"
+
+       CPPFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}" ./configure \
+               --prefix=/usr \
+               --sysconfdir=/etc \
+               --enable-ibm \
+               --enable-curl \
+               --enable-rss \
+               --enable-weather-xoap \
+               --enable-imlib2 \
+               --enable-wlan \
+
+       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: extra-x86_64/PKGBUILD.cmake
===================================================================
--- extra-x86_64/PKGBUILD.cmake 2015-03-17 05:08:18 UTC (rev 233962)
+++ extra-x86_64/PKGBUILD.cmake 2015-03-17 05:09:09 UTC (rev 233963)
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $
-# Contributor: Giovanni Scafora <[email protected]>
-# Contributor: James Rayner <[email protected]>
-# Contributor: Partha Chowdhury <[email protected]>
-# Maintainer: Gaetan Bisson <[email protected]>
-
-pkgname=conky
-pkgver=1.8.2git20111021
-pkgrel=1
-pkgdesc='Lightweight system monitor for X'
-url='http://conky.sourceforge.net/'
-license=('BSD' 'GPL')
-arch=('i686' 'x86_64')
-makedepends=('pkg-config' 'cmake' 'git' 'docbook2x')
-depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'libxdamage' 
'imlib2' 'lua')
-
-replaces=('torsmo')
-
-build() {
-       cd "${srcdir}"
-
-       cd conky && { git pull origin; cd ..; } || git clone 
git://git.omp.am/conky.git
-       rm -fr build; mkdir build; cd build
-
-       cmake \
-               -D CMAKE_BUILD_TYPE:STRING="Release" \
-               -D MAINTAINER_MODE:BOOL=ON \
-               -D BUILD_CURL:BOOL=ON \
-               -D BUILD_IMLIB2:BOOL=ON \
-               -D BUILD_LUA_IMLIB2:BOOL=OFF \
-               -D BUILD_MYSQL:BOOL=OFF \
-               -D BUILD_RSS:BOOL=ON \
-               -D BUILD_WEATHER_METAR:BOOL=ON \
-               -D BUILD_WEATHER_XOAP:BOOL=ON \
-               -D BUILD_WLAN:BOOL=ON \
-               -D CMAKE_INSTALL_PREFIX:PATH=/usr \
-               ../conky
-
-       make
-}
-
-package() {
-       cd "${srcdir}/build"
-       make DESTDIR="${pkgdir}" install
-       install -d "${pkgdir}/usr/share/licenses/${pkgname}"
-       install -m644 ../conky/{COPYING,LICENSE}* 
"${pkgdir}/usr/share/licenses/${pkgname}"
-       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.cmake (from rev 233962, 
conky/trunk/PKGBUILD.cmake)
===================================================================
--- extra-x86_64/PKGBUILD.cmake                         (rev 0)
+++ extra-x86_64/PKGBUILD.cmake 2015-03-17 05:09:09 UTC (rev 233963)
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $
+# Contributor: Giovanni Scafora <[email protected]>
+# Contributor: James Rayner <[email protected]>
+# Contributor: Partha Chowdhury <[email protected]>
+# Maintainer: Gaetan Bisson <[email protected]>
+
+pkgname=conky
+pkgver=1.8.2git20111021
+pkgrel=1
+pkgdesc='Lightweight system monitor for X'
+url='http://conky.sourceforge.net/'
+license=('BSD' 'GPL')
+arch=('i686' 'x86_64')
+makedepends=('pkg-config' 'cmake' 'git' 'docbook2x')
+depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'libxdamage' 
'imlib2' 'lua')
+
+replaces=('torsmo')
+
+build() {
+       cd "${srcdir}"
+
+       cd conky && { git pull origin; cd ..; } || git clone 
git://git.omp.am/conky.git
+       rm -fr build; mkdir build; cd build
+
+       cmake \
+               -D CMAKE_BUILD_TYPE:STRING="Release" \
+               -D MAINTAINER_MODE:BOOL=ON \
+               -D BUILD_CURL:BOOL=ON \
+               -D BUILD_IMLIB2:BOOL=ON \
+               -D BUILD_LUA_IMLIB2:BOOL=OFF \
+               -D BUILD_MYSQL:BOOL=OFF \
+               -D BUILD_RSS:BOOL=ON \
+               -D BUILD_WEATHER_METAR:BOOL=ON \
+               -D BUILD_WEATHER_XOAP:BOOL=ON \
+               -D BUILD_WLAN:BOOL=ON \
+               -D CMAKE_INSTALL_PREFIX:PATH=/usr \
+               ../conky
+
+       make
+}
+
+package() {
+       cd "${srcdir}/build"
+       make DESTDIR="${pkgdir}" install
+       install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+       install -m644 ../conky/{COPYING,LICENSE}* 
"${pkgdir}/usr/share/licenses/${pkgname}"
+       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/argb.patch (from rev 233962, 
conky/trunk/argb.patch)
===================================================================
--- extra-x86_64/argb.patch                             (rev 0)
+++ extra-x86_64/argb.patch     2015-03-17 05:09:09 UTC (rev 233963)
@@ -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);
+ 

Reply via email to