From 642be169abc4e9982f47c3e25a50878d6bc19423 Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Fri, 31 May 2019 15:22:01 +0300
Subject: [PATCH] curl: Trying to fix static linking with nghttp2

---
 mingw-w64-curl/0002-nghttp2-static.patch | 10 +++++++---
 mingw-w64-curl/PKGBUILD                  |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/mingw-w64-curl/0002-nghttp2-static.patch b/mingw-w64-curl/0002-nghttp2-static.patch
index b692594bcf..224b21d303 100644
--- a/mingw-w64-curl/0002-nghttp2-static.patch
+++ b/mingw-w64-curl/0002-nghttp2-static.patch
@@ -1,20 +1,24 @@
 --- curl-7.61.0/lib/makefile.am.orig	2018-07-26 11:45:27.548145800 +0300
 +++ curl-7.61.0/lib/makefile.am	2018-07-26 11:49:05.823729200 +0300
-@@ -111,7 +111,7 @@
+@@ -111,7 +111,8 @@
  endif
  
  if USE_CPPFLAG_CURL_STATICLIB
 -libcurl_la_CPPFLAGS_EXTRA += -DCURL_STATICLIB
 +libcurl_la_CPPFLAGS_EXTRA += -DCURL_STATICLIB -DNGHTTP2_STATICLIB
++libcurl_la_CFLAGS_EXTRA +=  -DNGHTTP2_STATICLIB
  endif
  
  if DOING_CURL_SYMBOL_HIDING
-@@ -123,7 +123,7 @@
+@@ -123,9 +123,9 @@
  libcurl_la_LDFLAGS = $(AM_LDFLAGS) $(libcurl_la_LDFLAGS_EXTRA) $(LDFLAGS) $(LIBCURL_LIBS)
  libcurl_la_CFLAGS = $(AM_CFLAGS) $(libcurl_la_CFLAGS_EXTRA)
  
 -libcurlu_la_CPPFLAGS = $(AM_CPPFLAGS) -DCURL_STATICLIB -DUNITTESTS
 +libcurlu_la_CPPFLAGS = $(AM_CPPFLAGS) -DCURL_STATICLIB -DNGHTTP2_STATICLIB -DUNITTESTS
  libcurlu_la_LDFLAGS = $(AM_LDFLAGS) -static $(LIBCURL_LIBS)
- libcurlu_la_CFLAGS = $(AM_CFLAGS)
+-libcurlu_la_CFLAGS = $(AM_CFLAGS)
++libcurlu_la_CFLAGS = $(AM_CFLAGS) -DNGHTTP2_STATICLIB
  
+ # Makefile.inc provides the CSOURCES and HHEADERS defines
+ include Makefile.inc
\ No newline at end of file
diff --git a/mingw-w64-curl/PKGBUILD b/mingw-w64-curl/PKGBUILD
index 1e300e7c5c..c1a303a3ee 100644
--- a/mingw-w64-curl/PKGBUILD
+++ b/mingw-w64-curl/PKGBUILD
@@ -14,7 +14,7 @@ _realname=curl
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}${_namesuff}"
 pkgver=7.65.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Command line tool and library for transferring data with URLs. (mingw-w64)"
 arch=('any')
 url="https://curl.haxx.se/"
@@ -49,7 +49,7 @@ source=("${url}/download/${_realname}-${pkgver}.tar.bz2"{,.asc}
 sha256sums=('ea47c08f630e88e413c85793476e7e5665647330b6db35f5c19d72b3e339df5c'
             'SKIP'
             'a3bdfcf7dad7ef86bbfb13eac62183787806d527411e1d981f7091ec26dde4ce'
-            '3eab9088e5b26679f5bcccbda0bc85268a0ed810d7bdae8b0c47685462cdd0be'
+            'd84984f4b50c3e511e4e7b0d027f65b6fc70fa2ecb7e6af978a9ff8db61d2da5'
             '7492d019036b5bec251bfbc3c0b40e5f16d3dd6b2515068835e087a6c21f19ad')
 validpgpkeys=('914C533DF9B2ADA2204F586D78E11C6B279D5C91'  # Daniel Stenberg
               '27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2'