PsychoticNinja/irssi
1
0
Fork 1
mirror of https://github.com/irssi/irssi.git synced 2025-04-25 12:31:09 -05:00
Code Issues Projects Releases Wiki Activity

update glib version to fix timezone assertion bug

Browse Source
This commit is contained in:
Ailin Nemui 2022-12-18 17:05:35 +01:00
parent 1453f46fcf
commit e7fb82db89
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meson.build
View File

@ -6,7 +6,8 @@ project('irssi', 'c',
############################ ############################
############################ ############################
glib_internal_version = 'glib-2.58.3' # keep this in sync with subprojects/glib.wrap glib_internal_version = 'glib-2.74.3' # keep this in sync with subprojects/glib.wrap
glib_pcre2_internal_version = 'pcre2-10.40'
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
rootinc = include_directories('.') rootinc = include_directories('.')
dep = [] dep = []
@ -238,7 +239,7 @@ if not glib_dep.found()
glib_internal_configure_t = custom_target('glib-internal-configure', glib_internal_configure_t = custom_target('glib-internal-configure',
command : [ meson_cmd, 'setup', '--prefix=/irssi-glib-internal', command : [ meson_cmd, 'setup', '--prefix=/irssi-glib-internal',
'--buildtype=' + get_option('buildtype'), '--buildtype=' + get_option('buildtype'),
'-Dlibmount=false', '-Dselinux=false', '-Ddefault_library=static', '-Dinternal_pcre=true', '-Dlibmount=disabled', '-Dselinux=disabled', '-Ddefault_library=static', '-Dforce_fallback_for=pcre2',
glib_internal_configure_args, glib_internal_configure_args,
(meson.current_build_dir() / 'build-subprojects' / 'glib'), (meson.current_build_dir() / 'build-subprojects' / 'glib'),
(meson.current_source_dir() / 'subprojects' / glib_internal_version) ], (meson.current_source_dir() / 'subprojects' / glib_internal_version) ],
@ -247,6 +248,7 @@ if not glib_dep.found()
depends : glib_internal_download_t,) depends : glib_internal_download_t,)
glib_internal_build_t = custom_target('glib-internal-build', glib_internal_build_t = custom_target('glib-internal-build',
command : [ ninja, '-C', meson.current_build_dir() / 'build-subprojects' / 'glib', command : [ ninja, '-C', meson.current_build_dir() / 'build-subprojects' / 'glib',
'subprojects' / glib_pcre2_internal_version / 'libpcre2-8.a',
'glib' / 'libglib-2.0.a', 'glib' / 'libglib-2.0.a',
'gmodule' / 'libgmodule-2.0.a'], 'gmodule' / 'libgmodule-2.0.a'],
console : true, console : true,
@ -260,7 +262,10 @@ if not glib_dep.found()
'-isystem' + (meson.current_source_dir() / 'subprojects' / glib_internal_version), '-isystem' + (meson.current_source_dir() / 'subprojects' / glib_internal_version),
'-isystem' + (meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib'), '-isystem' + (meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib'),
], ],
link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib' / 'libglib-2.0.a' ], link_args : [
meson.current_build_dir() / 'build-subprojects' / 'glib' / 'subprojects' / glib_pcre2_internal_version / 'libpcre2-8.a',
meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib' / 'libglib-2.0.a',
],
) )
built_src += glib_internal_build_t built_src += glib_internal_build_t
libdl_dep = [] libdl_dep = []

8
subprojects/glib.wrap
View File

@ -1,6 +1,6 @@
[wrap-file] [wrap-file]
# make sure to update the glib_internal_version in meson.build # make sure to update the glib_internal_version in meson.build
directory = glib-2.58.3 directory = glib-2.74.3
source_url = https://download.gnome.org/sources/glib/2.58/glib-2.58.3.tar.xz source_url = https://download.gnome.org/sources/glib/2.74/glib-2.74.3.tar.xz
source_filename = glib-2.58.3.tar.xz source_filename = glib-2.74.3.tar.xz
source_hash = 8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481 source_hash = e9bc41ecd9690d9bc6a970cc7380119b828e5b6a4b16c393c638b3dc2b87cbcb