[gtksourceview: 3/4] Meson: Fix pkg-config file when a dependencies is a subprojects




commit 6b5a7eb6ec7aa026cb22304030e7eaa6e223ef60
Author: Xavier Claessens <xavier claessens collabora com>
Date:   Fri Apr 24 11:47:53 2020 -0400

    Meson: Fix pkg-config file when a dependencies is a subprojects
    
    Meson only expects strings and pkg-config dependency objects in the
    `requires` argument, but when a dependency is built as subproject it's
    an internal dependency object instead and that cause Meson to error.
    
    It is rarely needed to put anything in 'requires', meson knows if public
    libraries have a pkg-config name it can use. Also meson knows private
    dependencies, no need to specify them.

 gtksourceview/meson.build | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)
---
diff --git a/gtksourceview/meson.build b/gtksourceview/meson.build
index c7c907a9..df97aba8 100644
--- a/gtksourceview/meson.build
+++ b/gtksourceview/meson.build
@@ -320,31 +320,11 @@ gtksource_pc_reqs = [
   'gtk4 @0@'.format(gtk_req),
 ]
 
-gtksource_pc_private_reqs = []
-gtksource_lib_private = []
-
-if libxml_dep.type_name() == 'pkgconfig'
-  gtksource_pc_private_reqs += [
-    'libxml-2.0 @0@'.format(libxml_req)
-  ]
-else
-  if libxml_dep.type_name() == 'library'
-    gtksource_lib_private += libxml_dep
-  endif
-endif
-
-gtksource_pc_private_reqs += [
-  'fribidi @0@'.format(fribidi_req),
-]
-
-gtksource_pc = pkg.generate(
+gtksource_pc = pkg.generate(gtksource_lib,
               name: package_string,
        description: 'Source code editing Gtk+ widget.',
           requires: gtksource_pc_reqs,
-  requires_private: gtksource_pc_private_reqs,
            version: version,
            subdirs: package_string,
-         libraries: gtksource_lib,
- libraries_private: gtksource_lib_private,
        install_dir: pkgconfigdir,
 )


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