[arch-commits] Commit in conky/repos (12 files)

Allan McRae allan at archlinux.org
Thu Sep 10 05:22:59 UTC 2015


    Date: Thursday, September 10, 2015 @ 07:22:58
  Author: allan
Revision: 245689

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

Added:
  conky/repos/staging-i686/
  conky/repos/staging-i686/PKGBUILD
    (from rev 245688, conky/trunk/PKGBUILD)
  conky/repos/staging-i686/ascii.patch
    (from rev 245688, conky/trunk/ascii.patch)
  conky/repos/staging-i686/curl.patch
    (from rev 245688, conky/trunk/curl.patch)
  conky/repos/staging-i686/ipv6.patch
    (from rev 245688, conky/trunk/ipv6.patch)
  conky/repos/staging-i686/lua53.patch
    (from rev 245688, conky/trunk/lua53.patch)
  conky/repos/staging-x86_64/
  conky/repos/staging-x86_64/PKGBUILD
    (from rev 245688, conky/trunk/PKGBUILD)
  conky/repos/staging-x86_64/ascii.patch
    (from rev 245688, conky/trunk/ascii.patch)
  conky/repos/staging-x86_64/curl.patch
    (from rev 245688, conky/trunk/curl.patch)
  conky/repos/staging-x86_64/ipv6.patch
    (from rev 245688, conky/trunk/ipv6.patch)
  conky/repos/staging-x86_64/lua53.patch
    (from rev 245688, conky/trunk/lua53.patch)

----------------------------+
 staging-i686/PKGBUILD      |   62 +++++++++++++++++++++++++++++++++++++++++++
 staging-i686/ascii.patch   |   12 ++++++++
 staging-i686/curl.patch    |   14 +++++++++
 staging-i686/ipv6.patch    |   28 +++++++++++++++++++
 staging-i686/lua53.patch   |   46 +++++++++++++++++++++++++++++++
 staging-x86_64/PKGBUILD    |   62 +++++++++++++++++++++++++++++++++++++++++++
 staging-x86_64/ascii.patch |   12 ++++++++
 staging-x86_64/curl.patch  |   14 +++++++++
 staging-x86_64/ipv6.patch  |   28 +++++++++++++++++++
 staging-x86_64/lua53.patch |   46 +++++++++++++++++++++++++++++++
 10 files changed, 324 insertions(+)

Copied: conky/repos/staging-i686/PKGBUILD (from rev 245688, conky/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2015-09-10 05:22:58 UTC (rev 245689)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: James Rayner <james at archlinux.org>
+# Contributor: Partha Chowdhury <kira.laucas at gmail.com>
+
+pkgname=conky
+pkgver=1.10.0
+pkgrel=5
+pkgdesc='Lightweight system monitor for X'
+url='http://conky.sourceforge.net/'
+license=('BSD' 'GPL')
+arch=('i686' 'x86_64')
+makedepends=('cmake' 'docbook2x' 'docbook-xml' 'man-db')
+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')
+
+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() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	cmake \
+		-D CMAKE_BUILD_TYPE=Release \
+		-D MAINTAINER_MODE=ON \
+		-D BUILD_CURL=ON \
+		-D BUILD_XDBE=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
+}
+
+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/staging-i686/ascii.patch (from rev 245688, conky/trunk/ascii.patch)
===================================================================
--- staging-i686/ascii.patch	                        (rev 0)
+++ staging-i686/ascii.patch	2015-09-10 05:22:58 UTC (rev 245689)
@@ -0,0 +1,12 @@
+diff -aur old/doc/config_settings.xml new/doc/config_settings.xml
+--- old/doc/config_settings.xml	2015-06-21 14:49:06.000000000 -1000
++++ new/doc/config_settings.xml	2015-06-29 10:05:00.147318479 -1000
+@@ -80,7 +80,7 @@
+         </term>
+         <listitem>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.
+         <para /></listitem>
+     </varlistentry>
+     <varlistentry>

