[arch-commits] Commit in conky/trunk (PKGBUILD)

2020-11-22 Thread Felix Yan via arch-commits 
Date: Sunday, November 22, 2020 @ 12:36:26
  Author: felixonmars
Revision: 401707

upgpkg: conky 1.11.6-1

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-22 11:11:05 UTC (rev 401706)
+++ PKGBUILD2020-11-22 12:36:26 UTC (rev 401707)
@@ -4,8 +4,8 @@
 # Contributor: Partha Chowdhury 
 
 pkgname=conky
-pkgver=1.11.5
-pkgrel=4
+pkgver=1.11.6
+pkgrel=1
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
 license=('BSD' 'GPL')
@@ -14,7 +14,7 @@
 depends=('glib2' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft'
  'imlib2' 'libxml2' 'libpulse' 'libxnvctrl')
 source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz;)
-sha256sums=('4cefdd92219a90934c28297e4ac7448a3f69d6aeec5d48c5763b23f6b214ef13')
+sha512sums=('f7bffcef33680d61d0171ba50b29ddda011c1c1989fc847cd4b5b60d46bed4772294eec34fd27c4d642a9c03e3cedaa31855ffc0f3b60791f4bed14ffdf7490a')
 options=('!strip' 'debug')
 
 build() {

[arch-commits] Commit in conky/trunk (PKGBUILD)

2020-06-29 Thread Evangelos Foutras via arch-commits 
Date: Tuesday, June 30, 2020 @ 05:46:21
  Author: foutrelis
Revision: 390655

upgpkg: conky 1.11.5-4: Lua 5.4 rebuild

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-30 05:30:42 UTC (rev 390654)
+++ PKGBUILD2020-06-30 05:46:21 UTC (rev 390655)
@@ -5,7 +5,7 @@
 
 pkgname=conky
 pkgver=1.11.5
-pkgrel=3
+pkgrel=4
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
 license=('BSD' 'GPL')

[arch-commits] Commit in conky/trunk (PKGBUILD)

2020-05-19 Thread Felix Yan via arch-commits 
Date: Tuesday, May 19, 2020 @ 08:46:26
  Author: felixonmars
Revision: 386467

upgpkg: conky 1.11.5-3: reproducibility rebuild

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-19 08:46:11 UTC (rev 386466)
+++ PKGBUILD2020-05-19 08:46:26 UTC (rev 386467)
@@ -5,7 +5,7 @@
 
 pkgname=conky
 pkgver=1.11.5
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
 license=('BSD' 'GPL')

[arch-commits] Commit in conky/trunk (PKGBUILD)

2019-08-29 Thread Gaëtan Bisson via arch-commits 
Date: Thursday, August 29, 2019 @ 22:32:56
  Author: bisson
Revision: 361394

enable nvidia support FS#62385

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-29 22:26:51 UTC (rev 361393)
+++ PKGBUILD2019-08-29 22:32:56 UTC (rev 361394)
@@ -5,7 +5,7 @@
 
 pkgname=conky
 pkgver=1.11.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
 license=('BSD' 'GPL')
@@ -12,7 +12,7 @@
 arch=('x86_64')
 makedepends=('cmake' 'docbook2x' 'docbook-xsl' 'man-db' 'git')
 depends=('glib2' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft'
- 'imlib2' 'libxml2' 'libpulse')
+ 'imlib2' 'libxml2' 'libpulse' 'libxnvctrl')
 source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz;)
 sha256sums=('4cefdd92219a90934c28297e4ac7448a3f69d6aeec5d48c5763b23f6b214ef13')
 options=('!strip' 'debug')
@@ -30,6 +30,7 @@
-D BUILD_IMLIB2=ON \
-D BUILD_CURL=ON \
-D BUILD_RSS=ON \
+   -D BUILD_NVIDIA=ON \
-D BUILD_WEATHER_METAR=ON \
-D BUILD_PULSEAUDIO=ON \
-D BUILD_JOURNAL=ON \

[arch-commits] Commit in conky/trunk (PKGBUILD)

2019-08-14 Thread Gaëtan Bisson via arch-commits 
Date: Wednesday, August 14, 2019 @ 08:50:43
  Author: bisson
Revision: 359807

upstream update

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-14 08:32:08 UTC (rev 359806)
+++ PKGBUILD2019-08-14 08:50:43 UTC (rev 359807)
@@ -4,7 +4,7 @@
 # Contributor: Partha Chowdhury 
 
 pkgname=conky
-pkgver=1.11.4
+pkgver=1.11.5
 pkgrel=1
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
@@ -14,7 +14,7 @@
 depends=('glib2' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft'
  'imlib2' 'libxml2' 'libpulse')
 source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz;)
-sha256sums=('344637646c15c4cb7cf0afdde4651ee3100f7812e7bb8434ca757eba5c621a48')
+sha256sums=('4cefdd92219a90934c28297e4ac7448a3f69d6aeec5d48c5763b23f6b214ef13')
 options=('!strip' 'debug')
 
 build() {

[arch-commits] Commit in conky/trunk (PKGBUILD)

2019-06-26 Thread Gaëtan Bisson via arch-commits 
Date: Wednesday, June 26, 2019 @ 20:50:17
  Author: bisson
Revision: 356946

upstream update

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-26 18:33:19 UTC (rev 356945)
+++ PKGBUILD2019-06-26 20:50:17 UTC (rev 356946)
@@ -4,7 +4,7 @@
 # Contributor: Partha Chowdhury 
 
 pkgname=conky
-pkgver=1.11.3
+pkgver=1.11.4
 pkgrel=1
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
@@ -14,7 +14,7 @@
 depends=('glib2' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft'
  'imlib2' 'libxml2' 'libpulse')
 source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz;)
-sha256sums=('0140e749537d4d05bf33fbac436e54756faa26021e16f2bca418e9eeea724eb4')
+sha256sums=('344637646c15c4cb7cf0afdde4651ee3100f7812e7bb8434ca757eba5c621a48')
 options=('!strip' 'debug')
 
 build() {
@@ -23,6 +23,7 @@
cmake \
-D CMAKE_BUILD_TYPE=Release \
-D MAINTAINER_MODE=ON \
+   -D BUILD_DOCS=ON \
-D BUILD_WLAN=ON \
-D BUILD_XDBE=ON \
-D BUILD_XSHAPE=ON \
@@ -30,7 +31,6 @@
-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 \

[arch-commits] Commit in conky/trunk (PKGBUILD)

2019-03-01 Thread Gaëtan Bisson via arch-commits 
Date: Saturday, March 2, 2019 @ 03:46:57
  Author: bisson
Revision: 346991

upstream update

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-01 20:41:21 UTC (rev 346990)
+++ PKGBUILD2019-03-02 03:46:57 UTC (rev 346991)
@@ -4,7 +4,7 @@
 # Contributor: Partha Chowdhury 
 
 pkgname=conky
-pkgver=1.11.2
+pkgver=1.11.3
 pkgrel=1
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
@@ -14,7 +14,7 @@
 depends=('glib2' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft'
  'imlib2' 'libxml2' 'libpulse')
 source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz;)
-sha256sums=('1acf9dae9ce1a762309ab6b600a0464c2e054420d416b515ff39658430a0e819')
+sha256sums=('0140e749537d4d05bf33fbac436e54756faa26021e16f2bca418e9eeea724eb4')
 options=('!strip' 'debug')
 
 build() {

[arch-commits] Commit in conky/trunk (PKGBUILD)

2019-01-08 Thread Gaëtan Bisson via arch-commits 
Date: Wednesday, January 9, 2019 @ 00:12:58
  Author: bisson
Revision: 343132

upstream update

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-08 22:05:50 UTC (rev 343131)
+++ PKGBUILD2019-01-09 00:12:58 UTC (rev 343132)
@@ -4,7 +4,7 @@
 # Contributor: Partha Chowdhury 
 
 pkgname=conky
-pkgver=1.11.1
+pkgver=1.11.2
 pkgrel=1
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
@@ -14,7 +14,7 @@
 depends=('glib2' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft'
  'imlib2' 'libxml2' 'libpulse')
 source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz;)
-sha256sums=('71fab859946cc2e67be46f2db53859c66369c5c87acf18fc8dfbd41b114f6d6e')
+sha256sums=('1acf9dae9ce1a762309ab6b600a0464c2e054420d416b515ff39658430a0e819')
 options=('!strip' 'debug')
 
 build() {

[arch-commits] Commit in conky/trunk (PKGBUILD)

2018-12-17 Thread Gaëtan Bisson via arch-commits 
Date: Monday, December 17, 2018 @ 21:05:20
  Author: bisson
Revision: 342464

upstream update

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |   16 
 1 file changed, 4 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-12-17 20:57:18 UTC (rev 342463)
+++ PKGBUILD2018-12-17 21:05:20 UTC (rev 342464)
@@ -4,8 +4,8 @@
 # Contributor: Partha Chowdhury 
 
 pkgname=conky
-pkgver=1.11.0
-pkgrel=2
+pkgver=1.11.1
+pkgrel=1
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
 license=('BSD' 'GPL')
@@ -13,18 +13,10 @@
 makedepends=('cmake' 'docbook2x' 'docbook-xsl' '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;
-
'https://github.com/brndnmtthws/conky/commit/4d098b053690861992f9daa4e3195b31295c735c.patch')
-sha256sums=('cc75b5f6cdeefa83082f3dedf5a12105569c2cdc0ae3e7728922d79bc4abcf51'
-'c509b4a082ff84b5d3f7f002d737ab9f5941ac4564779b97307087ba663b8aaf')
-
+source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz;)
+sha256sums=('71fab859946cc2e67be46f2db53859c66369c5c87acf18fc8dfbd41b114f6d6e')
 options=('!strip' 'debug')
 
