From patchwork Wed Jan 12 01:25:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1578855 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=iELklTWR; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JYVJ00c56z9sSs for ; Wed, 12 Jan 2022 12:25:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 709574091C; Wed, 12 Jan 2022 01:25:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YCNabXKGdMtn; Wed, 12 Jan 2022 01:25:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id C5E6540924; Wed, 12 Jan 2022 01:25:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 595ED1BF32B for ; Wed, 12 Jan 2022 01:25:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 465DD40924 for ; Wed, 12 Jan 2022 01:25:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HkEzRwKgJBKN for ; Wed, 12 Jan 2022 01:25:40 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) by smtp2.osuosl.org (Postfix) with ESMTPS id 694564091C for ; Wed, 12 Jan 2022 01:25:40 +0000 (UTC) Received: by mail-il1-x135.google.com with SMTP id c4so854555iln.7 for ; Tue, 11 Jan 2022 17:25:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=D6TPIJdB2rR1MxfA6dt9PmeFV/sCN54plNMet0yxrTU=; b=iELklTWReIQ13uye+JCH9ViOzhJbH4mvkxxpqxV1WDPVLEDZvyWtZjk2v5L0gD0yD2 8nm/Q/MDOurT+yIZyejJPR52NSb9RljHvgX+pS4EkQ9FRyUXusfh7Xfy+QPf15blrviU 1tYQqHwW/lUCUc+9jJmEAoGtyH1IQt6aAGJ++DmdgMQ7j+BFo3VOTvZ5OpqyWPbbWbmZ n3p8/iQ49IvE27ca7uLR+tKavFQTTmLudHTe/uuqN/bfurwICRgOhh3qMTE+THWD7B4g jh6a6qdlZ0DcO6EdBgUAcUrgpb4KbvCQZZoPsGUx0pSbEF85I5ndmR3gfy6rEAVq1d48 XrYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=D6TPIJdB2rR1MxfA6dt9PmeFV/sCN54plNMet0yxrTU=; b=ZPHPUoIqrrltMRewHVAkczDsHD8jHvhnjk4RF5tsU4+elM42Tp67pB5IhwONB/Rp5x wbM5LXRaezVZiYzUZngPj90062/oMdoThobZwwxQtz+nQ4dG5jyMnmKUsmZPUDEtymEO p/jKnvu37uj7cXodSKChc3O83/Zwe9vARHYuAe0tuCeOkErVRCgHyMoM4R9H1gIcw0ob Epr6Fy2MZoXjhpHFwImfsQJAcTa1Y+jS/q6jdU8I6mdKTh9iOj9isskc0x4dviYGSTUr 7LWG3d72zJAMn6Kcvya6yLDPoERxxt6BKRwSjsVRSHdhpWLCdR9gNvGW+yZtmOc4VXLq A+rw== X-Gm-Message-State: AOAM533hozAZQhgCl6RcIKpSm7CrCdovKoR2b+DNzLNuH3etEZfXUnJM sdKPRHl8bkGUKCu0NzvIAssBMEkCQVY= X-Google-Smtp-Source: ABdhPJyhi9yZCCTESlKkZ5DHkGQfHf0ISeFgmRj8RocRCqtY+LZqHZfdOSad2M0rT1kLqmdOHhe3BA== X-Received: by 2002:a05:6e02:14f:: with SMTP id j15mr3498973ilr.299.1641950739266; Tue, 11 Jan 2022 17:25:39 -0800 (PST) Received: from james-x399.localdomain (97-118-242-51.hlrn.qwest.net. [97.118.242.51]) by smtp.gmail.com with ESMTPSA id e16sm4031758ils.34.2022.01.11.17.25.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 17:25:39 -0800 (PST) From: James Hilliard To: buildroot@buildroot.org Date: Tue, 11 Jan 2022 18:25:37 -0700 Message-Id: <20220112012537.1362197-1-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/gobject-introspection: bump to version 1.70.0 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: James Hilliard Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Rebase patches. Backport a patch to fix a build error on latest meson. giscanner/scannerlexer.l license hash change due to add float types: https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/60b0cf2fc2fdc74d13832d1fdde21cfdc813b84e Signed-off-by: James Hilliard --- .../0001-disable-tests.patch | 10 +- .../0002-Add-rpath-links-to-ccompiler.patch | 6 +- ...error-return-codes-from-ldd-wrapper.patch} | 7 +- ...04-build-Avoid-the-doctemplates-hack.patch | 221 ++++++++++++++++++ .../gobject-introspection.hash | 6 +- .../gobject-introspection.mk | 2 +- 6 files changed, 238 insertions(+), 14 deletions(-) rename package/gobject-introspection/{0003-ignore-error-return-codes-from-ldd-wrapper.patch => 0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch} (90%) create mode 100644 package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch diff --git a/package/gobject-introspection/0001-disable-tests.patch b/package/gobject-introspection/0001-disable-tests.patch index 01b11998bd..ed2d9d6fc0 100644 --- a/package/gobject-introspection/0001-disable-tests.patch +++ b/package/gobject-introspection/0001-disable-tests.patch @@ -1,4 +1,4 @@ -From 473b4288d8f4e891d0d21f7b60ef8053c5cd7af9 Mon Sep 17 00:00:00 2001 +From c87faf380ddf44da9d624dabd28178c9065f0f76 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 3 Feb 2020 10:07:15 -0800 Subject: [PATCH] disable tests @@ -13,22 +13,22 @@ Signed-off-by: Adam Duskett 1 file changed, 6 deletions(-) diff --git a/meson.build b/meson.build -index eed4d6b..5058664 100644 +index c2cb577f..65ce7adf 100644 --- a/meson.build +++ b/meson.build -@@ -222,12 +222,6 @@ if get_option('build_introspection_data') == true +@@ -225,12 +225,6 @@ else endif subdir('docs') -# The tests will also run, which is not possible if they -# were built for a different architecture. -if not meson.is_cross_build() -- subdir('tests') +- subdir('tests') -endif - install_data('Makefile.introspection', install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0')) install_data('m4/introspection.m4', install_dir: join_paths(get_option('datadir'), 'aclocal')) -- -2.24.1 +2.25.1 diff --git a/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch b/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch index 9b9ae99779..e21da42ce7 100644 --- a/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch +++ b/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch @@ -1,4 +1,4 @@ -From 72a427bc50daee8f1ded0e9221e53dbbf2a80f08 Mon Sep 17 00:00:00 2001 +From 952e2e2bb6a22ec8824223b03b65cb28361c6e34 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 14 Mar 2018 12:07:10 -0400 Subject: [PATCH] Add rpath links to ccompiler @@ -12,7 +12,7 @@ Signed-off-by: Adam Duskett 1 file changed, 2 insertions(+) diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py -index a8bd5b1..51bb9bc 100644 +index cb97e76f..d29b28c8 100644 --- a/giscanner/ccompiler.py +++ b/giscanner/ccompiler.py @@ -231,6 +231,8 @@ class CCompiler(object): @@ -25,5 +25,5 @@ index a8bd5b1..51bb9bc 100644 os.pathsep.join(runtime_paths + [os.environ[envvar]]) else: -- -2.14.3 +2.25.1 diff --git a/package/gobject-introspection/0003-ignore-error-return-codes-from-ldd-wrapper.patch b/package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch similarity index 90% rename from package/gobject-introspection/0003-ignore-error-return-codes-from-ldd-wrapper.patch rename to package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch index d43dc1393e..f1ea518954 100644 --- a/package/gobject-introspection/0003-ignore-error-return-codes-from-ldd-wrapper.patch +++ b/package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch @@ -1,4 +1,4 @@ -From f742da8b3913f4818d3f419117076afe62f4dbf4 Mon Sep 17 00:00:00 2001 +From e0fc4a2a5161a36483ddc518be9bb14390f11b19 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 5 Sep 2018 16:46:52 +0200 Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper @@ -14,7 +14,7 @@ Signed-off-by: Adam Duskett 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py -index d67df95..80352a6 100644 +index 9f8ab5df..7a1a72fe 100644 --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py @@ -103,7 +103,7 @@ def _resolve_non_libtool(options, binary, libraries): @@ -26,3 +26,6 @@ index d67df95..80352a6 100644 if isinstance(output, bytes): output = output.decode("utf-8", "replace") +-- +2.25.1 + diff --git a/package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch b/package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch new file mode 100644 index 0000000000..0b70b5c4c0 --- /dev/null +++ b/package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch @@ -0,0 +1,221 @@ +From 0504b26ec2adb13dfdff51679d84ad2f69af5918 Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi +Date: Tue, 11 Jan 2022 15:51:10 +0000 +Subject: [PATCH] build: Avoid the doctemplates hack +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The hack that copies the doctemplates directory into the build +directory has stopped working with newer versions of Meson; while it's +possible to copy files, custom_target() cannot depend on a directory. +Additionally, the dependency has always been broken. + +Instead, we enumerate the template files—after all, it's not like they +change a lot—and then we list them as dependencies for the test targets. + +Fixes: #414 + +Signed-off-by: James Hilliard +[james.hilliard1@gmail.com: backport from upstream commit +effb1e09dee263cdac4ec593e8caf316e6f01fe2] +--- + giscanner/doctemplates/devdocs/meson.build | 19 +++++++ + giscanner/doctemplates/mallard/meson.build | 63 ++++++++++++++++++++++ + giscanner/meson.build | 14 ++--- + tests/scanner/meson.build | 24 +++++---- + 4 files changed, 98 insertions(+), 22 deletions(-) + create mode 100644 giscanner/doctemplates/devdocs/meson.build + create mode 100644 giscanner/doctemplates/mallard/meson.build + +diff --git a/giscanner/doctemplates/devdocs/meson.build b/giscanner/doctemplates/devdocs/meson.build +new file mode 100644 +index 00000000..2037182a +--- /dev/null ++++ b/giscanner/doctemplates/devdocs/meson.build +@@ -0,0 +1,19 @@ ++doc_templates += files([ ++ 'Gjs/_doc.tmpl', ++ 'Gjs/_index.tmpl', ++ 'Gjs/_method.tmpl', ++ 'Gjs/_methods.tmpl', ++ 'Gjs/_properties.tmpl', ++ 'Gjs/_signals.tmpl', ++ 'Gjs/_staticmethods.tmpl', ++ 'Gjs/_vfuncs.tmpl', ++ 'Gjs/base.tmpl', ++ 'Gjs/callback.tmpl', ++ 'Gjs/class.tmpl', ++ 'Gjs/default.tmpl', ++ 'Gjs/enum.tmpl', ++ 'Gjs/function.tmpl', ++ 'Gjs/interface.tmpl', ++ 'Gjs/method.tmpl', ++ 'Gjs/namespace.tmpl', ++]) +diff --git a/giscanner/doctemplates/mallard/meson.build b/giscanner/doctemplates/mallard/meson.build +new file mode 100644 +index 00000000..5fe4e2af +--- /dev/null ++++ b/giscanner/doctemplates/mallard/meson.build +@@ -0,0 +1,63 @@ ++base_templates = files([ ++ 'base.tmpl', ++ 'class.tmpl', ++ 'namespace.tmpl', ++]) ++ ++c_templates = files([ ++ 'C/callback.tmpl', ++ 'C/class.tmpl', ++ 'C/constructor.tmpl', ++ 'C/default.tmpl', ++ 'C/enum.tmpl', ++ 'C/field.tmpl', ++ 'C/function.tmpl', ++ 'C/interface.tmpl', ++ 'C/method.tmpl', ++ 'C/namespace.tmpl', ++ 'C/property.tmpl', ++ 'C/record.tmpl', ++ 'C/signal.tmpl', ++ 'C/vfunc.tmpl', ++]) ++ ++gjs_templates = files([ ++ 'Gjs/callback.tmpl', ++ 'Gjs/class.tmpl', ++ 'Gjs/constructor.tmpl', ++ 'Gjs/default.tmpl', ++ 'Gjs/enum.tmpl', ++ 'Gjs/field.tmpl', ++ 'Gjs/function.tmpl', ++ 'Gjs/interface.tmpl', ++ 'Gjs/method.tmpl', ++ 'Gjs/namespace.tmpl', ++ 'Gjs/property.tmpl', ++ 'Gjs/record.tmpl', ++ 'Gjs/signal.tmpl', ++ 'Gjs/vfunc.tmpl', ++]) ++ ++py_templates = files([ ++ 'Python/callback.tmpl', ++ 'Python/class.tmpl', ++ 'Python/constructor.tmpl', ++ 'Python/default.tmpl', ++ 'Python/enum.tmpl', ++ 'Python/field.tmpl', ++ 'Python/function.tmpl', ++ 'Python/interface.tmpl', ++ 'Python/method.tmpl', ++ 'Python/namespace.tmpl', ++ 'Python/property.tmpl', ++ 'Python/record.tmpl', ++ 'Python/signal.tmpl', ++ 'Python/vfunc.tmpl', ++]) ++ ++doc_templates += [ ++ base_templates, ++ c_templates, ++ gjs_templates, ++ py_templates, ++] +diff --git a/giscanner/meson.build b/giscanner/meson.build +index 41edcd44..3d7dc678 100644 +--- a/giscanner/meson.build ++++ b/giscanner/meson.build +@@ -53,17 +53,9 @@ configure_file(input : '../girepository/gdump.c', + + install_subdir('doctemplates', install_dir: giscannerdir) + +-# XXX: this doesn't track the input, but there is nothing to copy many files +-# in meson. +-doc_templates = custom_target('copy-templates', +- input : 'doctemplates', +- output : 'doctemplates', +- command : [ +- python, '-c', +- 'import sys, shutil;' + +- 'shutil.rmtree(sys.argv[2], ignore_errors=True);' + +- 'shutil.copytree(sys.argv[1], sys.argv[2])', +- '@INPUT@', '@OUTPUT@']) ++doc_templates = [] ++subdir('doctemplates/devdocs') ++subdir('doctemplates/mallard') + + flex = find_program('flex', 'win_flex') + bison = find_program('bison', 'win_bison') +diff --git a/tests/scanner/meson.build b/tests/scanner/meson.build +index 5176b957..b81b3fd5 100644 +--- a/tests/scanner/meson.build ++++ b/tests/scanner/meson.build +@@ -525,19 +525,26 @@ foreach gir : test_girs + endforeach + + if has_girdoctool and glib_dep.type_name() == 'pkgconfig' ++ doctool_env = environment() ++ doctool_env.set('srcdir', meson.current_source_dir()) ++ doctool_env.set('builddir', meson.current_build_dir()) ++ + foreach language : ['C', 'Python', 'Gjs'] + regress_docs = custom_target( + 'generate-docs-' + language, + input: regress_gir, +- depends: [doc_templates], ++ depend_files: doc_templates, + build_by_default: not cairo_deps_found, ++ env: doctool_env, + output: 'Regress-1.0-' + language, + command: [ + python, girdoctool, + '--add-include-path=' + join_paths(build_root, 'gir'), + '--add-include-path=' + meson.current_build_dir(), + '--language', language, +- '@INPUT@', '-o', '@OUTPUT@'], ++ '--templates-dir=' + join_paths(meson.current_source_dir(), '../../giscanner/doctemplates'), ++ '@INPUT@', '-o', '@OUTPUT@', ++ ], + ) + + if cairo_deps_found +@@ -546,10 +553,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' + python, + args: [gi_tester, 'Regress-1.0-' + language], + depends: [regress_docs], +- env: [ +- 'srcdir=' + meson.current_source_dir(), +- 'builddir=' + meson.current_build_dir(), +- ], ++ env: doctool_env, + ) + endif + endforeach +@@ -557,9 +561,10 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' + regress_sections = custom_target( + 'generate-docs-sections', + input: regress_gir, +- depends: [doc_templates], ++ depend_files: [doc_templates], + build_by_default: not cairo_deps_found, + output: 'Regress-1.0-sections.txt', ++ env: doctool_env, + command: [ + python, girdoctool, + '--add-include-path=' + join_paths(build_root, 'gir'), +@@ -574,10 +579,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' + python, + args: [gi_tester, 'Regress-1.0-sections.txt'], + depends: [regress_sections], +- env: [ +- 'srcdir=' + meson.current_source_dir(), +- 'builddir=' + meson.current_build_dir(), +- ], ++ env: doctool_env, + ) + endif + endif +-- +2.25.1 + diff --git a/package/gobject-introspection/gobject-introspection.hash b/package/gobject-introspection/gobject-introspection.hash index e859ba1d3b..5b76df6b40 100644 --- a/package/gobject-introspection/gobject-introspection.hash +++ b/package/gobject-introspection/gobject-introspection.hash @@ -1,5 +1,5 @@ -#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.68/gobject-introspection-1.68.0.sha256sum -sha256 d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27 gobject-introspection-1.68.0.tar.xz +#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.70/gobject-introspection-1.70.0.sha256sum +sha256 902b4906e3102d17aa2fcb6dad1c19971c70f2a82a159ddc4a94df73a3cafc4a gobject-introspection-1.70.0.tar.xz sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING.LGPL sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL -sha256 ad35e98ae9342a3539c36f2171e84d175394ddcff625887290c751302cb02983 giscanner/scannerlexer.l +sha256 23f82cbc9808cdd8e902df38271434040ce0562ca382ac2a96f5e3bf807b6d31 giscanner/scannerlexer.l diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index 6a3d321cc7..41d64171a7 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -4,7 +4,7 @@ # ################################################################################ -GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.68 +GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.70 GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0 GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR) GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz