diff --git a/aedi/target/library_tier1.py b/aedi/target/library_tier1.py index dc212ebc..3a63ce34 100644 --- a/aedi/target/library_tier1.py +++ b/aedi/target/library_tier1.py @@ -144,7 +144,8 @@ class GlibTarget(BuildTarget): def prepare_source(self, state: BuildState): state.download_source( 'https://download.gnome.org/sources/glib/2.72/glib-2.72.3.tar.xz', - '4a39a2f624b8512d500d5840173eda7fa85f51c109052eae806acece85d345f0') + '4a39a2f624b8512d500d5840173eda7fa85f51c109052eae806acece85d345f0', + patches='glib-fix-paths') def detect(self, state: BuildState) -> bool: return state.has_source_file('glib.doap') diff --git a/patch/glib-fix-paths.diff b/patch/glib-fix-paths.diff new file mode 100644 index 00000000..b9640455 --- /dev/null +++ b/patch/glib-fix-paths.diff @@ -0,0 +1,19 @@ +--- a/meson.build ++++ b/meson.build +@@ -2130,7 +2130,7 @@ + glib_conf.set('HAVE_DCGETTEXT', 1) + glib_conf.set('HAVE_GETTEXT', 1) + +-glib_conf.set_quoted('GLIB_LOCALE_DIR', join_paths(glib_datadir, 'locale')) ++glib_conf.set_quoted('GLIB_LOCALE_DIR', '/usr/local/share/locale') + + # libmount is only used by gio, but we need to fetch the libs to generate the + # pkg-config file below +--- a/glib/libcharset/meson.build ++++ b/glib/libcharset/meson.build +@@ -1,4 +1,4 @@ + charset_lib = static_library('charset', 'localcharset.c', + include_directories : configinc, + pic : true, +- c_args : [ '-DGLIB_CHARSETALIAS_DIR="@0@"'.format(glib_charsetaliasdir) ] + glib_hidden_visibility_args) ++ c_args : [ '-DGLIB_CHARSETALIAS_DIR="/usr/local/share/locale"' ] + glib_hidden_visibility_args)