update to 2.72.0

3 files changed, 35 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c290fd946794..e48bdc7c5c9d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,25 @@
 pkgbase = mingw-w64-libsoup
 	pkgdesc = HTTP client/server library (mingw-w64)
-	pkgver = 2.70.0
-	pkgrel = 2
+	pkgver = 2.72.0
+	pkgrel = 1
 	url = https://download.gnome.org/sources/libsoup
 	arch = any
 	license = LGPL
 	makedepends = mingw-w64-meson
 	makedepends = git
-	makedepends = mingw-w64-environment
 	depends = mingw-w64-glib2
 	depends = mingw-w64-glib-networking
 	depends = mingw-w64-sqlite
 	depends = mingw-w64-libxml2
 	depends = mingw-w64-libpsl
+	depends = mingw-w64-brotli
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = git+https://gitlab.gnome.org/GNOME/libsoup.git#commit=3857ea93dd3775d68010efed7ad3245714fee379
+	source = git+https://gitlab.gnome.org/GNOME/libsoup.git#commit=ae1632c176c60b7fe832024c0a958f4079767c44
+	source = libsoup_extern.patch
 	sha256sums = SKIP
+	sha256sums = 10ade43ee9a2bcfb177539c59e39e01984d7f96c09110173cec3d675aa0f410e
 
 pkgname = mingw-w64-libsoup
 
diff --git a/PKGBUILD b/PKGBUILD
index 87dc49f63e02..c4cd0eb0b162 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,33 @@
 # Maintainer: drakkan <nicola.murino at gmail dot com>
 pkgname=mingw-w64-libsoup
-pkgver=2.70.0
-pkgrel=2
+pkgver=2.72.0
+pkgrel=1
 pkgdesc="HTTP client/server library (mingw-w64)"
 arch=(any)
 url="https://download.gnome.org/sources/libsoup"
 license=("LGPL")
-depends=('mingw-w64-glib2' 'mingw-w64-glib-networking' 'mingw-w64-sqlite' 'mingw-w64-libxml2' 'mingw-w64-libpsl')
-makedepends=('mingw-w64-meson' 'git' 'mingw-w64-environment')
+depends=('mingw-w64-glib2' 'mingw-w64-glib-networking' 'mingw-w64-sqlite' 'mingw-w64-libxml2' 'mingw-w64-libpsl' 'mingw-w64-brotli')
+makedepends=('mingw-w64-meson' 'git')
 options=(!strip !buildflags staticlibs)
-_commit=3857ea93dd3775d68010efed7ad3245714fee379  # tags/2.70.0^0
-source=("git+https://gitlab.gnome.org/GNOME/libsoup.git#commit=$_commit")
-sha256sums=('SKIP')
+_commit=ae1632c176c60b7fe832024c0a958f4079767c44  # tags/2.72.0^0
+source=("git+https://gitlab.gnome.org/GNOME/libsoup.git#commit=$_commit"
+  "libsoup_extern.patch")
+sha256sums=('SKIP'
+  '10ade43ee9a2bcfb177539c59e39e01984d7f96c09110173cec3d675aa0f410e')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
+prepare() {
+  cd libsoup 
+  # # Fix mulitple definition errors
+  patch -Np1 -i ../libsoup_extern.patch
+}
+
+
 build() {
   for _arch in ${_architectures}; do
     mkdir -p "${srcdir}/libsoup/build-${_arch}"
     cd "${srcdir}/libsoup/build-${_arch}"
-    unset CPPFLAGS
-    unset CXXFLAGS
-    unset LDFLAGS
-    # workaround to fix build with gcc 10
-    export CFLAGS="-fcommon"
-    source mingw-env ${_arch}
-    meson-cross-file-generator --arch ${_arch} --output-file cross_file
-    export CROSS_FILE=${srcdir}/libsoup/build-${_arch}/cross_file
     ${_arch}-meson \
       -D gssapi=disabled \
       -D gnome=false \
@@ -35,7 +36,7 @@ build() {
       -D introspection=disabled \
       -D tests=false \
       -D tls_check=false \
-      --default-library both ..
+      --default-library both .. 
     ninja
   done
 }
diff --git a/libsoup_extern.patch b/libsoup_extern.patch
new file mode 100644
index 000000000000..563ac796956a
--- /dev/null
+++ b/libsoup_extern.patch
@@ -0,0 +1,12 @@
+diff -rupN --no-dereference libsoup-2.72.0/libsoup/soup-version.h.in libsoup-2.72.0-new/libsoup/soup-version.h.in
+--- libsoup-2.72.0/libsoup/soup-version.h.in	2020-09-14 00:55:13.558924400 +0200
++++ libsoup-2.72.0-new/libsoup/soup-version.h.in	2020-09-15 16:09:56.672190345 +0200
+@@ -33,7 +33,7 @@ G_BEGIN_DECLS
+ #  ifdef G_PLATFORM_WIN32
+ #    ifdef LIBSOUP_COMPILATION
+ #      ifdef DLL_EXPORT
+-#        define SOUP_VAR __declspec(dllexport)
++#        define SOUP_VAR extern __declspec(dllexport)
+ #      else /* !DLL_EXPORT */
+ #        define SOUP_VAR extern
+ #      endif /* !DLL_EXPORT */