-prepare() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   patch -p1 -i ../4d098b053690861992f9daa4e3195b31295c735c.patch
-}
-
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"

[arch-commits] Commit in conky/trunk (PKGBUILD)

2018-12-14 Thread Gaëtan Bisson via arch-commits 
Date: Friday, December 14, 2018 @ 21:26:05
  Author: bisson
Revision: 342366

fix FS#61004

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-12-14 21:23:01 UTC (rev 342365)
+++ PKGBUILD2018-12-14 21:26:05 UTC (rev 342366)
@@ -5,7 +5,7 @@
 
 pkgname=conky
 pkgver=1.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
 license=('BSD' 'GPL')
@@ -13,11 +13,18 @@
 makedepends=('cmake' 'docbook2x' 'docbook-xsl' '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;)
-sha256sums=('cc75b5f6cdeefa83082f3dedf5a12105569c2cdc0ae3e7728922d79bc4abcf51')
+source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz;
+
'https://github.com/brndnmtthws/conky/commit/4d098b053690861992f9daa4e3195b31295c735c.patch')
+sha256sums=('cc75b5f6cdeefa83082f3dedf5a12105569c2cdc0ae3e7728922d79bc4abcf51'
+'c509b4a082ff84b5d3f7f002d737ab9f5941ac4564779b97307087ba663b8aaf')
 
 options=('!strip' 'debug')
 
+prepare() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   patch -p1 -i ../4d098b053690861992f9daa4e3195b31295c735c.patch
+}
+
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"

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

2018-12-02 Thread Gaëtan Bisson via arch-commits 
Date: Monday, December 3, 2018 @ 05:16:43
  Author: bisson
Revision: 340963

upstream update

Modified:
  conky/trunk/PKGBUILD
Deleted:
  conky/trunk/lua53.patch

-+
 PKGBUILD|   15 ---
 lua53.patch |   46 --
 2 files changed, 4 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-12-03 05:09:28 UTC (rev 340962)
+++ PKGBUILD2018-12-03 05:16:43 UTC (rev 340963)
@@ -4,8 +4,8 @@
 # Contributor: Partha Chowdhury 
 
 pkgname=conky
-pkgver=1.10.8
-pkgrel=2
+pkgver=1.11.0
+pkgrel=1
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
 license=('BSD' 'GPL')
@@ -13,18 +13,11 @@
 makedepends=('cmake' 'docbook2x' 'docbook-xsl' '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')
-sha256sums=('2ebd655a27c816bd613538b71d4ec1c096252cb522feaa05f64781dcedea8857'
-'16516bdae848f85be949185746418fa5810d426e1f25b6dbbcefdbf4a0b8e6f3')
+source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz;)
+sha256sums=('cc75b5f6cdeefa83082f3dedf5a12105569c2cdc0ae3e7728922d79bc4abcf51')
 
 options=('!strip' 'debug')
 
-prepare() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   patch -p1 -i ../lua53.patch # lua_gettable returns an int in lua-5.3
-}
-
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"
 

Deleted: lua53.patch
===
--- lua53.patch 2018-12-03 05:09:28 UTC (rev 340962)
+++ lua53.patch 2018-12-03 05:16:43 UTC (rev 340963)
@@ -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
--  int safe_misc_trampoline(lua_State *l)
-+  int safe_misc_trampoline_set(lua_State *l)
-+  {
-+  misc(l, 1);
-+  return nresults;
-+  }
-+
-+  template
-+  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(_compare_trampoline, 
index1, index2);
-+  return safe_compare(_compare_trampoline<_equal>, 
index1, index2);
-   }
- 
-   int state::gc(int what, int data)
-@@ -367,7 +374,7 @@
-   checkstack(2);
-   pushvalue(index);
-   insert(-2);
--  lua_pushcfunction(cobj.get(), 
(_misc_trampoline<_gettable, 1>));
-+  lua_pushcfunction(cobj.get(), 
(_misc_trampoline_get<_gettable, 1>));
-   insert(-3);
-   call(2, 1, 0);
-   }
-@@ -492,7 +499,7 @@
-   checkstack(2);
-   pushvalue(index);
-   insert(-3);
--  lua_pushcfunction(cobj.get(), 
(_misc_trampoline<_settable, 0>));
-+  lua_pushcfunction(cobj.get(), 
(_misc_trampoline_set<_settable, 0>));
-   insert(-4);
-   call(3, 0, 0);
-   }

[arch-commits] Commit in conky/trunk (PKGBUILD)

2018-03-12 Thread Gaëtan Bisson via arch-commits 
Date: Monday, March 12, 2018 @ 19:30:27
  Author: bisson
Revision: 318770

implement FS#57799

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-12 19:17:07 UTC (rev 318769)
+++ PKGBUILD2018-03-12 19:30:27 UTC (rev 318770)
@@ -6,7 +6,7 @@
 
 pkgname=conky
 pkgver=1.10.8
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
 license=('BSD' 'GPL')
@@ -34,6 +34,7 @@
-D MAINTAINER_MODE=ON \
-D BUILD_WLAN=ON \
-D BUILD_XDBE=ON \
+   -D BUILD_XSHAPE=ON \
-D BUILD_IMLIB2=ON \
-D BUILD_CURL=ON \
-D BUILD_RSS=ON \

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

2018-02-14 Thread Gaëtan Bisson via arch-commits 
Date: Thursday, February 15, 2018 @ 00:06:14
  Author: bisson
Revision: 317071

upstream update

Modified:
  conky/trunk/PKGBUILD
Deleted:
  conky/trunk/out_to_x.patch

+
 PKGBUILD   |   11 ---
 out_to_x.patch |   48 
 2 files changed, 4 insertions(+), 55 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-14 23:57:00 UTC (rev 317070)
+++ PKGBUILD2018-02-15 00:06:14 UTC (rev 317071)
@@ -5,20 +5,18 @@
 # Contributor: Partha Chowdhury 
 
 pkgname=conky
-pkgver=1.10.7
-pkgrel=2
+pkgver=1.10.8
+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')
+makedepends=('cmake' 'docbook2x' 'docbook-xsl' '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;
-'out_to_x.patch'
 'lua53.patch')
