diff --git a/srcpkgs/gobject-introspection/patches/0001-Port-cross-compilation-support-to-meson.patch b/srcpkgs/gobject-introspection/patches/0001-Port-cross-compilation-support-to-meson.patch deleted file mode 100644 index ba6f21b43c..0000000000 --- a/srcpkgs/gobject-introspection/patches/0001-Port-cross-compilation-support-to-meson.patch +++ /dev/null @@ -1,147 +0,0 @@ -diff --git gir/meson.build gir/meson.build -index 3d021bc..9852996 100644 ---- a/gir/meson.build -+++ b/gir/meson.build -@@ -36,15 +36,27 @@ gir_files = [ - typelibdir = join_paths(get_option('libdir'), 'girepository-1.0') - install_data(gir_files, install_dir: girdir) - --scanner_command = [ -- python, -- girscanner, -- '--output=@OUTPUT@', -- '--no-libtool', -- '--reparse-validate', -- '--add-include-path', join_paths(meson.current_build_dir()), -- '--add-include-path', join_paths(meson.current_source_dir()), --] -+if get_option('enable-host-gi') -+ scanner_command = [ -+ 'g-ir-scanner', -+ '--output=@OUTPUT@', -+ '--no-libtool', -+ '--reparse-validate', -+ '--add-include-path', join_paths(meson.current_build_dir()), -+ '--add-include-path', join_paths(meson.current_source_dir()), -+ ] -+else -+ scanner_command = [ -+ python, -+ girscanner, -+ '--output=@OUTPUT@', -+ '--no-libtool', -+ '--reparse-validate', -+ '--add-include-path', join_paths(meson.current_build_dir()), -+ '--add-include-path', join_paths(meson.current_source_dir()), -+ ] -+endif -+ - - dep_type = glib_dep.type_name() - if dep_type == 'internal' -@@ -57,6 +69,12 @@ if dep_type == 'internal' - '--extra-library=glib-2.0', '--extra-library=gobject-2.0'] - endif - -+if get_option('enable-gi-cross-wrapper') != '' -+ scanner_command += ['--use-binary-wrapper=' + get_option('enable-gi-cross-wrapper')] -+endif -+if get_option('enable-gi-ldd-wrapper') != '' -+ scanner_command += ['--use-ldd-wrapper=' + get_option('enable-gi-ldd-wrapper')] -+endif - # Take a glob and print to newlines - globber = ''' - from glob import glob -@@ -83,8 +101,8 @@ glib_command = scanner_command + [ - - if dep_type == 'pkgconfig' - glib_command += ['--external-library', '--pkg=glib-2.0'] -- glib_libdir = glib_dep.get_pkgconfig_variable('libdir') -- glib_incdir = join_paths(glib_dep.get_pkgconfig_variable('includedir'), 'glib-2.0') -+ glib_libdir = get_option('pkgconfig-sysroot-path') + glib_dep.get_pkgconfig_variable('libdir') -+ glib_incdir = get_option('pkgconfig-sysroot-path') + join_paths(glib_dep.get_pkgconfig_variable('includedir'), 'glib-2.0') - glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include') - glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h') - glib_files += join_paths(glib_libincdir, 'glibconfig.h') -@@ -338,7 +356,7 @@ endforeach - if giounix_dep.found() - if dep_type == 'pkgconfig' - gio_command += ['--pkg=gio-unix-2.0'] -- giounix_includedir = join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0') -+ giounix_includedir = get_option('pkgconfig-sysroot-path') + join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0') - # Get the installed gio-unix header list - ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h'))) - if ret.returncode() != 0 -@@ -420,16 +438,25 @@ gir_files += custom_target('gir-girepository', - ] - ) - -+if get_option('enable-gi-cross-wrapper') != '' -+ gircompiler_command = [get_option('enable-gi-cross-wrapper'), gircompiler.full_path(), '-o', '@OUTPUT@', '@INPUT@', -+ '--includedir', meson.current_build_dir(), -+ '--includedir', meson.current_source_dir(), -+ ] -+else -+ gircompiler_command = [gircompiler, '-o', '@OUTPUT@', '@INPUT@', -+ '--includedir', meson.current_build_dir(), -+ '--includedir', meson.current_source_dir(), -+ ] -+endif -+ - typelibs = [] - foreach gir : gir_files - typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(), - input: gir, - output: '@BASENAME@.typelib', - depends: [gobject_gir, ], -- command: [gircompiler, '-o', '@OUTPUT@', '@INPUT@', -- '--includedir', meson.current_build_dir(), -- '--includedir', meson.current_source_dir(), -- ], -+ command: gircompiler_command, - install: true, - install_dir: typelibdir, - ) -diff --git meson.build meson.build -index 0ab2dc3..2544ff3 100644 ---- a/meson.build -+++ b/meson.build -@@ -163,7 +163,9 @@ endif - subdir('girepository') - subdir('tools') - subdir('giscanner') --subdir('gir') -+if get_option('enable-introspection-data') == true -+ subdir('gir') -+endif - subdir('examples') - subdir('docs') - subdir('tests') -diff --git meson_options.txt meson_options.txt -index 445a68a..a325511 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -25,3 +25,23 @@ option('python', type: 'string', value: 'python3', - option('gir_dir_prefix', type: 'string', - description: 'Intermediate prefix for gir installation under ${prefix}' - ) -+ -+option('enable-host-gi', type: 'boolean', value : false, -+ description: 'Use gobject introspection tools installed in the host system (useful when cross-compiling)' -+) -+ -+option('enable-gi-cross-wrapper', type: 'string', -+ description: 'Use a wrapper to run gicompiler and binaries produced by giscanner (useful when cross-compiling)' -+) -+ -+option('enable-gi-ldd-wrapper', type: 'string', -+ description: 'Use a ldd wrapper instead of system ldd command in giscanner (useful when cross-compiling)' -+) -+ -+option('enable-introspection-data', type: 'boolean', value : true, -+ description: 'Build introspection data (.gir and .typelib files) in addition to library and tools' -+) -+ -+option('pkgconfig-sysroot-path', type: 'string', -+ description: 'Specify a sysroot path to prepend to pkgconfig output (useful when cross-compiling)' -+) diff --git a/srcpkgs/gobject-introspection/patches/0003-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch b/srcpkgs/gobject-introspection/patches/0003-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch deleted file mode 100644 index 86cd4ead2a..0000000000 --- a/srcpkgs/gobject-introspection/patches/0003-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ca0fb17e268c176ac89df081b1efa4a42989f014 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 23 Mar 2016 17:07:28 +0200 -Subject: [PATCH] Revert an incomplete upstream attempt at cross-compile - support - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin - ---- - common.mk | 4 ---- - giscanner/gdumpparser.py | 6 ------ - 2 files changed, 10 deletions(-) - -diff --git a/common.mk b/common.mk -index b778f7a..e26c637 100644 ---- a/common.mk -+++ b/common.mk -@@ -24,12 +24,8 @@ INTROSPECTION_SCANNER_ARGS = \ - --add-include-path=$(top_builddir) \ - --add-include-path=$(top_builddir)/gir - --# GI_CROSS_LAUNCHER is the command to use for executing g-ir-compiler. --# Normally will be undefined but can be set (e.g. to wine or qemu) --# when cross-compiling - INTROSPECTION_COMPILER = \ - env PATH=".libs:$(PATH)" \ -- $(GI_CROSS_LAUNCHER) \ - $(top_builddir)/g-ir-compiler$(EXEEXT) - - INTROSPECTION_COMPILER_ARGS = \ -diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py -index cd9d94d..b41772c 100644 ---- a/giscanner/gdumpparser.py -+++ b/giscanner/gdumpparser.py -@@ -161,12 +161,6 @@ blob containing data gleaned from GObject's primitive introspection.""" - out_path = os.path.join(self._binary.tmpdir, 'dump.xml') - - args = [] -- -- # Prepend the launcher command and arguments, if defined -- launcher = os.environ.get('GI_CROSS_LAUNCHER') -- if launcher: -- args.extend(launcher.split()) -- - args.extend(self._binary.args) - args.append('--introspect-dump=%s,%s' % (in_path, out_path)) - diff --git a/srcpkgs/gobject-introspection/patches/0009-giscanner-add-use-binary-wrapper-option.patch b/srcpkgs/gobject-introspection/patches/0009-giscanner-add-use-binary-wrapper-option.patch deleted file mode 100644 index 45fe27ad61..0000000000 --- a/srcpkgs/gobject-introspection/patches/0009-giscanner-add-use-binary-wrapper-option.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 46dbe963aa6435591c87e788cdb54bc0daeac42e Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 19 Oct 2015 18:26:40 +0300 -Subject: [PATCH] giscanner: add --use-binary-wrapper option - -With this option, giscanner will use a wrapper executable to run -binaries it's producing, instead of running them directly. This -is useful when binaries are cross-compiled and cannot be run directly, -but they can be run using for example QEMU emulation. - -Upstream-Status: Pending [review on oe-core list] -Signed-off-by: Alexander Kanavin - ---- - giscanner/scannermain.py | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py -index ccb14e9..061def0 100644 ---- a/giscanner/scannermain.py -+++ b/giscanner/scannermain.py -@@ -126,6 +126,9 @@ def _get_option_parser(): - parser.add_option("", "--program", - action="store", dest="program", default=None, - help="program to execute") -+ parser.add_option("", "--use-binary-wrapper", -+ action="store", dest="wrapper", default=None, -+ help="wrapper to use for running programs (useful when cross-compiling)") - parser.add_option("", "--program-arg", - action="append", dest="program_args", default=[], - help="extra arguments to program") -@@ -418,6 +421,17 @@ def create_binary(transformer, options, args): - gdump_parser.get_error_quark_functions()) - - shlibs = resolve_shlibs(options, binary, options.libraries) -+ if options.wrapper: -+ # The wrapper needs the binary itself, not the libtool wrapper script, -+ # so we check if libtool has sneaked the binary into .libs subdirectory -+ # and adjust the path accordingly -+ import os.path -+ dir_name, binary_name = os.path.split(binary.args[0]) -+ libtool_binary = os.path.join(dir_name, '.libs', binary_name) -+ if os.path.exists(libtool_binary): -+ binary.args[0] = libtool_binary -+ # Then prepend the wrapper to the command line to execute -+ binary.args = [options.wrapper] + binary.args - gdump_parser.set_introspection_binary(binary) - gdump_parser.parse() - return shlibs diff --git a/srcpkgs/gobject-introspection/patches/0010-giscanner-add-a-use-ldd-wrapper-option.patch b/srcpkgs/gobject-introspection/patches/0010-giscanner-add-a-use-ldd-wrapper-option.patch deleted file mode 100644 index 2e36b64bab..0000000000 --- a/srcpkgs/gobject-introspection/patches/0010-giscanner-add-a-use-ldd-wrapper-option.patch +++ /dev/null @@ -1,45 +0,0 @@ -From eba2b999e81d81b5f43bb1f0ab33881786bebdec Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 30 Oct 2015 16:28:46 +0200 -Subject: [PATCH] giscanner: add a --use-ldd-wrapper option - -This is useful in cross-compile environments where system's ldd -command does not work on binaries built for a different architecture - -Upstream-Status: Pending [review in oe-core] -Signed-off-by: Alexander Kanavin - ---- - giscanner/scannermain.py | 3 +++ - giscanner/shlibs.py | 4 +++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py -index 061def0..5cb793e 100644 ---- a/giscanner/scannermain.py -+++ b/giscanner/scannermain.py -@@ -129,6 +129,9 @@ def _get_option_parser(): - parser.add_option("", "--use-binary-wrapper", - action="store", dest="wrapper", default=None, - help="wrapper to use for running programs (useful when cross-compiling)") -+ parser.add_option("", "--use-ldd-wrapper", -+ action="store", dest="ldd_wrapper", default=None, -+ help="wrapper to use instead of ldd (useful when cross-compiling)") - parser.add_option("", "--program-arg", - action="append", dest="program_args", default=[], - help="extra arguments to program") -diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py -index 7b7b2d0..01d21a3 100644 ---- a/giscanner/shlibs.py -+++ b/giscanner/shlibs.py -@@ -102,7 +102,9 @@ def _resolve_non_libtool(options, binary, libraries): - args.extend(libtool) - args.append('--mode=execute') - platform_system = platform.system() -- if platform_system == 'Darwin': -+ if options.ldd_wrapper: -+ args.extend([options.ldd_wrapper, binary.args[0]]) -+ elif platform_system == 'Darwin': - args.extend(['otool', '-L', binary.args[0]]) - else: - args.extend(['ldd', binary.args[0]]) diff --git a/srcpkgs/gobject-introspection/patches/fix-cross-tests.patch b/srcpkgs/gobject-introspection/patches/fix-cross-tests.patch deleted file mode 100644 index 75c3804d6a..0000000000 --- a/srcpkgs/gobject-introspection/patches/fix-cross-tests.patch +++ /dev/null @@ -1,311 +0,0 @@ -diff --git tests/meson.build tests/meson.build -index 7e01595..813a1d1 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -45,13 +45,24 @@ test_install_dir = join_paths(get_option('datadir'), 'gobject-introspection-1.0' - - install_data(installed_sources, install_dir: test_install_dir) - -+if get_option('enable-host-gi') -+ ev_scanner_command = [ -+ 'g-ir-scanner', -+ ] -+else -+ ev_scanner_command = [ -+ python, -+ girscanner, -+ ] -+endif -+ -+ - # Generate everything.h and everything.c: - test_everything_files = custom_target('everything', - output: ['everything.h', 'everything.c'], - depends: typelibs, - command: [ -- python, -- girscanner, -+ ev_scanner_command, - '--generate-typelib-tests=Everything,@OUTPUT0@,@OUTPUT1@', - '--function-decoration=_GI_TEST_EXTERN', - '--include-first-in-src=config.h', -@@ -101,13 +112,7 @@ if glib_dep.type_name() == 'pkgconfig' - output: 'Everything-1.0.gir', - depends: [everything_lib] + typelibs, - command: [ -- python, -- girscanner, -- '--output=@OUTPUT@', -- '--no-libtool', -- '--reparse-validate', -- '--add-include-path', join_paths(meson.source_root(), 'gir'), -- '--add-include-path', join_paths(meson.build_root(), 'gir'), -+ scanner_command, - '--warn-all', - '--warn-error', - '--namespace=Everything', -@@ -125,13 +130,7 @@ if glib_dep.type_name() == 'pkgconfig' - output: 'GIMarshallingTests-1.0.gir', - depends: [gimarshallingtests_lib] + typelibs, - command: [ -- python, -- girscanner, -- '--output=@OUTPUT@', -- '--no-libtool', -- '--reparse-validate', -- '--add-include-path', join_paths(meson.source_root(), 'gir'), -- '--add-include-path', join_paths(meson.build_root(), 'gir'), -+ scanner_command, - '--warn-all', - '--warn-error', - '--namespace=GIMarshallingTests', -@@ -145,15 +144,25 @@ if glib_dep.type_name() == 'pkgconfig' - ] - ) - -+if get_option('enable-gi-cross-wrapper') != '' -+ gircompiler_command = [get_option('enable-gi-cross-wrapper'), gircompiler.full_path(), '-o', '@OUTPUT@', '@INPUT@', -+ '--includedir', meson.current_build_dir(), -+ '--includedir', meson.current_source_dir(), -+ ] -+else -+ gircompiler_command = [gircompiler, '-o', '@OUTPUT@', '@INPUT@', -+ '--includedir', meson.current_build_dir(), -+ '--includedir', join_paths(meson.build_root(), 'gir'), -+ ] -+endif -+ -+ - foreach gir : test_gir_files - test_typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(), - input: gir, - output: '@BASENAME@.typelib', - depends: [gobject_gir, ], -- command: [gircompiler, '-o', '@OUTPUT@', '@INPUT@', -- '--includedir', join_paths(meson.build_root(), 'gir'), -- '--includedir', meson.current_build_dir() -- ], -+ command: gircompiler_command, - ) - endforeach - -diff --git tests/offsets/meson.build tests/offsets/meson.build -index ca1471f..3a86fb3 100644 ---- a/tests/offsets/meson.build -+++ b/tests/offsets/meson.build -@@ -18,13 +18,7 @@ if glib_dep.type_name() == 'pkgconfig' - output: 'Offsets-1.0.gir', - depends: [test_offsets_lib] + typelibs, - command: [ -- python, -- girscanner, -- '--output=@OUTPUT@', -- '--no-libtool', -- '--reparse-validate', -- '--add-include-path', join_paths(meson.source_root(), 'gir'), -- '--add-include-path', join_paths(meson.build_root(), 'gir'), -+ scanner_command, - '--warn-all', - '--warn-error', - '--namespace=Offsets', -@@ -43,10 +37,7 @@ if glib_dep.type_name() == 'pkgconfig' - input: test_offsets_gir, - output: '@BASENAME@.typelib', - depends: [gobject_gir, ], -- command: [gircompiler, '-o', '@OUTPUT@', '@INPUT@', -- '--includedir', join_paths(meson.build_root(), 'gir'), -- '--includedir', meson.current_build_dir() -- ], -+ command: gircompiler_command, - ) - - gitestoffsets_exe = executable('gitestoffsets', -diff --git tests/scanner/meson.build tests/scanner/meson.build -index 4210488..b311cfd 100644 ---- a/tests/scanner/meson.build -+++ b/tests/scanner/meson.build -@@ -99,25 +99,13 @@ regress_lib = shared_library('regress-1.0', - - python_path = run_command(python, ['-c', 'import sys; sys.stdout.write(sys.executable)']).stdout() - --gircompiler_command = [ -- gircompiler, '-o', '@OUTPUT@', '@INPUT@', -- '--includedir', join_paths(meson.build_root(), 'gir'), -- '--includedir', meson.current_build_dir(), --] -- - if glib_dep.type_name() == 'pkgconfig' - typedef_gir = custom_target('gir-typedef', - input: ['typedefs.c', 'typedefs.h'], - output: 'Typedefs-1.0.gir', - depends: [typedef_lib] + typelibs, - command: [ -- python, -- girscanner, -- '--output=@OUTPUT@', -- '--no-libtool', -- '--reparse-validate', -- '--add-include-path', join_paths(meson.source_root(), 'gir'), -- '--add-include-path', join_paths(meson.build_root(), 'gir'), -+ scanner_command, - '--warn-all', - '--warn-error', - '--namespace=Typedefs', -@@ -149,13 +137,7 @@ if glib_dep.type_name() == 'pkgconfig' - output: 'Bar-1.0.gir', - depends: [barapp_lib] + typelibs, - command: [ -- python, -- girscanner, -- '--output=@OUTPUT@', -- '--no-libtool', -- '--reparse-validate', -- '--add-include-path', join_paths(meson.source_root(), 'gir'), -- '--add-include-path', join_paths(meson.build_root(), 'gir'), -+ scanner_command, - '--warn-all', - '--warn-error', - '--namespace=Bar', -@@ -186,13 +168,7 @@ if glib_dep.type_name() == 'pkgconfig' - output: 'SLetter-1.0.gir', - depends: [sletter_lib] + typelibs, - command: [ -- python, -- girscanner, -- '--output=@OUTPUT@', -- '--no-libtool', -- '--reparse-validate', -- '--add-include-path', join_paths(meson.source_root(), 'gir'), -- '--add-include-path', join_paths(meson.build_root(), 'gir'), -+ scanner_command, - '--warn-all', - '--warn-error', - '--namespace=SLetter', -@@ -222,13 +198,7 @@ if glib_dep.type_name() == 'pkgconfig' - output: 'WarnLib-1.0.gir', - depends: [warnlib_lib] + typelibs, - command: [ -- python, -- girscanner, -- '--output=@OUTPUT@', -- '--no-libtool', -- '--reparse-validate', -- '--add-include-path', join_paths(meson.source_root(), 'gir'), -- '--add-include-path', join_paths(meson.build_root(), 'gir'), -+ scanner_command, - '--namespace=WarnLib', - '--nsversion=1.0', - '--include=Gio-2.0', -@@ -256,13 +226,7 @@ if glib_dep.type_name() == 'pkgconfig' - output: 'Utility-1.0.gir', - depends: [utility_lib] + typelibs, - command: [ -- python, -- girscanner, -- '--output=@OUTPUT@', -- '--no-libtool', -- '--reparse-validate', -- '--add-include-path', join_paths(meson.source_root(), 'gir'), -- '--add-include-path', join_paths(meson.build_root(), 'gir'), -+ scanner_command, - '--warn-all', - '--warn-error', - '--namespace=Utility', -@@ -292,13 +256,7 @@ if glib_dep.type_name() == 'pkgconfig' - output: 'GtkFrob-1.0.gir', - depends: [gtkfrob_lib] + typelibs, - command: [ -- python, -- girscanner, -- '--output=@OUTPUT@', -- '--no-libtool', -- '--reparse-validate', -- '--add-include-path', join_paths(meson.source_root(), 'gir'), -- '--add-include-path', join_paths(meson.build_root(), 'gir'), -+ scanner_command, - '--warn-all', - '--warn-error', - '--namespace=GtkFrob', -@@ -329,13 +287,7 @@ if glib_dep.type_name() == 'pkgconfig' - output: 'GetType-1.0.gir', - depends: [gettype_lib] + typelibs, - command: [ -- python, -- girscanner, -- '--output=@OUTPUT@', -- '--no-libtool', -- '--reparse-validate', -- '--add-include-path', join_paths(meson.source_root(), 'gir'), -- '--add-include-path', join_paths(meson.build_root(), 'gir'), -+ scanner_command, - '--namespace=GetType', - '--nsversion=1.0', - '--identifier-prefix=GetType', -@@ -365,10 +317,7 @@ if glib_dep.type_name() == 'pkgconfig' - output: 'Symbolfilter-1.0.gir', - depends: typelibs, - command: [ -- python, -- girscanner, -- '--output=@OUTPUT@', -- '--no-libtool', -+ scanner_command, - '--reparse-validate', - '--namespace=Symbolfilter', - '--nsversion=1.0', -@@ -391,12 +340,8 @@ if glib_dep.type_name() == 'pkgconfig' - output: 'Identfilter-1.0.gir', - depends: typelibs, - command: [ -- python, -- girscanner, -- '--output=@OUTPUT@', -- '--no-libtool', -+ scanner_command, - '--accept-unprefixed', -- '--reparse-validate', - '--namespace=Identfilter', - '--nsversion=1.0', - '--header-only', -@@ -418,13 +363,9 @@ if glib_dep.type_name() == 'pkgconfig' - output: 'Headeronly-1.0.gir', - depends: typelibs, - command: [ -- python, -- girscanner, -- '--output=@OUTPUT@', -- '--no-libtool', -+ scanner_command, - '--warn-all', - '--warn-error', -- '--reparse-validate', - '--namespace=Headeronly', - '--nsversion=1.0', - '--header-only', -@@ -452,13 +393,7 @@ if glib_dep.type_name() == 'pkgconfig' - output: 'Regress-1.0.gir', - depends: [regress_lib] + typelibs + [utility_gir], - command: [ -- python, -- girscanner, -- '--output=@OUTPUT@', -- '--no-libtool', -- '--reparse-validate', -- '--add-include-path', join_paths(meson.source_root(), 'gir'), -- '--add-include-path', join_paths(meson.build_root(), 'gir'), -+ scanner_command, - '--add-include-path', meson.current_build_dir(), - '--namespace=Regress', - '--nsversion=1.0', -@@ -484,7 +419,10 @@ if glib_dep.type_name() == 'pkgconfig' - 'generate-typelib-regress', - input: regress_gir, - output: '@BASENAME@.typelib', -- command: gircompiler_command, -+ command: [ -+ gircompiler_command, -+ '--includedir', meson.current_build_dir(), -+ ] - ) - test_typelibs += regress_typelib - endif diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template index c0bb1e412c..4406f3e971 100644 --- a/srcpkgs/gobject-introspection/template +++ b/srcpkgs/gobject-introspection/template @@ -1,28 +1,27 @@ # Template file for 'gobject-introspection' pkgname=gobject-introspection -version=1.60.0 -revision=7 +version=1.64.0 +revision=1 build_style=meson pycompile_dirs="usr/lib/${pkgname}/giscanner" hostmakedepends="flex pkg-config" -makedepends="cairo-devel libffi-devel libglib-devel libxml2-devel python3-devel" +makedepends="cairo-devel libffi-devel libglib-devel libxml2-devel python3-devel python3-Mako python3-Markdown" depends="libgirepository-devel python3-Mako python3-Markdown" short_desc="Introspection system for GObject-based libraries" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GObjectIntrospection" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=9efe4090cb59717126701e97062e784773f800b8d47af14c4d278ebf194df35d +checksum=eac05a63091c81adfdc8ef34820bcc7e7778c5b9e34734d344fc9e69ddf4fc82 pycompile_version="$py3_ver" - patch_args="-Np1" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" gobject-introspection qemu-user-static prelink-cross" - configure_args+=" -Denable-host-gi=true - -Denable-gi-cross-wrapper=/usr/bin/g-ir-scanner-qemuwrapper - -Denable-gi-ldd-wrapper=/usr/bin/g-ir-scanner-lddwrapper - -Dpkgconfig-sysroot-path=${XBPS_CROSS_BASE}" + configure_args+=" -Dgi_cross_use_host_gi=true + -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper + -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper + -Dgi_cross_pkgconfig_sysroot_path=${XBPS_CROSS_BASE}" fi post_install() {