Copied: conky/repos/staging-i686/curl.patch (from rev 245688, conky/trunk/curl.patch)
===================================================================
--- staging-i686/curl.patch	                        (rev 0)
+++ staging-i686/curl.patch	2015-09-10 05:22:58 UTC (rev 245689)
@@ -0,0 +1,14 @@
+diff -Naur old/src/ccurl_thread.cc new/src/ccurl_thread.cc
+--- old/src/ccurl_thread.cc	2015-06-21 14:49:06.000000000 -1000
++++ new/src/ccurl_thread.cc	2015-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) {

Copied: conky/repos/staging-i686/ipv6.patch (from rev 245688, conky/trunk/ipv6.patch)
===================================================================
--- staging-i686/ipv6.patch	                        (rev 0)
+++ staging-i686/ipv6.patch	2015-09-10 05:22:58 UTC (rev 245689)
@@ -0,0 +1,28 @@
+From ee08a9e1b045e8d2f4f13a0e60c2f603b66b0d69 Mon Sep 17 00:00:00 2001
+From: Marc Payne <marc321 at 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;

Copied: conky/repos/staging-i686/lua53.patch (from rev 245688, conky/trunk/lua53.patch)
===================================================================
--- staging-i686/lua53.patch	                        (rev 0)
+++ staging-i686/lua53.patch	2015-09-10 05:22:58 UTC (rev 245689)
@@ -0,0 +1,46 @@
+diff -aur old/src/luamm.cc new/src/luamm.cc
+--- old/src/luamm.cc	2015-06-28 16:38:47.793615922 -1000
++++ new/src/luamm.cc	2015-06-29 09:05:44.646667638 -1000
+@@ -165,7 +165,14 @@
+ 		}
+ 
+ 		template<void (*misc)(lua_State *, int), int nresults>
+-		int safe_misc_trampoline(lua_State *l)
++		int safe_misc_trampoline_set(lua_State *l)
++		{
++			misc(l, 1);
++			return nresults;
++		}
++
++		template<int (*misc)(lua_State *, int), int nresults>
++		int safe_misc_trampoline_get(lua_State *l)
+ 		{
+ 			misc(l, 1);
+ 			return nresults;
+@@ -326,7 +333,7 @@
+ 		if( rawequal(index1, index2) )
+ 			return true;
+ 
+-		return safe_compare(&safe_compare_trampoline<lua_equal>, index1, index2);
++		return safe_compare(&safe_compare_trampoline<&lua_equal>, index1, index2);
+ 	}
+ 
+ 	int state::gc(int what, int data)
+@@ -367,7 +374,7 @@
+ 		checkstack(2);
+ 		pushvalue(index);
+ 		insert(-2);
+-		lua_pushcfunction(cobj.get(), (&safe_misc_trampoline<&lua_gettable, 1>));
++		lua_pushcfunction(cobj.get(), (&safe_misc_trampoline_get<&lua_gettable, 1>));
+ 		insert(-3);
+ 		call(2, 1, 0);
+ 	}
+@@ -492,7 +499,7 @@
+ 		checkstack(2);
+ 		pushvalue(index);
+ 		insert(-3);
+-		lua_pushcfunction(cobj.get(), (&safe_misc_trampoline<&lua_settable, 0>));
++		lua_pushcfunction(cobj.get(), (&safe_misc_trampoline_set<&lua_settable, 0>));
+ 		insert(-4);
+ 		call(3, 0, 0);
+ 	}

Copied: conky/repos/staging-x86_64/PKGBUILD (from rev 245688, conky/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2015-09-10 05:22:58 UTC (rev 245689)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: James Rayner <james at archlinux.org>
+# Contributor: Partha Chowdhury <kira.laucas at gmail.com>
+
+pkgname=conky
+pkgver=1.10.0
+pkgrel=5
+pkgdesc='Lightweight system monitor for X'
+url='http://conky.sourceforge.net/'
+license=('BSD' 'GPL')
+arch=('i686' 'x86_64')
+makedepends=('cmake' 'docbook2x' 'docbook-xml' 'man-db')
+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')
+
+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() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	cmake \
+		-D CMAKE_BUILD_TYPE=Release \
+		-D MAINTAINER_MODE=ON \
+		-D BUILD_CURL=ON \
+		-D BUILD_XDBE=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
+}
+
+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/staging-x86_64/ascii.patch (from rev 245688, conky/trunk/ascii.patch)
===================================================================
--- staging-x86_64/ascii.patch	                        (rev 0)
+++ staging-x86_64/ascii.patch	2015-09-10 05:22:58 UTC (rev 245689)
@@ -0,0 +1,12 @@
+diff -aur old/doc/config_settings.xml new/doc/config_settings.xml
+--- old/doc/config_settings.xml	2015-06-21 14:49:06.000000000 -1000
++++ new/doc/config_settings.xml	2015-06-29 10:05:00.147318479 -1000
+@@ -80,7 +80,7 @@
+         </term>
+         <listitem>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.
+         <para /></listitem>
+     </varlistentry>
+     <varlistentry>

