summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Clemons <andrew.clemons@gmail.com>2017-09-25 20:07:37 +1300
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-11-04 07:17:47 +0700
commitd4f9795d6142019bb3d38402c51353bc1bd327ee (patch)
tree97d761879a264ba39fa580b35bbc750fb25d2ecc
parent352b79bee66c00e4a4fc2d66e53855f7466046c5 (diff)
downloadslackbuilds-d4f9795d6142019bb3d38402c51353bc1bd327ee.tar.gz
desktop/polybar: Fix building against newer libcurl.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--desktop/polybar/d35abc7620c8f06618b4708d9a969dfa2f309e96.patch27
-rw-r--r--desktop/polybar/polybar.SlackBuild1
2 files changed, 28 insertions, 0 deletions
diff --git a/desktop/polybar/d35abc7620c8f06618b4708d9a969dfa2f309e96.patch b/desktop/polybar/d35abc7620c8f06618b4708d9a969dfa2f309e96.patch
new file mode 100644
index 0000000000..0f6722e775
--- /dev/null
+++ b/desktop/polybar/d35abc7620c8f06618b4708d9a969dfa2f309e96.patch
@@ -0,0 +1,27 @@
+From d35abc7620c8f06618b4708d9a969dfa2f309e96 Mon Sep 17 00:00:00 2001
+From: patrick96 <p.ziegler96@gmail.com>
+Date: Wed, 12 Jul 2017 11:22:45 +0200
+Subject: [PATCH] Remove curlbuild include
+
+Curl removed that header in 73a2fcea0b4adea6ba342cd7ed1149782c214ae3
+([1])
+http.cpp doesn't use anything from that header and compilation works for
+fine with curl 7.54.1
+
+Fixes #647
+Ref:
+[1]: https://github.com/curl/curl/commit/73a2fcea0b4adea6ba342cd7ed1149782c214ae3
+---
+ src/utils/http.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/utils/http.cpp b/src/utils/http.cpp
+index 365dd3be..f6fe6779 100644
+--- a/src/utils/http.cpp
++++ b/src/utils/http.cpp
+@@ -1,5 +1,4 @@
+ #include <curl/curl.h>
+-#include <curl/curlbuild.h>
+ #include <curl/easy.h>
+ #include <sstream>
+
diff --git a/desktop/polybar/polybar.SlackBuild b/desktop/polybar/polybar.SlackBuild
index 57bd438cea..f6c01c2022 100644
--- a/desktop/polybar/polybar.SlackBuild
+++ b/desktop/polybar/polybar.SlackBuild
@@ -73,6 +73,7 @@ for i in $(seq 0 ${#MODULENAMS[@]}); do
tar xvf $CWD/${MODULENAMS[$i]}-${MODULEVERSIONS[$i]}.tar.gz
mv ${MODULENAMS[$i]}-${MODULEVERSIONS[$i]} lib/${MODULENAMS[$i]}
done
+patch -p1 < $CWD/d35abc7620c8f06618b4708d9a969dfa2f309e96.patch
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \