jenkins-core-weekly: update to 2.491
[oi-userland.git] / components / library / libsoup3 / patches / 01-g_module_symbol.patch
blobe67e6594a9fa6f5b08c633ab5c632f8d3f0c817a
1 GTK3 apps using libsoup3 won't start with this message:
3 GTK+ 2.x symbols detected. Using GTK+ 2.x and GTK+ 3 in the same process is not supported
5 Apply equivalent patch to libsoup3 that was also added libsoup.
7 --- libsoup-3.6.1/meson.build.orig
8 +++ libsoup-3.6.1/meson.build
9 @@ -101,14 +101,12 @@
10 glib_required_version = '>= 2.70.0'
11 glib_dep = dependency('glib-2.0', version : glib_required_version,
12 fallback: ['glib', 'libglib_dep'])
13 -gmodule_dep = dependency('gmodule-no-export-2.0', version : glib_required_version,
14 - fallback: ['glib', 'libgmodule_dep'])
15 gobject_dep = dependency('gobject-2.0', version : glib_required_version,
16 fallback: ['glib', 'libgobject_dep'])
17 gio_dep = dependency('gio-2.0', version : glib_required_version,
18 fallback: ['glib', 'libgio_dep'])
20 -glib_deps = [glib_dep, gmodule_dep, gobject_dep, gio_dep]
21 +glib_deps = [glib_dep, gobject_dep, gio_dep]
23 cdata = configuration_data()
25 --- libsoup-3.6.1/libsoup/soup-init.c.orig
26 +++ libsoup-3.6.1/libsoup/soup-init.c
27 @@ -10,7 +10,6 @@
28 #endif
30 #include <glib/gi18n-lib.h>
31 -#include <gmodule.h>
32 #include "gconstructor.h"
34 #ifdef G_OS_WIN32
35 @@ -20,21 +19,6 @@
36 HMODULE soup_dll;
37 #endif
39 -static gboolean
40 -soup2_is_loaded (void)
42 - GModule *module = g_module_open (NULL, 0);
43 - gpointer func;
44 - gboolean result = FALSE;
46 - if (g_module_symbol (module, "soup_uri_new", &func))
47 - result = TRUE;
49 - g_module_close (module);
51 - return result;
54 static void
55 soup_init (void)
57 @@ -51,8 +35,6 @@
58 bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
59 #endif
61 - if (soup2_is_loaded ())
62 - g_error ("libsoup2 symbols detected. Using libsoup2 and libsoup3 in the same process is not supported.");
65 #if defined (G_OS_WIN32)