-sha256sums=('23bb9609c522f248cba287146943a872cc045b45cecfa5668bca76e95ecc06ac'
-'0bf5851f9b7a4c8c40970a658625a72969f1f0b205c61ce2fc5295ebcc9ca847'
+sha256sums=('2ebd655a27c816bd613538b71d4ec1c096252cb522feaa05f64781dcedea8857'
 '16516bdae848f85be949185746418fa5810d426e1f25b6dbbcefdbf4a0b8e6f3')
 
 options=('!strip' 'debug')
@@ -26,7 +24,6 @@
 prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 -i ../lua53.patch # lua_gettable returns an int in lua-5.3
-   patch -p1 -i ../out_to_x.patch
 }
 
 build() {

Deleted: out_to_x.patch
===
--- out_to_x.patch  2018-02-14 23:57:00 UTC (rev 317070)
+++ out_to_x.patch  2018-02-15 00:06:14 UTC (rev 317071)
@@ -1,48 +0,0 @@
-commit 562c7375883445acb58388ff16d9eb126b7e12a1
-Author: Brenden Matthews 
-Date:   Tue Jan 23 13:52:11 2018 -0500
-
-Fix segfault when out_to_x = false. (#455)
-
-This resolves #454.
-
-diff --git a/src/conky.cc b/src/conky.cc
-index 48256ecc..f10d08fb 100644
 a/src/conky.cc
-+++ b/src/conky.cc
-@@ -2076,20 +2076,24 @@ static void main_loop(void)
-   sigaddset(, 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, _version, _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, _version, 
_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());
-

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

2018-01-23 Thread Gaëtan Bisson via arch-commits 
Date: Tuesday, January 23, 2018 @ 19:29:35
  Author: bisson
Revision: 315321

proper upstream fix rather than revert

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

+
 PKGBUILD   |8 ++---
 mouse.patch|   86 ---
 out_to_x.patch |   48 ++
 3 files changed, 52 insertions(+), 90 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-23 18:52:12 UTC (rev 315320)
+++ PKGBUILD2018-01-23 19:29:35 UTC (rev 315321)
@@ -6,7 +6,7 @@
 
 pkgname=conky
 pkgver=1.10.7
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
 license=('BSD' 'GPL')
@@ -15,10 +15,10 @@
 depends=('glib2' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft'
  'imlib2' 'libxml2' 'libpulse')
 source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz;
-'mouse.patch'
+'out_to_x.patch'
 'lua53.patch')
 sha256sums=('23bb9609c522f248cba287146943a872cc045b45cecfa5668bca76e95ecc06ac'
-'9c323485e130d253b9e68af4880eed6bcc4ce8866b216224aaf550a31f4bb63c'
+'0bf5851f9b7a4c8c40970a658625a72969f1f0b205c61ce2fc5295ebcc9ca847'
 '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 ../mouse.patch --reverse # 
https://github.com/brndnmtthws/conky/issues/454
+   patch -p1 -i ../out_to_x.patch
 }
 
 build() {

Deleted: mouse.patch
===
--- mouse.patch 2018-01-23 18:52:12 UTC (rev 315320)
+++ mouse.patch 2018-01-23 19:29:35 UTC (rev 315321)
@@ -1,86 +0,0 @@
-From d97f4dfd8a4f395ef65abfd67d5a758aadb46042 Mon Sep 17 00:00:00 2001
-From: Alexey Korop 
-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 
-+#endif /* BUILD_XSHAPE */
- #endif /* BUILD_X11 */
- #ifdef BUILD_NCURSES
- #include 
-@@ -2070,6 +2073,21 @@ static void main_loop(void)
-   sigaddset(, SIGUSR1);
- #endif
- 
-+#ifdef BUILD_XSHAPE
-+  /* allow only decorated windows to be given mouse input */
-+  int major_version, minor_version;
-+  if (!XShapeQueryVersion(display, _version, _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 
- #endif
--#ifdef BUILD_XSHAPE
--#include 
--#include 
--#endif
- #ifdef BUILD_XINERAMA
- #include 
- #endif
-@@ -771,24 +767,6 @@ static void init_window(lua::state  
__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, _base, 
_base)) {
--  int major_version = 0, minor_version = 
0;
--  XShapeQueryVersion(display, 
_version, _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 {
--

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

2018-01-20 Thread Gaëtan Bisson via arch-commits 
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
===
--- PKGBUILD2018-01-20 22:19:18 UTC (rev 315188)
+++ PKGBUILD2018-01-21 00:54:54 UTC (rev 315189)
@@ -5,8 +5,8 @@
 # Contributor: Partha Chowdhury 
 
 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.0 -1000
-+++ new/src/luamm.hh   2017-11-21 09:11:20.993164069 -1000
-@@ -28,6 +28,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include 
- 

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 
+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 
++#endif /* BUILD_XSHAPE */
+ #endif /* BUILD_X11 */
+ #ifdef BUILD_NCURSES
+ #include 
+@@ -2070,6 +2073,21 @@ static void main_loop(void)
+   sigaddset(, SIGUSR1);
+ #endif
+ 
++#ifdef BUILD_XSHAPE
++  /* allow only decorated windows to be given mouse input */
++  int major_version, minor_version;
++  if (!XShapeQueryVersion(display, _version, _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 
+ #endif
+-#ifdef BUILD_XSHAPE
+-#include 
+-#include 
+-#endif
+ #ifdef BUILD_XINERAMA
+ #include 
+ #endif
+@@ -771,24 +767,6 @@ static void init_window(lua::state  
__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,

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

2017-11-21 Thread Gaëtan Bisson 
Date: Tuesday, November 21, 2017 @ 19:27:11
  Author: bisson
Revision: 310522

fix FS#56397

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

+
 PKGBUILD   |6 +++---
 gcc7.patch |   11 +++
 2 files changed, 14 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-21 18:51:24 UTC (rev 310521)
+++ PKGBUILD2017-11-21 19:27:11 UTC (rev 310522)
@@ -6,7 +6,7 @@
 
 pkgname=conky
 pkgver=1.10.6
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
 license=('BSD' 'GPL')
@@ -16,10 +16,10 @@
  'imlib2' 'libxml2' 'libpulse')
 source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz;
 'lua53.patch'
-   'gcc7.patch')
+'gcc7.patch')
 sha256sums=('4c80982960b2a72e3e33cef33347c97b9239ed110d9584da4e7f17f28faf60ca'
 '16516bdae848f85be949185746418fa5810d426e1f25b6dbbcefdbf4a0b8e6f3'
-   '7d653f119aea1ded02c5367f28b2b36fea1199723ed6a091216989f8927fc13d')
+'1f54b8c570c43a34ede9b3cb25848bd80d27ebc68cf973c082937f9b3fc1a411')
 
 options=('!strip' 'debug')
 

Added: gcc7.patch
===
--- gcc7.patch  (rev 0)
+++ gcc7.patch  2017-11-21 19:27:11 UTC (rev 310522)
@@ -0,0 +1,11 @@
+diff -Naur old/src/luamm.hh new/src/luamm.hh
+--- old/src/luamm.hh   2016-12-04 05:13:57.0 -1000
 new/src/luamm.hh   2017-11-21 09:11:20.993164069 -1000
+@@ -28,6 +28,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include 
+

[arch-commits] Commit in conky/trunk (PKGBUILD)

2017-06-01 Thread Gaëtan Bisson 
Date: Thursday, June 1, 2017 @ 20:34:31
  Author: bisson
Revision: 297345

fix FS#54223

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-01 20:09:39 UTC (rev 297344)
+++ PKGBUILD2017-06-01 20:34:31 UTC (rev 297345)
@@ -15,9 +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')
+'lua53.patch'
+   'gcc7.patch')
 sha256sums=('4c80982960b2a72e3e33cef33347c97b9239ed110d9584da4e7f17f28faf60ca'
-'16516bdae848f85be949185746418fa5810d426e1f25b6dbbcefdbf4a0b8e6f3')
+'16516bdae848f85be949185746418fa5810d426e1f25b6dbbcefdbf4a0b8e6f3'
+   '7d653f119aea1ded02c5367f28b2b36fea1199723ed6a091216989f8927fc13d')
 
 options=('!strip' 'debug')
 
@@ -24,6 +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
 }
 
 build() {

[arch-commits] Commit in conky/trunk (PKGBUILD)

2017-05-16 Thread Gaëtan Bisson 
Date: Tuesday, May 16, 2017 @ 08:33:59
  Author: bisson
Revision: 296174

implement FS#53985

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-16 08:26:27 UTC (rev 296173)
+++ PKGBUILD2017-05-16 08:33:59 UTC (rev 296174)
@@ -6,7 +6,7 @@
 
 pkgname=conky
 pkgver=1.10.6
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
 license=('BSD' 'GPL')
@@ -40,6 +40,7 @@
-D BUILD_WEATHER_METAR=ON \
-D BUILD_WEATHER_XOAP=ON \
-D BUILD_PULSEAUDIO=ON \
+   -D BUILD_JOURNAL=ON \
-D CMAKE_INSTALL_PREFIX=/usr \
.

[arch-commits] Commit in conky/trunk (PKGBUILD)

2017-03-01 Thread Gaëtan Bisson 
Date: Thursday, March 2, 2017 @ 01:30:56
  Author: bisson
Revision: 289784

switch to sha256sum

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-02 01:30:52 UTC (rev 289783)
+++ PKGBUILD2017-03-02 01:30:56 UTC (rev 289784)
@@ -16,8 +16,8 @@
  'imlib2' 'libxml2' 'libpulse')
 source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz;
 'lua53.patch')
-sha1sums=('54cb3322dc3a969f1fda03383012c61d57261345'
-  'a3a74542b6524e5663ad37aaba292b48e8bea3b1')
+sha256sums=('4c80982960b2a72e3e33cef33347c97b9239ed110d9584da4e7f17f28faf60ca'
+'16516bdae848f85be949185746418fa5810d426e1f25b6dbbcefdbf4a0b8e6f3')
 
 options=('!strip' 'debug')

[arch-commits] Commit in conky/trunk (PKGBUILD)

2016-12-26 Thread Gaëtan Bisson 
Date: Monday, December 26, 2016 @ 19:41:58
  Author: bisson
Revision: 284822

upstream update

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-26 16:56:57 UTC (rev 284821)
+++ PKGBUILD2016-12-26 19:41:58 UTC (rev 284822)
@@ -5,7 +5,7 @@
 # Contributor: Partha Chowdhury 
 
 pkgname=conky
-pkgver=1.10.5
+pkgver=1.10.6
 pkgrel=1
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
@@ -16,7 +16,7 @@
  'imlib2' 'libxml2' 'libpulse')
 source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz;
 'lua53.patch')
-sha1sums=('a560c356ce4c3e2918601743b57d19a18fe01a72'
+sha1sums=('54cb3322dc3a969f1fda03383012c61d57261345'
   'a3a74542b6524e5663ad37aaba292b48e8bea3b1')
 
 options=('!strip' 'debug')

[arch-commits] Commit in conky/trunk (PKGBUILD)

2016-10-08 Thread Gaëtan Bisson 
Date: Saturday, October 8, 2016 @ 06:52:43
  Author: bisson
Revision: 277912

upstream update

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-07 20:35:45 UTC (rev 277911)
+++ PKGBUILD2016-10-08 06:52:43 UTC (rev 277912)
@@ -5,7 +5,7 @@
 # Contributor: Partha Chowdhury 
 
 pkgname=conky
-pkgver=1.10.4
+pkgver=1.10.5
 pkgrel=1
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
@@ -16,7 +16,7 @@
  'imlib2' 'libxml2' 'libpulse')
 source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz;
 'lua53.patch')
-sha1sums=('f2da0e3b8e6ff8ebc42b35f710f822e228616993'
+sha1sums=('a560c356ce4c3e2918601743b57d19a18fe01a72'
   'a3a74542b6524e5663ad37aaba292b48e8bea3b1')
 
 options=('!strip' 'debug')

[arch-commits] Commit in conky/trunk (PKGBUILD)

2016-08-01 Thread Gaëtan Bisson 
Date: Monday, August 1, 2016 @ 20:20:07
  Author: bisson
Revision: 272791

upstream update

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-01 20:18:30 UTC (rev 272790)
+++ PKGBUILD2016-08-01 20:20:07 UTC (rev 272791)
@@ -5,8 +5,8 @@
 # Contributor: Partha Chowdhury 
 
 pkgname=conky
-pkgver=1.10.3
-pkgrel=2
+pkgver=1.10.4
+pkgrel=1
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
 license=('BSD' 'GPL')
@@ -16,7 +16,7 @@
  'imlib2' 'libxml2' 'libpulse')
 source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz;
 'lua53.patch')
