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




commit 3967828a6d59581666b8a135a8248b5bb4c7893c
Author: Xavier Claessens <xavier claessens collabora com>
Date:   Fri Apr 24 15:47:53 2020 +0000

    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.
    
    
    (cherry picked from commit 4fa2accca8efde5714183c0c5af4213f3e3d20ab)

 gtksourceview/meson.build | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)
---
diff --git a/gtksourceview/meson.build b/gtksourceview/meson.build
index e19c9dc0..c9969f20 100644
--- a/gtksourceview/meson.build
+++ b/gtksourceview/meson.build
@@ -337,31 +337,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]