[arch-commits] Commit in conky/trunk (PKGBUILD curl.patch)
Gaetan Bisson
bisson at archlinux.org
Sat Jul 11 19:19:52 UTC 2015
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
===================================================================
--- PKGBUILD 2015-07-11 18:50:52 UTC (rev 242129)
+++ PKGBUILD 2015-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.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) {
More information about the arch-commits
mailing list