From 0741d7579dc729c2aba8d8002e4bdad2e72934d2 Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Fri, 6 Jul 2018 23:36:59 +0300
Subject: [PATCH] curl: Fix dependencies, provide full libraries list for
 static linking

---
 curl/PKGBUILD                             | 14 +++++++++-----
 curl/curl-7.60.0-gssapi-static-libs.patch | 17 +++++++++++++++++
 2 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 curl/curl-7.60.0-gssapi-static-libs.patch

diff --git a/curl/PKGBUILD b/curl/PKGBUILD
index b0b7db32..95a2864c 100644
--- a/curl/PKGBUILD
+++ b/curl/PKGBUILD
@@ -3,22 +3,24 @@
 pkgbase=curl
 pkgname=('curl' 'libcurl' 'libcurl-devel')
 pkgver=7.60.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Multi-protocol file transfer utility"
 arch=('i686' 'x86_64')
 url="https://curl.haxx.se"
 license=('MIT')
 depends=('ca-certificates')
-makedepends=('heimdal-devel' 'libcrypt-devel' 'libidn2-devel' 'libmetalink-devel' 
+makedepends=('brotli-devel' 'heimdal-devel' 'libcrypt-devel' 'libidn2-devel' 'libmetalink-devel' 
              'libnghttp2-devel' 'libpsl-devel' 'libssh2-devel' 'openssl-devel' 'zlib-devel') #  'libcares-devel'
 options=('!libtool' 'strip' '!debug')
 source=("https://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2"{,.asc}
         curl-7.55.1-msys2.patch
-        curl-7.58.0-libpsl-static-libs.patch)
+        curl-7.58.0-libpsl-static-libs.patch
+        curl-7.60.0-gssapi-static-libs.patch)
 sha256sums=('897dfb2204bd99be328279f88f55b7c61592216b0542fcbe995c60aa92871e9b'
             'SKIP'
             '2e6e2245a10890f8a8b1ec84dbe86dd2415b05359a93e69be9c7b90768e6ccc0'
-            '5d6563e29e85c7fadd129308e9927450c59fe5d429d9b27aafd3460bfc40defb')
+            '5d6563e29e85c7fadd129308e9927450c59fe5d429d9b27aafd3460bfc40defb'
+            'd58a94556c031e550403ed13691305983bf83493f15fb8c35615e59bf265bbf7')
 validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2'   # Daniel Stenberg
               '914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg (old key)
 
@@ -26,6 +28,7 @@ prepare() {
   cd "${pkgname}-${pkgver}"
   patch -p1 -i ${srcdir}/curl-7.58.0-libpsl-static-libs.patch
   patch -p1 -i ${srcdir}/curl-7.55.1-msys2.patch
+  patch -p1 -i ${srcdir}/curl-7.60.0-gssapi-static-libs.patch
   autoreconf -fi
 }
 
@@ -42,6 +45,7 @@ build() {
     --enable-ipv6 \
     --disable-hidden-symbols \
     --disable-ares \
+    --with-brotli \
     --with-gssapi \
     --with-libidn \
     --with-libmetalink \
@@ -74,7 +78,7 @@ package_curl() {
 
 package_libcurl() {
   pkgdesc="Multi-protocol file transfer library (runtime)"
-  depends=('ca-certificates' 'heimdal-libs' 'libcrypt' 'libidn2' 'libmetalink'
+  depends=('brotli' 'ca-certificates' 'heimdal-libs' 'libcrypt' 'libidn2' 'libmetalink'
           'libnghttp2' 'libpsl' 'libssh2' 'openssl' 'zlib') #'libcares'
   groups=('libraries')
 
diff --git a/curl/curl-7.60.0-gssapi-static-libs.patch b/curl/curl-7.60.0-gssapi-static-libs.patch
new file mode 100644
index 00000000..f7e588dd
--- /dev/null
+++ b/curl/curl-7.60.0-gssapi-static-libs.patch
@@ -0,0 +1,17 @@
+--- curl-7.60.0/configure.ac.orig	2018-07-06 15:08:41.153181400 +0300
++++ curl-7.60.0/configure.ac	2018-07-06 15:08:45.489989000 +0300
+@@ -1389,12 +1389,12 @@
+         if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
+            dnl krb5-config doesn't have --libs-only-L or similar, put everything
+            dnl into LIBS
+-           gss_libs=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --libs gssapi`
++           gss_libs=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --deps --libs gssapi`
+            LIBS="$gss_libs $LIBS"
+         elif test -f "$KRB5CONFIG"; then
+            dnl krb5-config doesn't have --libs-only-L or similar, put everything
+            dnl into LIBS
+-           gss_libs=`$KRB5CONFIG --libs gssapi`
++           gss_libs=`$KRB5CONFIG --deps --libs gssapi`
+            LIBS="$gss_libs $LIBS"
+         else
+            case $host in