From 95084355e6ac0d2b28da969ff2918bbde628f2f6 Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Wed, 6 Jul 2022 10:22:16 +0100
Subject: [PATCH] Update to 3.0.7

---
 .gitignore     |  1 +
 libsoup3.spec  | 21 ++++++++++-----------
 sources        |  2 +-
 xgettext.patch | 24 ------------------------
 4 files changed, 12 insertions(+), 36 deletions(-)
 delete mode 100644 xgettext.patch

diff --git a/.gitignore b/.gitignore
index 87f3cea..747f1ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /libsoup-3.0.4.tar.xz
 /libsoup-3.0.5.tar.xz
 /libsoup-3.0.6.tar.xz
+/libsoup-3.0.7.tar.xz
diff --git a/libsoup3.spec b/libsoup3.spec
index e779e10..812c294 100644
--- a/libsoup3.spec
+++ b/libsoup3.spec
@@ -3,34 +3,33 @@
 # Coverity scan can override this to 0, to skip checking in gtk-doc generated code
 %{!?with_docs: %global with_docs 1}
 
-Name: libsoup3
-Version: 3.0.6
+Name:    libsoup3
+Version: 3.0.7
 Release: %autorelease
 Summary: Soup, an HTTP library implementation
 
 License: LGPLv2
-URL: https://wiki.gnome.org/Projects/libsoup
+URL:     https://wiki.gnome.org/Projects/libsoup
 Source0: https://download.gnome.org/sources/libsoup/3.0/libsoup-%{version}.tar.xz
-Patch0: xgettext.patch
 
 BuildRequires: gcc
 BuildRequires: gettext
-BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(gio-2.0)
 BuildRequires: glib-networking
 %if %{with_docs}
 BuildRequires: gtk-doc
 %endif
 BuildRequires: krb5-devel
 BuildRequires: meson
+BuildRequires: vala
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(gio-2.0)
 BuildRequires: pkgconfig(gobject-introspection-1.0)
 BuildRequires: pkgconfig(libbrotlidec)
+BuildRequires: pkgconfig(libnghttp2)
 BuildRequires: pkgconfig(libpsl)
 BuildRequires: pkgconfig(sqlite3)
 BuildRequires: pkgconfig(sysprof-capture-4)
-BuildRequires: vala
 BuildRequires: /usr/bin/ntlm_auth
-BuildRequires: pkgconfig(libnghttp2)
 
 Recommends: glib-networking%{?_isa} >= %{glib2_version}
 
@@ -88,14 +87,14 @@ This package contains developer documentation for %{name}.
 %doc README NEWS AUTHORS
 %{_libdir}/libsoup-3.0.so.0*
 %dir %{_libdir}/girepository-1.0
-%{_libdir}/girepository-1.0/Soup*3.0.typelib
+%{_libdir}/girepository-1.0/Soup-3.0.typelib
 
 %files devel
 %{_includedir}/libsoup-3.0
 %{_libdir}/libsoup-3.0.so
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/pkgconfig/libsoup-3.0.pc
 %dir %{_datadir}/gir-1.0
-%{_datadir}/gir-1.0/Soup*3.0.gir
+%{_datadir}/gir-1.0/Soup-3.0.gir
 %dir %{_datadir}/vala
 %dir %{_datadir}/vala/vapi
 %{_datadir}/vala/vapi/libsoup-3.0.deps
diff --git a/sources b/sources
index a7da6d5..649c3a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libsoup-3.0.6.tar.xz) = 4de84b3c251b6fe75903b1cd2647ac22055f799382a186efe6f45d3f75bf6c82040f0aaceb40d0019769cf1c0295511eb0afbbc7236e93b168ed70c2ae975a89
+SHA512 (libsoup-3.0.7.tar.xz) = bb48b2475ec4b073de144ad91459843946ba902fc0849b88c548ccb774fc3854451239267dd097a3da4e40f025ae746609b669ec0caffdb15e7b07118e881cfd
diff --git a/xgettext.patch b/xgettext.patch
deleted file mode 100644
index 08cb8b4..0000000
--- a/xgettext.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- meson.build~	2021-11-24 12:15:58.564374000 -0600
-+++ meson.build	2022-01-06 09:43:04.302267338 -0600
-@@ -392,11 +392,7 @@
- configure_file(output : 'config.h', configuration : cdata)
- 
- subdir('libsoup')
--xgettext = find_program('xgettext', required : false)
--# xgettext is optional (on Windows for instance)
--if xgettext.found()
--  subdir('po')
--endif
-+subdir('po')
- 
- subdir('examples')
- subdir('fuzzing')
-@@ -421,7 +417,7 @@
-     'GSSAPI' : enable_gssapi,
-     'NTLM' : ntlm_auth.found(),
-     'Brotli' : brotlidec_dep.found(),
--    'Translations' : xgettext.found(),
-+    'Translations' : 'True',
-     'GIR' : enable_introspection,
-     'VAPI' : enable_vapi,
-     'Documentation' : get_option('gtk_doc'),