-sha1sums=('971b20be2d8c2e676374441469e8525708500776'
+sha1sums=('f2da0e3b8e6ff8ebc42b35f710f822e228616993'
   'a3a74542b6524e5663ad37aaba292b48e8bea3b1')
 
 options=('!strip' 'debug')

[arch-commits] Commit in conky/trunk (PKGBUILD)

2016-07-23 Thread Gaëtan Bisson 
Date: Saturday, July 23, 2016 @ 10:07:40
  Author: bisson
Revision: 272159

implement FS#50127

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-23 09:55:51 UTC (rev 272158)
+++ PKGBUILD2016-07-23 10:07:40 UTC (rev 272159)
@@ -6,13 +6,14 @@
 
 pkgname=conky
 pkgver=1.10.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
 license=('BSD' 'GPL')
 arch=('i686' 'x86_64')
 makedepends=('cmake' 'docbook2x' 'docbook-xml' 'man-db' 'git')
-depends=('glib2' 'curl' 'lua' 'wireless_tools' 'libxml2' 'libxft' 'libxdamage' 
'imlib2' 'libxinerama')
+depends=('glib2' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft'
+ 'imlib2' 'libxml2' 'libpulse')
 source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz;
 'lua53.patch')
 sha1sums=('971b20be2d8c2e676374441469e8525708500776'
@@ -31,13 +32,14 @@
cmake \
-D CMAKE_BUILD_TYPE=Release \
-D MAINTAINER_MODE=ON \
-   -D BUILD_CURL=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_WLAN=ON \
+   -D BUILD_PULSEAUDIO=ON \
-D CMAKE_INSTALL_PREFIX=/usr \
.

[arch-commits] Commit in conky/trunk (PKGBUILD)

2016-06-25 Thread Gaëtan Bisson 
Date: Saturday, June 25, 2016 @ 17:40:13
  Author: bisson
Revision: 270651

upstream update

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-06-25 17:21:16 UTC (rev 270650)
+++ PKGBUILD2016-06-25 17:40:13 UTC (rev 270651)
@@ -5,7 +5,7 @@
 # Contributor: Partha Chowdhury 
 
 pkgname=conky
-pkgver=1.10.2
+pkgver=1.10.3
 pkgrel=1
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
@@ -15,7 +15,7 @@
 depends=('glib2' 'curl' 'lua' 'wireless_tools' 'libxml2' 'libxft' 'libxdamage' 
'imlib2' 'libxinerama')
 source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz;
 'lua53.patch')
-sha1sums=('7392523d2eb9e2044faae8d44cbd006b387d0a85'
+sha1sums=('971b20be2d8c2e676374441469e8525708500776'
   'a3a74542b6524e5663ad37aaba292b48e8bea3b1')
 
 options=('!strip' 'debug')

[arch-commits] Commit in conky/trunk (PKGBUILD)

2016-05-03 Thread Gaetan Bisson 
Date: Tuesday, May 3, 2016 @ 22:36:46
  Author: bisson
Revision: 266820

upstream update

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-03 19:42:31 UTC (rev 266819)
+++ PKGBUILD2016-05-03 20:36:46 UTC (rev 266820)
@@ -5,17 +5,17 @@
 # Contributor: Partha Chowdhury 
 
 pkgname=conky
-pkgver=1.10.1
-pkgrel=2
+pkgver=1.10.2
+pkgrel=1
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
 license=('BSD' 'GPL')
 arch=('i686' 'x86_64')
 makedepends=('cmake' 'docbook2x' 'docbook-xml' 'man-db' 'git')
-depends=('glib2' 'curl' 'lua' 'wireless_tools' 'libxml2' 'libxft' 'libxdamage' 
'imlib2')
+depends=('glib2' 'curl' 'lua' 'wireless_tools' 'libxml2' 'libxft' 'libxdamage' 
'imlib2' 'libxinerama')
 source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz;
 'lua53.patch')
-sha1sums=('97b59ec1daf54126b30516e8663a9cf1f218d8ae'
+sha1sums=('7392523d2eb9e2044faae8d44cbd006b387d0a85'
   'a3a74542b6524e5663ad37aaba292b48e8bea3b1')
 
 options=('!strip' 'debug')

[arch-commits] Commit in conky/trunk (PKGBUILD)

2015-12-06 Thread Evangelos Foutras 
Date: Monday, December 7, 2015 @ 00:39:24
  Author: foutrelis
Revision: 253089

C++11 ABI rebuild

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 23:39:02 UTC (rev 253088)
+++ PKGBUILD2015-12-06 23:39:24 UTC (rev 253089)
@@ -6,7 +6,7 @@
 
 pkgname=conky
 pkgver=1.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
 license=('BSD' 'GPL')

[arch-commits] Commit in conky/trunk (PKGBUILD ascii.patch curl.patch ipv6.patch)

2015-11-19 Thread Gaetan Bisson 
Date: Thursday, November 19, 2015 @ 22:45:23
  Author: bisson
Revision: 251434

upstream update

Modified:
  conky/trunk/PKGBUILD
Deleted:
  conky/trunk/ascii.patch
  conky/trunk/curl.patch
  conky/trunk/ipv6.patch

-+
 PKGBUILD|   23 +++
 ascii.patch |   12 
 curl.patch  |   14 --
 ipv6.patch  |   28 
 4 files changed, 7 insertions(+), 70 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-11-19 21:33:55 UTC (rev 251433)
+++ PKGBUILD2015-11-19 21:45:23 UTC (rev 251434)
@@ -5,33 +5,24 @@
 # Contributor: Partha Chowdhury 
 
 pkgname=conky
-pkgver=1.10.0
-pkgrel=5
+pkgver=1.10.1
+pkgrel=1
 pkgdesc='Lightweight system monitor for X'
-url='http://conky.sourceforge.net/'
+url='https://github.com/brndnmtthws/conky'
 license=('BSD' 'GPL')
 arch=('i686' 'x86_64')
-makedepends=('cmake' 'docbook2x' 'docbook-xml' 'man-db')
+makedepends=('cmake' 'docbook2x' 'docbook-xml' 'man-db' 'git')
 depends=('glib2' 'curl' 'lua' 'wireless_tools' 'libxml2' 'libxft' 'libxdamage' 
'imlib2')
 source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz;
-'ascii.patch'
-'lua53.patch'
-'ipv6.patch'
-'curl.patch')
-sha1sums=('d5863420150150002947180d0ee96c9ef56c43b1'
-  '96cdbc38e8706c8a3120601983df5c7265716128'
-  'a3a74542b6524e5663ad37aaba292b48e8bea3b1'
-  'a0899973483d0ad664b60e58b3ba899ba88712af'
-  '1c066b439a1e7166d733fb710faa9bf08b81ce4c')
+'lua53.patch')
+sha1sums=('97b59ec1daf54126b30516e8663a9cf1f218d8ae'
+  'a3a74542b6524e5663ad37aaba292b48e8bea3b1')
 
 options=('!strip' 'debug')
 
 prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
-   patch -p1 -i ../ascii.patch # db2x_manxml fails on non-ascii chars
patch -p1 -i ../lua53.patch # lua_gettable returns an int in lua-5.3
-   patch -p1 -i ../ipv6.patch # https://bugs.archlinux.org/task/45626
-   patch -p1 -i ../curl.patch # https://github.com/bagder/curl/issues/342
 }
 
 build() {

Deleted: ascii.patch
===
--- ascii.patch 2015-11-19 21:33:55 UTC (rev 251433)
+++ ascii.patch 2015-11-19 21:45:23 UTC (rev 251434)
@@ -1,12 +0,0 @@
-diff -aur old/doc/config_settings.xml new/doc/config_settings.xml
 old/doc/config_settings.xml2015-06-21 14:49:06.0 -1000
-+++ new/doc/config_settings.xml2015-06-29 10:05:00.147318479 -1000
-@@ -80,7 +80,7 @@
- 
- A comma-separated list of strings to use as the bars of a 
graph output
- to console/shell. The first list item is used for the minimum bar 
height and the
--last item is used for the maximum. Example: " ,_,▁,▂,▃,▄,▅,▆,▇,█".
-+last item is used for the maximum.
- 
- 
- 

Deleted: curl.patch
===
--- curl.patch  2015-11-19 21:33:55 UTC (rev 251433)
+++ curl.patch  2015-11-19 21:45:23 UTC (rev 251434)
@@ -1,14 +0,0 @@
-diff -Naur old/src/ccurl_thread.cc new/src/ccurl_thread.cc
 old/src/ccurl_thread.cc2015-06-21 14:49:06.0 -1000
-+++ new/src/ccurl_thread.cc2015-07-11 09:11:49.053040998 -1000
-@@ -119,9 +119,7 @@
-   headers.h = curl_slist_append(headers.h, 
("If-None-Match: " + etag).c_str());
-   etag.clear();
-   }
--  if (headers.h) {
--  curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers.h);
--  }
-+  curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers.h);
- 
-   res = curl_easy_perform(curl);
-   if (res == CURLE_OK) {

Deleted: ipv6.patch
===
--- ipv6.patch  2015-11-19 21:33:55 UTC (rev 251433)
+++ ipv6.patch  2015-11-19 21:45:23 UTC (rev 251434)
@@ -1,28 +0,0 @@
-From ee08a9e1b045e8d2f4f13a0e60c2f603b66b0d69 Mon Sep 17 00:00:00 2001
-From: Marc Payne 
-Date: Mon, 6 Jul 2015 02:51:43 -0600
-Subject: [PATCH] Close file only if it was successfully opened
-
-If BUILD_IPV6=ON (default), but the user has disabled ipv6 support
-in the kernel using the parameter ipv6.disable=1, then conky fails
-to open /proc/net/if_inet6. This leads to a segfault when conky
-calls fclose(file) regardless. This fix simply moves the fclose call
-into the preceding if statement.

- src/linux.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/linux.cc b/src/linux.cc
-index 847acac..7977fee 100644
 a/src/linux.cc
-+++ b/src/linux.cc
-@@ -643,8 +643,8 @@ int update_net_stats(void)
-   }
-   lastv6->next = NULL;
-   }
-+  fclose(file);
-   }
--  fclose(file);
- #endif /* BUILD_IPV6 */
- 
-   first = 0;

[arch-commits] Commit in conky/trunk (PKGBUILD)

2015-09-09 Thread Allan McRae 
Date: Thursday, September 10, 2015 @ 07:21:22
  Author: allan
Revision: 245688

ncurses 6.0 rebuild.

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-10 05:16:37 UTC (rev 245687)
+++ PKGBUILD2015-09-10 05:21:22 UTC (rev 245688)
@@ -6,7 +6,7 @@
 
 pkgname=conky
 pkgver=1.10.0
-pkgrel=4
+pkgrel=5
 pkgdesc='Lightweight system monitor for X'
 url='http://conky.sourceforge.net/'
 license=('BSD' 'GPL')

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

2015-07-13 Thread Gaetan Bisson 
Date: Tuesday, July 14, 2015 @ 05:00:26
  Author: bisson
Revision: 242180

fix FS#45626

Added:
  conky/trunk/ipv6.patch
Modified:
  conky/trunk/PKGBUILD

+
 PKGBUILD   |5 -
 ipv6.patch |   28 
 2 files changed, 32 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-13 21:15:36 UTC (rev 242179)
+++ PKGBUILD2015-07-14 03:00:26 UTC (rev 242180)
@@ -6,7 +6,7 @@
 
 pkgname=conky
 pkgver=1.10.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Lightweight system monitor for X'
 url='http://conky.sourceforge.net/'
 license=('BSD' 'GPL')
@@ -16,10 +16,12 @@
 source=(https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz;
 'ascii.patch'
 'lua53.patch'
+'ipv6.patch'
 'curl.patch')
 sha1sums=('d5863420150150002947180d0ee96c9ef56c43b1'
   '96cdbc38e8706c8a3120601983df5c7265716128'
   'a3a74542b6524e5663ad37aaba292b48e8bea3b1'
+  'a0899973483d0ad664b60e58b3ba899ba88712af'
   '1c066b439a1e7166d733fb710faa9bf08b81ce4c')
 
 options=('!strip' 'debug')
@@ -28,6 +30,7 @@
cd ${srcdir}/${pkgname}-${pkgver}
patch -p1 -i ../ascii.patch # db2x_manxml fails on non-ascii chars
patch -p1 -i ../lua53.patch # lua_gettable returns an int in lua-5.3
+   patch -p1 -i ../ipv6.patch # https://bugs.archlinux.org/task/45626
patch -p1 -i ../curl.patch # https://github.com/bagder/curl/issues/342
 }
 

Added: ipv6.patch
===
--- ipv6.patch  (rev 0)
+++ ipv6.patch  2015-07-14 03:00:26 UTC (rev 242180)
@@ -0,0 +1,28 @@
+From ee08a9e1b045e8d2f4f13a0e60c2f603b66b0d69 Mon Sep 17 00:00:00 2001
+From: Marc Payne marc...@gmail.com
+Date: Mon, 6 Jul 2015 02:51:43 -0600
+Subject: [PATCH] Close file only if it was successfully opened
+
+If BUILD_IPV6=ON (default), but the user has disabled ipv6 support
+in the kernel using the parameter ipv6.disable=1, then conky fails
+to open /proc/net/if_inet6. This leads to a segfault when conky
+calls fclose(file) regardless. This fix simply moves the fclose call
+into the preceding if statement.
+---
+ src/linux.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/linux.cc b/src/linux.cc
+index 847acac..7977fee 100644
+--- a/src/linux.cc
 b/src/linux.cc
+@@ -643,8 +643,8 @@ int update_net_stats(void)
+   }
+   lastv6-next = NULL;
+   }
++  fclose(file);
+   }
+-  fclose(file);
+ #endif /* BUILD_IPV6 */
+ 
+   first = 0;

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

2015-07-11 Thread Gaetan Bisson 
Date: Saturday, July 11, 2015 @ 21:19:52
  Author: bisson
Revision: 242130

fix FS#45569

Added:
  conky/trunk/curl.patch
Modified:
  conky/trunk/PKGBUILD

+
 PKGBUILD   |   11 ---
 curl.patch |   14 ++
 2 files changed, 22 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-11 18:50:52 UTC (rev 242129)
+++ PKGBUILD2015-07-11 19:19:52 UTC (rev 242130)
@@ -6,7 +6,7 @@
 
 pkgname=conky
 pkgver=1.10.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight system monitor for X'
 url='http://conky.sourceforge.net/'
 license=('BSD' 'GPL')
@@ -15,15 +15,20 @@
 depends=('glib2' 'curl' 'lua' 'wireless_tools' 'libxml2' 'libxft' 'libxdamage' 
'imlib2')
 source=(https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz;
 'ascii.patch'
-'lua53.patch')
+'lua53.patch'
+'curl.patch')
 sha1sums=('d5863420150150002947180d0ee96c9ef56c43b1'
   '96cdbc38e8706c8a3120601983df5c7265716128'
-  'a3a74542b6524e5663ad37aaba292b48e8bea3b1')
+  'a3a74542b6524e5663ad37aaba292b48e8bea3b1'
+  '1c066b439a1e7166d733fb710faa9bf08b81ce4c')
 
+options=('!strip' 'debug')
+
 prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -p1 -i ../ascii.patch # db2x_manxml fails on non-ascii chars
patch -p1 -i ../lua53.patch # lua_gettable returns an int in lua-5.3
+   patch -p1 -i ../curl.patch # https://github.com/bagder/curl/issues/342
 }
 
 build() {

Added: curl.patch
===
--- curl.patch  (rev 0)
+++ curl.patch  2015-07-11 19:19:52 UTC (rev 242130)
@@ -0,0 +1,14 @@
+diff -Naur old/src/ccurl_thread.cc new/src/ccurl_thread.cc
+--- old/src/ccurl_thread.cc2015-06-21 14:49:06.0 -1000
 new/src/ccurl_thread.cc2015-07-11 09:11:49.053040998 -1000
+@@ -119,9 +119,7 @@
+   headers.h = curl_slist_append(headers.h, 
(If-None-Match:  + etag).c_str());
+   etag.clear();
+   }
+-  if (headers.h) {
+-  curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers.h);
+-  }
++  curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers.h);
+ 
+   res = curl_easy_perform(curl);
+   if (res == CURLE_OK) {

[arch-commits] Commit in conky/trunk (PKGBUILD)

2015-06-30 Thread Gaetan Bisson 
Date: Tuesday, June 30, 2015 @ 19:01:44
  Author: bisson
Revision: 241438

implement FS#45506

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-30 14:38:16 UTC (rev 241437)
+++ PKGBUILD2015-06-30 17:01:44 UTC (rev 241438)
@@ -6,7 +6,7 @@
 
 pkgname=conky
 pkgver=1.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight system monitor for X'
 url='http://conky.sourceforge.net/'
 license=('BSD' 'GPL')
@@ -33,7 +33,8 @@
-D CMAKE_BUILD_TYPE=Release \
-D MAINTAINER_MODE=ON \
-D BUILD_CURL=ON \
--D BUILD_IMLIB2=ON \
+   -D BUILD_XDBE=ON \
+   -D BUILD_IMLIB2=ON \
-D BUILD_RSS=ON \
-D BUILD_WEATHER_METAR=ON \
-D BUILD_WEATHER_XOAP=ON \

[arch-commits] Commit in conky/trunk (PKGBUILD PKGBUILD.cmake ascii.patch lua53.patch)

2015-06-29 Thread Gaetan Bisson 
Date: Monday, June 29, 2015 @ 22:21:09
  Author: bisson
Revision: 241400

upstream update

Added:
  conky/trunk/ascii.patch
  conky/trunk/lua53.patch
Modified:
  conky/trunk/PKGBUILD
Deleted:
  conky/trunk/PKGBUILD.cmake

+
 PKGBUILD   |   41 +
 PKGBUILD.cmake |   49 -
 ascii.patch|   12 
 lua53.patch|   46 ++
 4 files changed, 83 insertions(+), 65 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-29 17:51:33 UTC (rev 241399)
+++ PKGBUILD2015-06-29 20:21:09 UTC (rev 241400)
@@ -5,32 +5,41 @@
 # Contributor: Partha Chowdhury kira.lau...@gmail.com
 
 pkgname=conky
-pkgver=1.9.0
-pkgrel=7
+pkgver=1.10.0
+pkgrel=1
 pkgdesc='Lightweight system monitor for X'
 url='http://conky.sourceforge.net/'
 license=('BSD' 'GPL')
 arch=('i686' 'x86_64')
-makedepends=('docbook2x')
+makedepends=('cmake' 'docbook2x' 'docbook-xml' 'man-db')
 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=(https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz;
+'ascii.patch'
+'lua53.patch')
+sha1sums=('d5863420150150002947180d0ee96c9ef56c43b1'
+  '96cdbc38e8706c8a3120601983df5c7265716128'
+  'a3a74542b6524e5663ad37aaba292b48e8bea3b1')
 
-backup=('etc/conky/'conky{,_no_x11}.conf)
-options=('!emptydirs')
+prepare() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   patch -p1 -i ../ascii.patch # db2x_manxml fails on non-ascii chars
+   patch -p1 -i ../lua53.patch # lua_gettable returns an int in lua-5.3
+}
 
 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 \
+   cmake \
+   -D CMAKE_BUILD_TYPE=Release \
+   -D MAINTAINER_MODE=ON \
+   -D BUILD_CURL=ON \
+-D BUILD_IMLIB2=ON \
+   -D BUILD_RSS=ON \
+   -D BUILD_WEATHER_METAR=ON \
+   -D BUILD_WEATHER_XOAP=ON \
+   -D BUILD_WLAN=ON \
+   -D CMAKE_INSTALL_PREFIX=/usr \
+   .
 
make
 }

Deleted: PKGBUILD.cmake
===
--- PKGBUILD.cmake  2015-06-29 17:51:33 UTC (rev 241399)
+++ PKGBUILD.cmake  2015-06-29 20:21:09 UTC (rev 241400)
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $
-# Contributor: Giovanni Scafora giova...@archlinux.org
-# Contributor: James Rayner ja...@archlinux.org
-# Contributor: Partha Chowdhury kira.lau...@gmail.com
-# Maintainer: Gaetan Bisson bis...@archlinux.org
-
-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
-}

Added: ascii.patch
===
--- ascii.patch (rev 0)
+++ ascii.patch 2015-06-29 20:21:09 UTC (rev 241400)
@@ -0,0 +1,12 @@
+diff -aur old/doc/config_settings.xml new/doc/config_settings.xml

[arch-commits] Commit in conky/trunk (PKGBUILD)

2015-05-04 Thread Gaetan Bisson 
Date: Monday, May 4, 2015 @ 21:01:13
  Author: bisson
Revision: 238471

rebuild for lua-5.3

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-04 16:26:28 UTC (rev 238470)
+++ PKGBUILD2015-05-04 19:01:13 UTC (rev 238471)
@@ -6,7 +6,7 @@
 
 pkgname=conky
 pkgver=1.9.0
-pkgrel=6
+pkgrel=7
 pkgdesc='Lightweight system monitor for X'
 url='http://conky.sourceforge.net/'
 license=('BSD' 'GPL')

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

2015-03-18 Thread Gaetan Bisson 
Date: Wednesday, March 18, 2015 @ 17:15:56
  Author: bisson
Revision: 234101

fix FS#44239, that is, revert fix for FS#44187

Modified:
  conky/trunk/PKGBUILD
Deleted:
  conky/trunk/argb.patch

+
 PKGBUILD   |   13 +++--
 argb.patch |   51 ---
 2 files changed, 3 insertions(+), 61 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-18 14:38:12 UTC (rev 234100)
+++ PKGBUILD2015-03-18 16:15:56 UTC (rev 234101)
@@ -6,7 +6,7 @@
 
 pkgname=conky
 pkgver=1.9.0
-pkgrel=5
+pkgrel=6
 pkgdesc='Lightweight system monitor for X'
 url='http://conky.sourceforge.net/'
 license=('BSD' 'GPL')
@@ -13,19 +13,12 @@
 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')
+source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz;)
+sha1sums=('a8d26d002370c9b877ae77ad3a3bbd2566b38e5d')
 
 backup=('etc/conky/'conky{,_no_x11}.conf)
 options=('!emptydirs')
 
-prepare() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   patch -p0 -i ../argb.patch
-}
-
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
 

Deleted: argb.patch
===
--- argb.patch  2015-03-18 14:38:12 UTC (rev 234100)
+++ argb.patch  2015-03-18 16:15:56 UTC (rev 234101)
@@ -1,51 +0,0 @@
-diff -Naur src/conky.c src/conky.c
 src/conky.c2015-03-11 22:02:31.0 -0400
-+++ src/conky.c2015-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.0 -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);
-

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

2015-03-16 Thread Gaetan Bisson 
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
===
--- PKGBUILD2015-03-16 22:23:47 UTC (rev 233961)
+++ PKGBUILD2015-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.c2015-03-11 22:02:31.0 -0400
 src/conky.c2015-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.0 -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);
+

[arch-commits] Commit in conky/trunk (PKGBUILD)

2014-02-02 Thread Gaetan Bisson 
Date: Sunday, February 2, 2014 @ 19:55:20
  Author: bisson
Revision: 204984

rebuild for wireless_tools-30.pre9, for real this time

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-02 18:51:29 UTC (rev 204983)
+++ PKGBUILD2014-02-02 18:55:20 UTC (rev 204984)
@@ -6,7 +6,7 @@
 
 pkgname=conky
 pkgver=1.9.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Lightweight system monitor for X'
 url='http://conky.sourceforge.net/'
 license=('BSD' 'GPL')

[arch-commits] Commit in conky/trunk (PKGBUILD)

2014-01-30 Thread Gaetan Bisson 
Date: Thursday, January 30, 2014 @ 19:01:24
  Author: bisson
Revision: 204886

rebuild for wireless_tools-30

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-30 17:24:29 UTC (rev 204885)
+++ PKGBUILD2014-01-30 18:01:24 UTC (rev 204886)
@@ -6,7 +6,7 @@
 
 pkgname=conky
 pkgver=1.9.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight system monitor for X'
 url='http://conky.sourceforge.net/'
 license=('BSD' 'GPL')

[arch-commits] Commit in conky/trunk (PKGBUILD)

2013-11-07 Thread Gaetan Bisson 
Date: Friday, November 8, 2013 @ 04:16:54
  Author: bisson
Revision: 199064

implement FS#37646, remove unused alsa-lib dep

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |   12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-08 02:00:12 UTC (rev 199063)
+++ PKGBUILD2013-11-08 03:16:54 UTC (rev 199064)
@@ -1,24 +1,23 @@
 # $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
 # Contributor: Giovanni Scafora giova...@archlinux.org
 # Contributor: James Rayner ja...@archlinux.org
 # Contributor: Partha Chowdhury kira.lau...@gmail.com
-# Maintainer: Gaetan Bisson bis...@archlinux.org
 
 pkgname=conky
 pkgver=1.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight system monitor for X'
 url='http://conky.sourceforge.net/'
 license=('BSD' 'GPL')
 arch=('i686' 'x86_64')
-options=('!emptydirs')
 makedepends=('docbook2x')
-depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 
'libxdamage' 'imlib2')
-backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
+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')
 
-replaces=('torsmo')
+backup=('etc/conky/'conky{,_no_x11}.conf)
+options=('!emptydirs')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -31,7 +30,6 @@
--enable-rss \
--enable-weather-xoap \
--enable-imlib2 \
-   --disable-lua \
--enable-wlan \
 
make

[arch-commits] Commit in conky/trunk (PKGBUILD)

2012-05-03 Thread Gaetan Bisson 
Date: Thursday, May 3, 2012 @ 19:53:48
  Author: bisson
Revision: 158527

upstream update

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |   14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-03 23:42:05 UTC (rev 158526)
+++ PKGBUILD2012-05-03 23:53:48 UTC (rev 158527)
@@ -5,28 +5,24 @@
 # Maintainer: Gaetan Bisson bis...@archlinux.org
 
 pkgname=conky
-pkgver=1.8.2git2007
-pkgrel=2
+pkgver=1.9.0
+pkgrel=1
 pkgdesc='Lightweight system monitor for X'
 url='http://conky.sourceforge.net/'
 license=('BSD' 'GPL')
 arch=('i686' 'x86_64')
 options=('!emptydirs')
-makedepends=('pkg-config' 'docbook2x')
+makedepends=('docbook2x')
 depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 
'libxdamage' 'imlib2')
 backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz;)
-sha1sums=('133fc6fdc725162af9a98c72c1b7349efc22447c')
+source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz;)
+sha1sums=('a8d26d002370c9b877ae77ad3a3bbd2566b38e5d')
 
-# git clone git://git.omp.am/conky.git; cd conky; git archive 
--prefix=${pkgname}-${pkgver}/ origin/1.8.2 | xz  
../${pkgname}-${pkgver}.tar.xz
-
 replaces=('torsmo')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
 
-   sh autogen.sh
-
CPPFLAGS=${CXXFLAGS} LIBS=${LDFLAGS} ./configure \
--prefix=/usr \
--sysconfdir=/etc \

[arch-commits] Commit in conky/trunk (PKGBUILD PKGBUILD.cmake)

2012-02-14 Thread Gaetan Bisson 
Date: Tuesday, February 14, 2012 @ 22:03:10
  Author: bisson
Revision: 150214

implement FS#28435

Modified:
  conky/trunk/PKGBUILD
  conky/trunk/PKGBUILD.cmake

+
 PKGBUILD   |6 --
 PKGBUILD.cmake |2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-14 22:44:26 UTC (rev 150213)
+++ PKGBUILD2012-02-15 03:03:10 UTC (rev 150214)
@@ -6,7 +6,7 @@
 
 pkgname=conky
 pkgver=1.8.2git2007
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight system monitor for X'
 url='http://conky.sourceforge.net/'
 license=('BSD' 'GPL')
@@ -44,5 +44,7 @@
 package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
-   install -D -m644 COPYING 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+   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
 }

