···

       
18
       
18
       
 
       
    popd

     

       
19
       
19
       
 
       
  '';

     

       
20
       
20
       
 
       


     

       
21
       
21
       
+
       
  patches = [

     

       
22
       
22
       
+
       
    # Unlike libtool, vanilla Meson does not pass any information

     

       
23
       
23
       
+
       
    # about the path library will be installed to to g-ir-scanner,

     

       
24
       
24
       
+
       
    # breaking the GIR when path other than ${!outputLib}/lib is used.

     

       
25
       
25
       
+
       
    # We patch Meson to add a --fallback-library-path argument with

     

       
26
       
26
       
+
       
    # library install_dir to g-ir-scanner.

     

       
27
       
27
       
+
       
    ./gir-fallback-path.patch

     

       
28
       
28
       
+
       
  ];

     

       
29
       
29
       
+
       


     

       
21
       
30
       
 
       
  postPatch = ''

     

       
22
       
31
       
 
       
    sed -i -e 's|e.fix_rpath(install_rpath)||' mesonbuild/scripts/meson_install.py

     

       
23
       
32
       
 
       
  '';

     

···

       
1
       
1
       
+
       
--- a/mesonbuild/modules/gnome.py

     

       
2
       
2
       
+
       
+++ b/mesonbuild/modules/gnome.py

     

       
3
       
3
       
+
       
@@ -427,6 +427,10 @@

     

       
4
       
4
       
+
       
         scan_command += ['--no-libtool', '--namespace=' + ns, '--nsversion=' + nsversion, '--warn-all',

     

       
5
       
5
       
+
       
                          '--output', '@OUTPUT@']

     

       
6
       
6
       
+
       
 

     

       
7
       
7
       
+
       
+        fallback_libpath = girtarget.get_custom_install_dir()[0]

     

       
8
       
8
       
+
       
+        if fallback_libpath is not None and isinstance(fallback_libpath, str) and len(fallback_libpath) > 0 and fallback_libpath[0] == "/":

     

       
9
       
9
       
+
       
+            scan_command += ['--fallback-library-path=' + fallback_libpath]

     

       
10
       
10
       
+
       
+

     

       
11
       
11
       
+
       
         header = kwargs.pop('header', None)

     

       
12
       
12
       
+
       
         if header:

     

       
13
       
13
       
+
       
             if not isinstance(header, str):