[gnome-music/wip/jfelder/remove-libgd-usage: 2/2] Remove libgd usage

[Jean Felder <jfelder src gnome org>]

commit f1fe6eac88cd808e04e2172b6b519337fadfebdc
Author: Jean Felder <jfelder src gnome org>
Date:   Wed Apr 28 14:10:06 2021 +0200

    Remove libgd usage
    
    Gd.TaggedEntry was the last consumer of libgd. It has been removed in
    the previous commit.

 gnome-music.in | 12 ------------
 meson.build    | 16 ++--------------
 2 files changed, 2 insertions(+), 26 deletions(-)
---
diff --git a/gnome-music.in b/gnome-music.in
index 35ea2c4db..7b93e60a3 100755
--- a/gnome-music.in
+++ b/gnome-music.in
@@ -51,17 +51,6 @@ LOCALE_DIR = '@localedir@'
 PKGDATA_DIR = '@pkgdatadir@'
 
 
-def set_libgd():
-    """Configures application to run our own libgd copy."""
-    libgd_libdir = '@pkglibdir@'
-    if _LOCAL:
-        libgd_typelibdir = '@pkglibdir@'
-    else:
-        libgd_typelibdir = '@pkglibdir@/girepository-1.0'
-
-    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@'
@@ -119,7 +108,6 @@ def run_application():
 
 def main():
     """Sets environment and runs GNOME Music."""
-    set_libgd()
     set_gfm()
     set_exception_hook()
     set_internationalization()
diff --git a/meson.build b/meson.build
index 980f9631b..90ae29db7 100644
--- a/meson.build
+++ b/meson.build
@@ -54,16 +54,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('libgd',
-    default_options: [
-        'with-introspection=true',
-        'with-main-view=true',
-        'with-tagged-entry=true',
-        'static=false',
-        'pkgdatadir=' + PKGDATA_DIR,
-        'pkglibdir=' + PKGLIB_DIR
-    ])
-
 subproject('gfm',
     default_options: [
         'pkgdatadir=' + PKGDATA_DIR,
@@ -88,8 +78,7 @@ 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 libgd/gfm
-bin_config.set('pkglibdir', PKGLIB_DIR)
+# Used for gfm
 bin_config.set('gfmlibdir', PKGLIB_DIR)
 
 bin_config.set('local_build', 'False')
@@ -109,8 +98,7 @@ local_config.set('pkgdatadir', join_paths(meson.build_root(), 'data'))
 local_config.set('localedir', join_paths(get_option('prefix'), get_option('datadir'), 'locale'))
 local_config.set('pythondir', meson.source_root())
 local_config.set('schemasdir', join_paths(meson.build_root(), 'data'))
-# Used for libgd/gfm
-local_config.set('pkglibdir', join_paths(meson.build_root(), 'subprojects', 'libgd', 'libgd'))
+# Used for gfm
 local_config.set('gfmlibdir', join_paths(meson.build_root(), 'subprojects', 'gfm'))
 
 local_config.set('local_build', 'True')