Modified: PKGBUILD.cmake
===
--- PKGBUILD.cmake  2012-02-14 22:44:26 UTC (rev 150213)
+++ PKGBUILD.cmake  2012-02-15 03:03:10 UTC (rev 150214)
@@ -44,4 +44,6 @@
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
 }

[arch-commits] Commit in conky/trunk (PKGBUILD)

2011-11-06 Thread Gaetan Bisson 
Date: Monday, November 7, 2011 @ 00:35:35
  Author: bisson
Revision: 142241

tiny upstream update

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-07 04:19:17 UTC (rev 142240)
+++ PKGBUILD2011-11-07 05:35:35 UTC (rev 142241)
@@ -5,7 +5,7 @@
 # Maintainer: Gaetan Bisson bis...@archlinux.org
 
 pkgname=conky
-pkgver=1.8.2git20111026
+pkgver=1.8.2git2007
 pkgrel=1
 pkgdesc='Lightweight system monitor for X'
 url='http://conky.sourceforge.net/'
@@ -16,7 +16,7 @@
 depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 
'libxdamage' 'imlib2')
 backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
 source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz;)
-sha1sums=('735861b284ad4feb86a9febaf4e457a4fcc7b39b')
+sha1sums=('133fc6fdc725162af9a98c72c1b7349efc22447c')
 
 # git clone git://git.omp.am/conky.git; cd conky; git archive 
--prefix=${pkgname}-${pkgver}/ origin/1.8.2 | xz  
../${pkgname}-${pkgver}.tar.xz
 
@@ -27,7 +27,7 @@
 
sh autogen.sh
 
-   CPPFLAGS=$CXXFLAGS LIBS=$LDFLAGS ./configure \
+   CPPFLAGS=${CXXFLAGS} LIBS=${LDFLAGS} ./configure \
--prefix=/usr \
--sysconfdir=/etc \
--enable-ibm \

[arch-commits] Commit in conky/trunk (PKGBUILD)

2011-10-25 Thread Gaetan Bisson 
Date: Tuesday, October 25, 2011 @ 20:35:59
  Author: bisson
Revision: 141203

upstream update, fix FS#26620

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-25 22:33:47 UTC (rev 141202)
+++ PKGBUILD2011-10-26 00:35:59 UTC (rev 141203)
@@ -5,7 +5,7 @@
 # Maintainer: Gaetan Bisson bis...@archlinux.org
 
 pkgname=conky
-pkgver=1.8.2git20111024
+pkgver=1.8.2git20111026
 pkgrel=1
 pkgdesc='Lightweight system monitor for X'
 url='http://conky.sourceforge.net/'
@@ -16,7 +16,7 @@
 depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 
'libxdamage' 'imlib2')
 backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
 source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz;)
-sha1sums=('490f5ffb431bffee71f7bf32f94cf611ae4f0646')
+sha1sums=('735861b284ad4feb86a9febaf4e457a4fcc7b39b')
 
 # git clone git://git.omp.am/conky.git; cd conky; git archive 
--prefix=${pkgname}-${pkgver}/ origin/1.8.2 | xz  
../${pkgname}-${pkgver}.tar.xz

[arch-commits] Commit in conky/trunk (PKGBUILD PKGBUILD.cmake current-power.patch)

2011-10-23 Thread Gaetan Bisson 
Date: Sunday, October 23, 2011 @ 20:40:26
  Author: bisson
Revision: 141102

switch to upstream git snapshot

Added:
  conky/trunk/PKGBUILD.cmake
Modified:
  conky/trunk/PKGBUILD
Deleted:
  conky/trunk/current-power.patch

-+
 PKGBUILD|   27 ++-
 PKGBUILD.cmake  |   47 +++
 current-power.patch |   12 
 3 files changed, 61 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-23 23:38:04 UTC (rev 141101)
+++ PKGBUILD2011-10-24 00:40:26 UTC (rev 141102)
@@ -5,28 +5,29 @@
 # Maintainer: Gaetan Bisson bis...@archlinux.org
 
 pkgname=conky
-pkgver=1.8.1
-pkgrel=3
-pkgdesc='An advanced, highly configurable system monitor for X based on torsmo'
+pkgver=1.8.2git20111024
+pkgrel=1
+pkgdesc='Lightweight system monitor for X'
+url='http://conky.sourceforge.net/'
+license=('BSD' 'GPL')
 arch=('i686' 'x86_64')
-url='http://conky.sourceforge.net/'
-license=('custom')
-replaces=('torsmo')
-makedepends=('pkg-config')
+options=('!emptydirs')
+makedepends=('pkg-config' 'docbook2x')
 depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 
'libxdamage' 'imlib2')
 backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
-source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz;
-'current-power.patch')
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz;)
+sha1sums=('490f5ffb431bffee71f7bf32f94cf611ae4f0646')
 
-sha1sums=('06bbe9b7eed8603fa7a971b27c5c61f38424ac6f'
-  '2eeef0cc5a0b612826b2a7f0b43b7a3b7e10bf0b')
+# git clone git://git.omp.am/conky.git; cd conky; git archive 
--prefix=${pkgname}-${pkgver}/ origin/1.8.2 | xz  
../${pkgname}-${pkgver}.tar.xz
 
+replaces=('torsmo')
+
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
 
-   patch -p1  ../current-power.patch # See FS#21984
+   sh autogen.sh
 
-   ./configure \
+   CPPFLAGS=$CXXFLAGS LIBS=$LDFLAGS ./configure \
--prefix=/usr \
--sysconfdir=/etc \
--enable-ibm \

Added: PKGBUILD.cmake
===
--- PKGBUILD.cmake  (rev 0)
+++ PKGBUILD.cmake  2011-10-24 00:40:26 UTC (rev 141102)
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $
+# Contributor: Giovanni Scafora giova...@archlinux.org
+# Contributor: James Rayner ja...@archlinux.org
+# Contributor: Partha Chowdhury kira.lau...@gmail.com
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+
+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}
+}

Deleted: current-power.patch
===
--- current-power.patch 2011-10-23 23:38:04 UTC (rev 141101)
+++ current-power.patch 2011-10-24 00:40:26 UTC (rev 141102)
@@ -1,12 +0,0 @@
-diff -aur old/src/linux.c new/src/linux.c
 old/src/linux.c2010-10-05 23:29:36.0 +0200
-+++ new/src/linux.c2010-12-06 22:18:59.346667183 +0100
-@@ -1671,6 +1671,8 @@
-   the tradition! */
-   else if (strncmp(buf, POWER_SUPPLY_CURRENT_NOW=, 25) 
== 0)
-   sscanf(buf, POWER_SUPPLY_CURRENT_NOW=%d, 
present_rate);
-+  else if (strncmp(buf, POWER_SUPPLY_POWER_NOW=, 23) == 
0)
-+  sscanf(buf, POWER_SUPPLY_POWER_NOW=%d, 
present_rate);
-   else if (strncmp(buf, POWER_SUPPLY_ENERGY_NOW=, 24) 
== 0)
-   sscanf(buf, POWER_SUPPLY_ENERGY_NOW=%d,

[arch-commits] Commit in conky/trunk (PKGBUILD)

2011-04-09 Thread Gaetan Bisson 
Date: Saturday, April 9, 2011 @ 06:32:42
  Author: bisson
Revision: 118899

add weather support through curl (FS#23660), enable curl explicitly

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |   18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-09 10:13:37 UTC (rev 118898)
+++ PKGBUILD2011-04-09 10:32:42 UTC (rev 118899)
@@ -1,18 +1,19 @@
 # $Id$
-# Maintainer: Giovanni Scafora giova...@archlinux.org
+# Contributor: Giovanni Scafora giova...@archlinux.org
 # Contributor: James Rayner ja...@archlinux.org
-# Contributor:  Partha Chowdhury kira.lau...@gmail.com
+# Contributor: Partha Chowdhury kira.lau...@gmail.com
+# Maintainer: Gaetan Bisson bis...@archlinux.org
 
 pkgname=conky
 pkgver=1.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc='An advanced, highly configurable system monitor for X based on torsmo'
 arch=('i686' 'x86_64')
 url='http://conky.sourceforge.net/'
 license=('custom')
 replaces=('torsmo')
+makedepends=('pkg-config')
 depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 
'libxdamage' 'imlib2')
-makedepends=('pkg-config')
 backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
 
source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz;
 'current-power.patch')
@@ -28,11 +29,14 @@
./configure \
--prefix=/usr \
--sysconfdir=/etc \
-   --enable-wlan \
+   --enable-ibm \
+   --enable-curl \
--enable-rss \
-   --enable-ibm \
+   --enable-weather-xoap \
--enable-imlib2 \
-   --disable-lua
+   --disable-lua \
+   --enable-wlan \
+
make
 }

[arch-commits] Commit in conky/trunk (PKGBUILD current-power.patch)

2010-12-06 Thread Gaetan Bisson 
Date: Monday, December 6, 2010 @ 16:41:49
  Author: bisson
Revision: 102220

fix FS#21984

Added:
  conky/trunk/current-power.patch
Modified:
  conky/trunk/PKGBUILD

-+
 PKGBUILD|   12 +---
 current-power.patch |   12 
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-06 21:15:06 UTC (rev 102219)
+++ PKGBUILD2010-12-06 21:41:49 UTC (rev 102220)
@@ -5,7 +5,7 @@
 
 pkgname=conky
 pkgver=1.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc='An advanced, highly configurable system monitor for X based on torsmo'
 arch=('i686' 'x86_64')
 url='http://conky.sourceforge.net/'
