[libsoup/wip/new-master: 1/2] Bump libsoup API to 3.0

[Patrick Griffis <pgriffis src gnome org>]

commit e606f09f2a3443848c2a49314a95a531e3c3828c
Author: Patrick Griffis <pgriffis igalia com>
Date:   Sat Sep 19 14:50:43 2020 -0700

    Bump libsoup API to 3.0

 docs/reference/build-howto.xml                     |   8 +-
 docs/reference/client-howto.xml                    |   2 +-
 docs/reference/libsoup-2.4-overrides.txt           |   6 -
 ...libsoup-2.4-docs.sgml => libsoup-3.0-docs.sgml} |  11 -
 ...p-2.4-sections.txt => libsoup-3.0-sections.txt} |   0
 docs/reference/meson.build                         |   7 +-
 docs/reference/session-porting.xml                 | 221 ---------------------
 libsoup/include/meson.build                        |   2 +-
 libsoup/meson.build                                |   2 +-
 meson.build                                        |   6 +-
 po/meson.build                                     |   4 +-
 11 files changed, 15 insertions(+), 254 deletions(-)
---
diff --git a/docs/reference/build-howto.xml b/docs/reference/build-howto.xml
index bec9a454..1eb34ac6 100644
--- a/docs/reference/build-howto.xml
+++ b/docs/reference/build-howto.xml
@@ -18,20 +18,20 @@
 <para>
 Like other GNOME libraries, <application>libsoup</application> uses
 <application>pkg-config</application> to provide compiler options. The
-package name is "<literal>libsoup-2.4</literal>". So in your
+package name is "<literal>libsoup-3.0</literal>". So in your
 <literal>configure</literal> script, you might specify something like:
 </para>
 
 <informalexample><programlisting>
-PKG_CHECK_MODULES(LIBSOUP, [libsoup-2.4 >= 2.26])
+PKG_CHECK_MODULES(LIBSOUP, [libsoup-3.0 >= 2.26])
 AC_SUBST(LIBSOUP_CFLAGS)
 AC_SUBST(LIBSOUP_LIBS)
 </programlisting></informalexample>
 
 <para>
-The "<literal>2.4</literal>" in the package name is the "API version"
+The "<literal>3.0</literal>" in the package name is the "API version"
 (indicating "the version of the <application>libsoup</application> API
-that first appeared in version 2.4") and is essentially just part of
+that first appeared in version 3.0") and is essentially just part of
 the package name.
 </para>
 
diff --git a/docs/reference/client-howto.xml b/docs/reference/client-howto.xml
index f9e0327c..cdaf6d48 100644
--- a/docs/reference/client-howto.xml
+++ b/docs/reference/client-howto.xml
@@ -258,7 +258,7 @@ request headers and body of the message:
 <para>
 (Although this is a bad example, because
 <application>libsoup</application> actually has convenience methods
-for dealing with <link linkend="libsoup-2.4-HTML-Form-Support">HTML
+for dealing with <link linkend="libsoup-3.0-HTML-Form-Support">HTML
 forms</link>.)
 </para>
 
diff --git a/docs/reference/libsoup-2.4-docs.sgml b/docs/reference/libsoup-3.0-docs.sgml
similarity index 85%
rename from docs/reference/libsoup-2.4-docs.sgml
rename to docs/reference/libsoup-3.0-docs.sgml
index 07da9241..725a4926 100644
--- a/docs/reference/libsoup-2.4-docs.sgml
+++ b/docs/reference/libsoup-3.0-docs.sgml
@@ -11,7 +11,6 @@
     <xi:include href="build-howto.xml"/>
     <xi:include href="client-howto.xml"/>
     <xi:include href="request-howto.xml"/>
-    <xi:include href="session-porting.xml"/>
     <xi:include href="server-howto.xml"/>
   </chapter>
 
@@ -35,10 +34,7 @@
     <xi:include href="xml/soup-request-file.xml"/>
     <xi:include href="xml/soup-request-data.xml"/>
     <xi:include href="xml/soup-server.xml"/>
-    <xi:include href="xml/soup-server-deprecated.xml"/>
     <xi:include href="xml/soup-session.xml"/>
-    <xi:include href="xml/soup-session-async.xml"/>
-    <xi:include href="xml/soup-session-sync.xml"/>
     <xi:include href="xml/soup-status.xml"/>
     <xi:include href="xml/soup-tld.xml"/>
     <xi:include href="xml/soup-uri.xml"/>
@@ -57,7 +53,6 @@
     <xi:include href="xml/soup-hsts-enforcer.xml"/>
     <xi:include href="xml/soup-hsts-enforcer-db.xml"/>
     <xi:include href="xml/soup-logger.xml"/>
-    <xi:include href="xml/soup-proxy-resolver-default.xml"/>
   </chapter>
 
   <chapter>
@@ -66,12 +61,6 @@
     <xi:include href="xml/soup-websocket.xml"/>
   </chapter>
 
-  <chapter>
-    <title>Low-level Networking API</title>
-    <xi:include href="xml/soup-address.xml"/>
-    <xi:include href="xml/soup-socket.xml"/>
-  </chapter>
-
   <index>
     <title>Index</title>
   </index>
diff --git a/docs/reference/libsoup-2.4-sections.txt b/docs/reference/libsoup-3.0-sections.txt
similarity index 100%
rename from docs/reference/libsoup-2.4-sections.txt
rename to docs/reference/libsoup-3.0-sections.txt
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 3956b5ef..e6c6658b 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -53,8 +53,8 @@ scan_args = [
   '--ignore-decorators="SOUP_DEPRECATED\w*\s*\([^)]*\)|SOUP_DEPRECATED\w*|SOUP_AVAILABLE\w*"'
 ]
 
-gnome.gtkdoc('libsoup-2.4',
-  main_sgml : 'libsoup-2.4-docs.sgml',
+gnome.gtkdoc('libsoup-3.0',
+  main_sgml : 'libsoup-3.0-docs.sgml',
   src_dir : srcdir,
   ignore_headers : ignore_headers,
   namespace : 'soup',
@@ -66,7 +66,6 @@ gnome.gtkdoc('libsoup-2.4',
     'build-howto.xml',
     'client-howto.xml',
     'request-howto.xml',
-    'server-howto.xml',
-    'session-porting.xml',
+    'server-howto.xml'
   ]
 )
diff --git a/libsoup/include/meson.build b/libsoup/include/meson.build
index 0318aa2b..31480d7a 100644
--- a/libsoup/include/meson.build
+++ b/libsoup/include/meson.build
@@ -4,5 +4,5 @@ configure_file (
   output: 'soup.h',
   copy: true,
   install: true,
-  install_dir: get_option('includedir') / 'libsoup',
+  install_dir: get_option('includedir') / includedir,
 )
\ No newline at end of file
diff --git a/libsoup/meson.build b/libsoup/meson.build
index e1784112..76fd28b3 100644
--- a/libsoup/meson.build
+++ b/libsoup/meson.build
@@ -1,3 +1,4 @@
+includedir = join_paths(libsoup_api_name, meson.project_name())
 subdir('include')
 
 pkg = import('pkgconfig')
@@ -151,7 +152,6 @@ if brotlidec_dep.found()
 endif
 
 
-includedir = join_paths(libsoup_api_name, meson.project_name())
 install_headers(soup_installed_headers, subdir : includedir)
 
 version_cdata = configuration_data()
diff --git a/meson.build b/meson.build
index 1c3648eb..a548f84b 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('libsoup', 'c',
-        version: '2.72.0',
+        version: '2.91.0',
         meson_version : '>=0.50',
         license : 'LGPL2',
         default_options : 'c_std=c99')
@@ -20,8 +20,8 @@ soup_version_micro = version_arr[2]
 #
 # When bumping the first component version, set the second and third components
 # to 0. When bumping the second version, set the third one to zero.
-libversion = '1.11.0'
-apiversion = '2.4'
+libversion = '0.0.0'
+apiversion = '3.0'
 soversion = libversion.split('.')[0]
 libsoup_api_name = '@0@-@1@'.format(meson.project_name(), apiversion)
 libversion_arr = libversion.split('.')
diff --git a/po/meson.build b/po/meson.build
index b024aeaf..e344cd18 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,8 +1,8 @@
 i18n = import('i18n')
 
-i18n.gettext(meson.project_name(),
+i18n.gettext(libsoup_api_name,
   preset : 'glib',
   args: [
-  '--default-domain=' + meson.project_name(),
+    '--default-domain=' + libsoup_api_name,
   ]
 )