[gnome-music/wip/mschraal/core: 35/118] [local only] use gfm
- From: Marinus Schraal <mschraal src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-music/wip/mschraal/core: 35/118] [local only] use gfm
- Date: Wed, 26 Jun 2019 13:02:57 +0000 (UTC)
commit 762365f225764a0addc73f58ea546caa45167c09
Author: Marinus Schraal <mschraal gnome org>
Date: Wed May 15 00:29:13 2019 +0200
[local only] use gfm
Only tested on buildtree execution.
.gitmodules | 3 +++
gnome-music.in | 11 +++++++++++
meson.build | 11 +++++++++--
3 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index b2aeb1fe..9b66516e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -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
diff --git a/gnome-music.in b/gnome-music.in
index 13f8aeb1..fe0de970 100755
--- a/gnome-music.in
+++ b/gnome-music.in
@@ -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()
diff --git a/meson.build b/meson.build
index 83b1be5c..64538b1c 100644
--- a/meson.build
+++ b/meson.build
@@ -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')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]