[libgda/LIBGDA_6.0] Fix build web provider

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit fd30b1a62da6e85e18d4691429b27b206649299d
Author: Daniel Espinosa <esodan gmail com>
Date:   Mon Feb 1 13:37:29 2021 -0600

    Fix build web provider
    
    Fix issue #241

 NEWS                      |  7 +++++++
 examples/meson.build      |  2 +-
 meson.build               |  2 +-
 providers/web/libmain.c   | 14 ++------------
 providers/web/meson.build |  1 +
 5 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/NEWS b/NEWS
index 42fe58fa4..7b28f2ed2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,11 @@
+--------------
+libgda-6.0.1
+--------------
+ - Fix meson build for examples
+ - Fix build experimental web provider
+--------------
 libgda-6.0.0
+--------------
  - MySQL: now supports version 8.0
  - PostgreSQL now support GdaText values, so take care because some SELECT operations
    concatenating strings return GdaText values instead of strings.
diff --git a/examples/meson.build b/examples/meson.build
index b2de656e2..e999dfb7a 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -1,4 +1,4 @@
-example_inc_dir = [inc_rooth,inc_libgdah] 
+example_inc_dir = [libgda_inc_rooth,inc_libgdah]
 
 subdir('DDL')
 subdir('SimpleExample')
diff --git a/meson.build b/meson.build
index 2750bb678..a14745865 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('libgda', 'vala', 'c',
         license: 'LGPL2+',
-        version : '6.0.0',
+        version : '6.0.1',
         meson_version: '>= 0.49',
         default_options: [
                         'c_std=gnu11',
diff --git a/providers/web/libmain.c b/providers/web/libmain.c
index 5cb7fe636..2a14fb137 100644
--- a/providers/web/libmain.c
+++ b/providers/web/libmain.c
@@ -81,12 +81,7 @@ plugin_get_dsn_spec (void)
        gchar *ret, *dir;
 
        dir = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, NULL);
-       ret = gda_server_provider_load_file_contents (module_path, dir, "web_specs_dsn.xml");
-       g_free (dir);
-       if (ret)
-               return ret;
-       else
-               return gda_server_provider_load_resource_contents ("web", "web_specs_dsn.raw.xml");
+       return gda_server_provider_load_resource_contents ("web", "web_specs_dsn.raw.xml");
 }
 
 gchar *
@@ -95,12 +90,7 @@ plugin_get_auth_spec (void)
        gchar *ret, *dir;
 
        dir = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, NULL);
-       ret = gda_server_provider_load_file_contents (module_path, dir, "web_specs_auth.xml");
-       g_free (dir);
-       if (ret)
-               return ret;
-       else
-               return gda_server_provider_load_resource_contents ("web", "web_specs_auth.raw.xml");
+       return gda_server_provider_load_resource_contents ("web", "web_specs_auth.raw.xml");
 }
 
 GdaServerProvider *
diff --git a/providers/web/meson.build b/providers/web/meson.build
index a39ace964..9a9de83c5 100644
--- a/providers/web/meson.build
+++ b/providers/web/meson.build
@@ -100,6 +100,7 @@ libgda_web_provider = library ('gda-web-'+project_api_version,
        c_args: [
                '-include',
                join_paths(gda_top_build, 'config.h'),
+               general_cargs
                ],
        link_args: [
                '-Wl,--export-dynamic',