Commit 9c3c8bc4 authored by Marinus Schraal's avatar Marinus Schraal

[local only] use gfm

Only tested on buildtree execution.
parent 68a24b61
......@@ -4,3 +4,6 @@
[submodule "subprojects/shared-modules"]
path = subprojects/shared-modules
url = https://github.com/flathub/shared-modules.git
[submodule "subprojects/gfm"]
path = subprojects/gfm
url = https://gitlab.gnome.org/mschraal/gfm.git
......@@ -70,6 +70,16 @@ def set_libgd():
GIRepository.Repository.prepend_search_path(libgd_typelibdir)
GIRepository.Repository.prepend_library_path(libgd_libdir)
def set_gfm():
"""Configures application to use gfm."""
gfm_libdir = '@gfmlibdir@'
if _LOCAL:
gfm_typelibdir = '@gfmlibdir@'
else:
gfm_typelibdir = '@gfmlibdir@/girepository-1.0'
GIRepository.Repository.prepend_search_path(gfm_typelibdir)
GIRepository.Repository.prepend_library_path(gfm_libdir)
def set_exception_hook():
"""Configures sys.excepthook to enforce Gtk application exiting."""
......@@ -130,6 +140,7 @@ def run_application():
def main():
"""Sets environment and runs GNOME Music."""
set_libgd()
set_gfm()
set_exception_hook()
set_log_level()
set_internationalization()
......
......@@ -58,6 +58,12 @@ subproject('libgd',
'pkglibdir=' + PKGLIB_DIR
])
subproject('gfm',
default_options: [
'pkgdatadir=' + PKGDATA_DIR,
'pkglibdir=' + PKGLIB_DIR
])
subdir('data/ui')
subdir('data')
subdir('help')
......@@ -77,7 +83,7 @@ bin_config.set('localedir', join_paths(get_option('prefix'), get_option('datadir
bin_config.set('pythondir', PYTHON_DIR)
bin_config.set('pyexecdir', py_installation.get_path('stdlib'))
bin_config.set('schemasdir', '')
# Used for libgd
# Used for libgd/gfm
bin_config.set('pkglibdir', PKGLIB_DIR)
bin_config.set('local_build', 'False')
......@@ -98,8 +104,9 @@ local_config.set('localedir', join_paths(get_option('prefix'), get_option('datad
local_config.set('pythondir', meson.source_root())
local_config.set('pyexecdir', meson.source_root())
local_config.set('schemasdir', join_paths(meson.build_root(), 'data'))
# Used for libgd
# Used for libgd/gfm
local_config.set('pkglibdir', join_paths(meson.build_root(), 'subprojects', 'libgd', 'libgd'))
local_config.set('gfmlibdir', join_paths(meson.build_root(), 'subprojects', 'gfm'))
local_config.set('local_build', 'True')
......
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