Commit a9d6e04e authored by Nirbheek Chauhan's avatar Nirbheek Chauhan 🐜
Browse files

glib.recipe: Bump to 2.62.6

Part-of: <gstreamer/cerbero!489>
parent dec64a62
......@@ -22,30 +22,29 @@ GLIB_CONFIG_UNVERSAL='''\
class Recipe(recipe.Recipe):
name = 'glib'
version = '2.62.5'
version = '2.62.6'
stype = SourceType.TARBALL
url = 'gnome://'
tarball_checksum = 'b8d1cdafa46658b63d7512efbe2cd21bd36cd7be83140e44930c47b79f82452e'
tarball_checksum = '104fa26fbefae8024ff898330c671ec23ad075c1c0bce45c325c6d5657d58b9c'
licenses = [License.LGPLv2Plus]
btype = BuildType.MESON
meson_options = {'internal_pcre': 'true', 'libmount': 'false', 'dtrace': 'false',
'iconv': 'auto'}
deps = ['libffi', 'zlib']
patches = ["glib/0003-Add-support-for-loading-GIO-modules-from-the-distro-.patch",
"glib/0004-Allow-for-a-second-distro-GIO-module-path-as-used-on.patch",
"glib/0006-giomodule-do-not-try-to-load-modules-from-gio-module.patch",
"glib/0008-Unhide-_g_io_modules_ensure_extension_points_registe.patch",
'glib/0009-Implementation-of-Cocoa-event-loop-integration-in-GM.patch',
# https://gitlab.gnome.org/GNOME/glib/merge_requests/1254
'glib/0001-giomodule-gio-modules-are-no-longer-installed-in-bin.patch',
# https://github.com/mesonbuild/meson/issues/6257
'glib/0001-meson-host_system-is-ios-inside-cerbero.patch',
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1415,
'glib/0001-meson-Don-t-use-assert-in-test-code.patch',
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1433
'glib/0001-meson-fix-buildtype-args-and-vscrt-usage.patch',
]
patches = [
'glib/0003-Add-support-for-loading-GIO-modules-from-the-distro-.patch',
'glib/0004-Allow-for-a-second-distro-GIO-module-path-as-used-on.patch',
'glib/0006-giomodule-do-not-try-to-load-modules-from-gio-module.patch',
'glib/0008-Unhide-_g_io_modules_ensure_extension_points_registe.patch',
'glib/0009-Implementation-of-Cocoa-event-loop-integration-in-GM.patch',
# https://github.com/mesonbuild/meson/issues/6257
'glib/0001-meson-host_system-is-ios-inside-cerbero.patch',
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1415,
'glib/0001-meson-Don-t-use-assert-in-test-code.patch',
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1433
'glib/0001-meson-fix-buildtype-args-and-vscrt-usage.patch',
]
files_libs = [
'libglib-2.0', 'libgio-2.0', 'libgmodule-2.0', 'libgobject-2.0',
......
From dd8fc003d4c3c0e622b61885367c29a1ddd27af9 Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Tue, 26 Nov 2019 23:45:19 +0530
Subject: [PATCH] giomodule: gio modules are no longer installed in bindir on
MSVC
Ever since the port to Meson, gio modules (f.ex., by glib-networking)
are installed inside libdir both for MinGW and MSVC.
---
gio/giomodule.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/gio/giomodule.c b/gio/giomodule.c
index 10c608b..2b3dfb1 100644
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
@@ -1076,18 +1076,9 @@ get_gio_module_dir (void)
gchar *install_dir;
install_dir = g_win32_get_package_installation_directory_of_module (gio_dll);
-#ifdef _MSC_VER
- /* On Visual Studio builds we have all the libraries and binaries in bin
- * so better load the gio modules from bin instead of lib
- */
- module_dir = g_build_filename (install_dir,
- "bin", "gio", "modules",
- NULL);
-#else
module_dir = g_build_filename (install_dir,
"lib", "gio", "modules",
NULL);
-#endif
g_free (install_dir);
#else
module_dir = g_strdup (GIO_MODULE_DIR);
--
2.23.0
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment