[gnome-music] meson: Use PKGLIB_DIR for gfmlibdir



commit bda05160a08aef12edd0d63faab1813b3c77d5aa
Author: Jan Alexander Steffens (heftig) <jan steffens gmail com>
Date:   Sat Sep 14 09:55:05 2019 +0000

    meson: Use PKGLIB_DIR for gfmlibdir
    
    Using an empty string results in this code in gnome-music:
    
        def set_gfm():
            """Configures application to use gfm."""
            gfm_libdir = ''
            if _LOCAL:
                gfm_typelibdir = ''
            else:
                gfm_typelibdir = '/girepository-1.0'
    
            GIRepository.Repository.prepend_search_path(gfm_typelibdir)
            GIRepository.Repository.prepend_library_path(gfm_libdir)
    
    So the first library search path is now '', which, for some reason,
    causes PyGObject to search /usr/lib before /usr/lib/org.gnome.Music.
    
    /usr/lib/libgd.so exists but is not related to Music's libgd, resulting
    in a crash when attempting to use Gd.
    
    To fix this, replace the empty string with the PKGLIB_DIR where libgfm
    is actually found.
    
    Fixes https://bugs.archlinux.org/task/63747

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index b0261a5e..d43fe512 100644
--- a/meson.build
+++ b/meson.build
@@ -85,7 +85,7 @@ bin_config.set('pyexecdir', py_installation.get_path('stdlib'))
 bin_config.set('schemasdir', PKGDATA_DIR)
 # Used for libgd/gfm
 bin_config.set('pkglibdir', PKGLIB_DIR)
-bin_config.set('gfmlibdir', '')
+bin_config.set('gfmlibdir', PKGLIB_DIR)
 
 bin_config.set('local_build', 'False')
 


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