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

[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
===================================================================
--- PKGBUILD	2015-11-19 21:33:55 UTC (rev 251433)
+++ PKGBUILD	2015-11-19 21:45:23 UTC (rev 251434)
@@ -5,33 +5,24 @@
 # Contributor: Partha Chowdhury <kira.laucas at gmail.com>
 
 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.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>

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.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) {

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 <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;