[gnome-music/wip/mschraal/core] subprojects: Update gfm
- From: Marinus Schraal <mschraal src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-music/wip/mschraal/core] subprojects: Update gfm
- Date: Thu, 27 Jun 2019 22:36:06 +0000 (UTC)
commit 664adf9311fc1906045027ac2fec5a3d42094865
Author: Marinus Schraal <mschraal gnome org>
Date: Fri Jun 28 00:26:21 2019 +0200
subprojects: Update gfm
gnome-music.in | 2 --
meson.build | 3 ++-
subprojects/gfm | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/gnome-music.in b/gnome-music.in
index fe0de970..db823841 100755
--- a/gnome-music.in
+++ b/gnome-music.in
@@ -75,8 +75,6 @@ def set_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)
diff --git a/meson.build b/meson.build
index 64538b1c..014f39ff 100644
--- a/meson.build
+++ b/meson.build
@@ -82,9 +82,10 @@ bin_config.set('pkgdatadir', PKGDATA_DIR)
bin_config.set('localedir', join_paths(get_option('prefix'), get_option('datadir'), 'locale'))
bin_config.set('pythondir', PYTHON_DIR)
bin_config.set('pyexecdir', py_installation.get_path('stdlib'))
-bin_config.set('schemasdir', '')
+bin_config.set('schemasdir', PKGDATA_DIR)
# Used for libgd/gfm
bin_config.set('pkglibdir', PKGLIB_DIR)
+bin_config.set('gfmlibdir', '')
bin_config.set('local_build', 'False')
diff --git a/subprojects/gfm b/subprojects/gfm
index 7f5064fc..e6412581 160000
--- a/subprojects/gfm
+++ b/subprojects/gfm
@@ -1 +1 @@
-Subproject commit 7f5064fca6b45a8abe4f7c4a45bd00b2ababe952
+Subproject commit e64125815c835ef9ef62b13471d5f554850b6c85
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]