Copied: conky/repos/staging-x86_64/curl.patch (from rev 245688, conky/trunk/curl.patch)
===================================================================
--- staging-x86_64/curl.patch	                        (rev 0)
+++ staging-x86_64/curl.patch	2015-09-10 05:22:58 UTC (rev 245689)
@@ -0,0 +1,14 @@
+diff -Naur old/src/ccurl_thread.cc new/src/ccurl_thread.cc
+--- old/src/ccurl_thread.cc	2015-06-21 14:49:06.000000000 -1000
++++ new/src/ccurl_thread.cc	2015-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) {

Copied: conky/repos/staging-x86_64/ipv6.patch (from rev 245688, conky/trunk/ipv6.patch)
===================================================================
--- staging-x86_64/ipv6.patch	                        (rev 0)
+++ staging-x86_64/ipv6.patch	2015-09-10 05:22:58 UTC (rev 245689)
@@ -0,0 +1,28 @@
+From ee08a9e1b045e8d2f4f13a0e60c2f603b66b0d69 Mon Sep 17 00:00:00 2001
+From: Marc Payne <marc321 at 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;

Copied: conky/repos/staging-x86_64/lua53.patch (from rev 245688, conky/trunk/lua53.patch)
===================================================================
--- staging-x86_64/lua53.patch	                        (rev 0)
+++ staging-x86_64/lua53.patch	2015-09-10 05:22:58 UTC (rev 245689)
@@ -0,0 +1,46 @@
+diff -aur old/src/luamm.cc new/src/luamm.cc
+--- old/src/luamm.cc	2015-06-28 16:38:47.793615922 -1000
++++ new/src/luamm.cc	2015-06-29 09:05:44.646667638 -1000
+@@ -165,7 +165,14 @@
+ 		}
+ 
+ 		template<void (*misc)(lua_State *, int), int nresults>
+-		int safe_misc_trampoline(lua_State *l)
++		int safe_misc_trampoline_set(lua_State *l)
++		{
++			misc(l, 1);
++			return nresults;
++		}
++
++		template<int (*misc)(lua_State *, int), int nresults>
++		int safe_misc_trampoline_get(lua_State *l)
+ 		{
+ 			misc(l, 1);
+ 			return nresults;
+@@ -326,7 +333,7 @@
+ 		if( rawequal(index1, index2) )
+ 			return true;
+ 
+-		return safe_compare(&safe_compare_trampoline<lua_equal>, index1, index2);
++		return safe_compare(&safe_compare_trampoline<&lua_equal>, index1, index2);
+ 	}
+ 
+ 	int state::gc(int what, int data)
+@@ -367,7 +374,7 @@
+ 		checkstack(2);
+ 		pushvalue(index);
+ 		insert(-2);
+-		lua_pushcfunction(cobj.get(), (&safe_misc_trampoline<&lua_gettable, 1>));
++		lua_pushcfunction(cobj.get(), (&safe_misc_trampoline_get<&lua_gettable, 1>));
+ 		insert(-3);
+ 		call(2, 1, 0);
+ 	}
+@@ -492,7 +499,7 @@
+ 		checkstack(2);
+ 		pushvalue(index);
+ 		insert(-3);
+-		lua_pushcfunction(cobj.get(), (&safe_misc_trampoline<&lua_settable, 0>));
++		lua_pushcfunction(cobj.get(), (&safe_misc_trampoline_set<&lua_settable, 0>));
+ 		insert(-4);
+ 		call(3, 0, 0);
+ 	}



More information about the arch-commits mailing list