Skip to contentSkip to conversation

package/gobject-introspection: bump to version 1.70.0

PATCH Applied James Hilliard 2 participants 2 messages Jan 12, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/gobject-introspection: bump to version 1.70.0

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

---
 .../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
package/gobject-introspection/0001-disable-tests.patch +5 -5
index 01b11998bd..ed2d9d6fc0 100644
@@ -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 <[email protected]>
 Date: Mon, 3 Feb 2020 10:07:15 -0800
 Subject: [PATCH] disable tests
@@ -13,22 +13,22 @@ Signed-off-by: Adam Duskett <[email protected]>
  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
 
package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch +3 -3
index 9b9ae99779..e21da42ce7 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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
 
package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch renamed from package/gobject-introspection/0003-ignore-error-return-codes-from-ldd-wrapper.patch +5 -2
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
@@ -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 <[email protected]>
 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 <[email protected]>
  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
+
package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch new file +221 -0

221 lines not on this page · raw message

package/gobject-introspection/gobject-introspection.hash +3 -3
index e859ba1d3b..5b76df6b40 100644
@@ -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
package/gobject-introspection/gobject-introspection.mk +1 -1
index 6a3d321cc7..41d64171a7 100644
@@ -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
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 8 lines · On Tue, 11 Jan 2022 18:25:37 -0700 James Hilliard <[email protected]>…

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

Quoted 10 lines
---
 .../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

Applied to master, thanks.

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot