Update to 2.74.3

3 files changed, 6 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 35253ae94b74..0023c1d18356 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-libsoup
 	pkgdesc = HTTP client/server library (mingw-w64)
-	pkgver = 2.74.2
+	pkgver = 2.74.3
 	pkgrel = 1
 	url = https://download.gnome.org/sources/libsoup
 	arch = any
@@ -16,9 +16,7 @@ pkgbase = mingw-w64-libsoup
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = git+https://gitlab.gnome.org/GNOME/libsoup.git#commit=2add3502a7de754f4aed61571f6cb45094e8f443
-	source = libsoup_extern.patch
+	source = git+https://gitlab.gnome.org/GNOME/libsoup.git#commit=4a6b9178ded85e269872ffedfb2b18f2754a75d9
 	sha256sums = SKIP
-	sha256sums = 10ade43ee9a2bcfb177539c59e39e01984d7f96c09110173cec3d675aa0f410e
 
 pkgname = mingw-w64-libsoup
diff --git a/PKGBUILD b/PKGBUILD
index 854bea5036d2..db3e1023355e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: drakkan <nicola.murino at gmail dot com>
 pkgname=mingw-w64-libsoup
-pkgver=2.74.2
+pkgver=2.74.3
 pkgrel=1
 pkgdesc="HTTP client/server library (mingw-w64)"
 arch=(any)
@@ -9,20 +9,12 @@ license=("LGPL")
 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=2add3502a7de754f4aed61571f6cb45094e8f443  # tags/2.74.2^0
-source=("git+https://gitlab.gnome.org/GNOME/libsoup.git#commit=$_commit"
-  "libsoup_extern.patch")
-sha256sums=('SKIP'
-  '10ade43ee9a2bcfb177539c59e39e01984d7f96c09110173cec3d675aa0f410e')
+_commit=4a6b9178ded85e269872ffedfb2b18f2754a75d9  # tags/2.74.3^0
+source=("git+https://gitlab.gnome.org/GNOME/libsoup.git#commit=$_commit")
+sha256sums=('SKIP')
 
 _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}"
diff --git a/libsoup_extern.patch b/libsoup_extern.patch
deleted file mode 100644
index 563ac796956a..000000000000
--- a/libsoup_extern.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 */