[gnome-music/wip/jfelder/gtk4-v3: 2/110] Remove Gfm library




commit 531b663f737a556362aa7b07f1020f1189dfa26d
Author: Jean Felder <jfelder src gnome org>
Date:   Sat Jan 8 21:00:21 2022 +0100

    Remove Gfm library
    
    It is not used anymore.

 gnome-music.in   | 12 ------------
 meson.build      | 10 ----------
 po/POTFILES.skip |  1 -
 subprojects/gfm  |  1 -
 4 files changed, 24 deletions(-)
---
diff --git a/gnome-music.in b/gnome-music.in
index 0c67c8cfc..d30a7ff0c 100755
--- a/gnome-music.in
+++ b/gnome-music.in
@@ -53,17 +53,6 @@ LOCALE_DIR = '@localedir@'
 PKGDATA_DIR = '@pkgdatadir@'
 
 
-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."""
 
@@ -110,7 +99,6 @@ def run_application():
 
 def main():
     """Sets environment and runs GNOME Music."""
-    set_gfm()
     # set_exception_hook()
     set_internationalization()
     set_resources()
diff --git a/meson.build b/meson.build
index 5bb93922a..4002814cd 100644
--- a/meson.build
+++ b/meson.build
@@ -56,12 +56,6 @@ dependency('py3cairo', version: '>= 1.14.0')
 dependency('grilo-0.3', version: '>= 0.3.13', fallback: ['grilo', 'libgrl_dep'])
 dependency('grilo-plugins-0.3', version: '>= 0.3.12', fallback: ['grilo-plugins', 'grilo_plugins_dep'])
 
-subproject('gfm',
-    default_options: [
-        'pkgdatadir=' + PKGDATA_DIR,
-        'pkglibdir=' + PKGLIB_DIR
-    ])
-
 subdir('data/ui')
 subdir('data')
 subdir('help')
@@ -80,8 +74,6 @@ 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('schemasdir', PKGDATA_DIR)
-# Used for gfm
-bin_config.set('gfmlibdir', PKGLIB_DIR)
 
 bin_config.set('local_build', 'False')
 
@@ -100,8 +92,6 @@ local_config.set('pkgdatadir', join_paths(meson.current_build_dir(), 'data'))
 local_config.set('localedir', join_paths(get_option('prefix'), get_option('datadir'), 'locale'))
 local_config.set('pythondir', meson.current_source_dir())
 local_config.set('schemasdir', join_paths(meson.current_build_dir(), 'data'))
-# Used for gfm
-local_config.set('gfmlibdir', join_paths(meson.current_build_dir(), 'subprojects', 'gfm'))
 
 local_config.set('local_build', 'True')
 
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 006a563b1..72df75ebc 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -2,4 +2,3 @@
 # Please keep this file sorted alphabetically.
 data/ui/AboutDialog.ui
 data/org.gnome.Music.appdata.xml
-subprojects/gfm


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]