@@ -14,11 +14,17 @@
 depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 
'libxdamage' 'imlib2')
 makedepends=('pkg-config')
 backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
-source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz;)
-sha1sums=('06bbe9b7eed8603fa7a971b27c5c61f38424ac6f')
+source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz;
+'current-power.patch')
 
+sha1sums=('06bbe9b7eed8603fa7a971b27c5c61f38424ac6f'
+  '2eeef0cc5a0b612826b2a7f0b43b7a3b7e10bf0b')
+
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
+
+   patch -p1  ../current-power.patch # See FS#21984
+
./configure \
--prefix=/usr \
--sysconfdir=/etc \

Added: current-power.patch
===
--- current-power.patch (rev 0)
+++ current-power.patch 2010-12-06 21:41:49 UTC (rev 102220)
@@ -0,0 +1,12 @@
+diff -aur old/src/linux.c new/src/linux.c
+--- old/src/linux.c2010-10-05 23:29:36.0 +0200
 new/src/linux.c2010-12-06 22:18:59.346667183 +0100
+@@ -1671,6 +1671,8 @@
+   the tradition! */
+   else if (strncmp(buf, POWER_SUPPLY_CURRENT_NOW=, 25) 
== 0)
+   sscanf(buf, POWER_SUPPLY_CURRENT_NOW=%d, 
present_rate);
++  else if (strncmp(buf, POWER_SUPPLY_POWER_NOW=, 23) == 
0)
++  sscanf(buf, POWER_SUPPLY_POWER_NOW=%d, 
present_rate);
+   else if (strncmp(buf, POWER_SUPPLY_ENERGY_NOW=, 24) 
== 0)
+   sscanf(buf, POWER_SUPPLY_ENERGY_NOW=%d, 
remaining_capacity);
+   else if (strncmp(buf, POWER_SUPPLY_ENERGY_FULL=, 25) 
== 0)

[arch-commits] Commit in conky/trunk (PKGBUILD)

2010-10-07 Thread Gaetan Bisson 
Date: Thursday, October 7, 2010 @ 12:30:21
  Author: bisson
Revision: 94510

upstream update

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |   39 ++-
 1 file changed, 22 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-07 16:18:10 UTC (rev 94509)
+++ PKGBUILD2010-10-07 16:30:21 UTC (rev 94510)
@@ -4,29 +4,34 @@
 # Contributor:  Partha Chowdhury kira.lau...@gmail.com
 
 pkgname=conky
-pkgver=1.8.0
+pkgver=1.8.1
 pkgrel=1
-pkgdesc=An advanced, highly configurable system monitor for X based on torsmo
+pkgdesc='An advanced, highly configurable system monitor for X based on torsmo'
 arch=('i686' 'x86_64')
-url=http://conky.sourceforge.net/;
+url='http://conky.sourceforge.net/'
 license=('custom')
 replaces=('torsmo')
 depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 
'libxdamage' 'imlib2')
 makedepends=('pkgconfig')
-backup=(etc/conky/conky.conf etc/conky/conky_no_x11.conf)
-source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('494cbaf1108cfdb977fc80454d9b13e2')
+backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
+source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz;)
+sha1sums=('06bbe9b7eed8603fa7a971b27c5c61f38424ac6f')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-  --sysconfdir=/etc \
-  --enable-wlan \
- --enable-rss \
- --enable-ibm \
- --enable-imlib2 \
- --disable-lua
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+   cd ${srcdir}/${pkgname}-${pkgver}
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --enable-wlan \
+   --enable-rss \
+   --enable-ibm \
+   --enable-imlib2 \
+   --disable-lua
+   make
 }
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+   install -D -m644 COPYING 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}

[arch-commits] Commit in conky/trunk (PKGBUILD)

2010-10-07 Thread Gaetan Bisson 
Date: Thursday, October 7, 2010 @ 12:32:06
  Author: bisson
Revision: 94515

Modified:
  conky/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-07 16:31:09 UTC (rev 94514)
+++ PKGBUILD2010-10-07 16:32:06 UTC (rev 94515)
@@ -12,7 +12,7 @@
 license=('custom')
 replaces=('torsmo')
 depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 
'libxdamage' 'imlib2')
-makedepends=('pkgconfig')
+makedepends=('pkg-config')
 backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
 
source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz;)
 sha1sums=('06bbe9b7eed8603fa7a971b27c5c61f38424ac6f')

[arch-commits] Commit in conky/trunk (PKGBUILD fix_hwmon_for_2.6.31.patch)

2010-03-30 Thread Giovanni Scafora 
Date: Tuesday, March 30, 2010 @ 18:54:24
  Author: giovanni
Revision: 74433

upgpkg: conky 1.8.0-1
upstream release

Modified:
  conky/trunk/PKGBUILD
Deleted:
  conky/trunk/fix_hwmon_for_2.6.31.patch

+
 PKGBUILD   |   16 +++--
 fix_hwmon_for_2.6.31.patch |   72 ---
 2 files changed, 6 insertions(+), 82 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-30 22:41:45 UTC (rev 74432)
+++ PKGBUILD2010-03-30 22:54:24 UTC (rev 74433)
@@ -4,8 +4,8 @@
 # Contributor:  Partha Chowdhury kira.lau...@gmail.com
 
 pkgname=conky
-pkgver=1.7.2
-pkgrel=5
+pkgver=1.8.0
+pkgrel=1
 pkgdesc=An advanced, highly configurable system monitor for X based on torsmo
 arch=('i686' 'x86_64')
 url=http://conky.sourceforge.net/;
@@ -14,15 +14,11 @@
 depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 
'libxdamage' 'imlib2')
 makedepends=('pkgconfig')
 backup=(etc/conky/conky.conf etc/conky/conky_no_x11.conf)
-source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
-fix_hwmon_for_2.6.31.patch)
-md5sums=('cf6f5d45d42ad68c618c00271813b80d'
- '679475fc92700a90c0f38c393532ba1d')
+source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('494cbaf1108cfdb977fc80454d9b13e2')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  #  FS#16584
-  patch -Np1 -i ${srcdir}/fix_hwmon_for_2.6.31.patch || return 1
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr \
   --sysconfdir=/etc \
   --enable-wlan \
@@ -31,6 +27,6 @@
  --enable-imlib2 \
  --disable-lua
   make || return 1
-  make DESTDIR=${pkgdir} install
+  make DESTDIR=${pkgdir} install || return 1
   install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }

Deleted: fix_hwmon_for_2.6.31.patch
===
--- fix_hwmon_for_2.6.31.patch  2010-03-30 22:41:45 UTC (rev 74432)
+++ fix_hwmon_for_2.6.31.patch  2010-03-30 22:54:24 UTC (rev 74433)
@@ -1,72 +0,0 @@
-This should make conky compatible with the karmic kernel (2.6.31) and maintain
-also compatibility with older kernels.
-See LP #435571.
-
-Index: conky-1.7.2/src/linux.c
-===
 conky-1.7.2.orig/src/linux.c   2009-08-08 22:05:55.0 +0200
-+++ conky-1.7.2/src/linux.c2009-10-15 18:33:30.0 +0200
-@@ -858,23 +858,16 @@
-   }
- 
-   if (strcmp(dir, /sys/class/hwmon/) == 0) {
--  if (*buf) {
--  /* buf holds result from 
get_first_file_in_a_directory() above,
--   * e.g. hwmon0 -- append /device */
--  strcat(buf, /device);
--  } else {
--  /* dev holds device number N as a string,
--   * e.g. 0, -- convert to hwmon0/device */
--  sprintf(buf, hwmon%s/device, dev);
--  dev = buf;
--  }
--  }
--
--  /* At least the acpitz hwmon doesn't have a 'device' subdir,
--   * so check it's existence and strip it from buf otherwise. */
--  snprintf(path, 255, %s%s, dir, dev);
--  if (stat(path, st)) {
--  buf[strlen(buf) - 7] = 0;
-+if (*buf) {
-+  /* buf holds result from get_first_file_in_a_directory() above,
-+   * e.g. hwmon0 -- append /device */
-+  strcat(buf, /device);
-+} else {
-+  /* dev holds device number N as a string,
-+   * e.g. 0, -- convert to hwmon0/device */
-+  sprintf(buf, hwmon%s/device, dev);
-+  dev = buf;
-+}
-   }
- 
-   /* change vol to in, tempf to temp */
-@@ -884,16 +877,25 @@
-   type = temp;
-   }
- 
-+  /* construct path */
-   snprintf(path, 255, %s%s/%s%d_input, dir, dev, type, n);
--  strncpy(devtype, path, 255);
- 
--  /* open file */
-+  /* first, attempt to open file in /device */
-   fd = open(path, O_RDONLY);
-   if (fd  0) {
--  CRIT_ERR(NULL, NULL, can't open '%s': %s\nplease check your 
device or remove this 
--  var from PACKAGE_NAME, path, strerror(errno));
-+
-+/* if it fails, strip the /device from dev and attempt again */
-+buf[strlen(buf) - 7] = 0;
-+snprintf(path, 255, %s%s/%s%d_input, dir, dev, type, n);
-+fd = open(path, O_RDONLY);
-+if (fd  0) {
-+  CRIT_ERR(NULL, NULL, can't open '%s': %s\nplease check your device 
or remove this 
-+   var from PACKAGE_NAME, path, strerror(errno));
-+}
-   }
- 
-+  strncpy(devtype, path, 255);
-+
-   if (strcmp(type, in) == 0 || strcmp(type, temp) == 0
-   ||