diff --git a/.checkpackageignore b/.checkpackageignore index 5cd43651b0..a76f02bcb3 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -521,8 +521,7 @@ package/gnupg/0001-build-Always-use-EXTERN_UNLESS_MAIN_MODULE-pattern.patch lib_ package/gnuplot/0001-configure-add-without-demo-option.patch lib_patch.Upstream package/go/go-src/0001-build.go-explicit-option-for-crosscompilation.patch lib_patch.Upstream package/gob2/0001-dont-include-from-prefix.patch lib_patch.Upstream -package/gobject-introspection/0001-disable-tests.patch lib_patch.Upstream -package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch lib_patch.Upstream +package/gobject-introspection/0001-Add-rpath-links-to-ccompiler.patch lib_patch.Upstream package/gpsd/S50gpsd Shellcheck lib_sysv.Indent lib_sysv.Variables package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch lib_patch.Upstream package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch lib_patch.Upstream diff --git a/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch b/package/gobject-introspection/0001-Add-rpath-links-to-ccompiler.patch similarity index 100% rename from package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch rename to package/gobject-introspection/0001-Add-rpath-links-to-ccompiler.patch diff --git a/package/gobject-introspection/0001-disable-tests.patch b/package/gobject-introspection/0001-disable-tests.patch deleted file mode 100644 index a39f51617b..0000000000 --- a/package/gobject-introspection/0001-disable-tests.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 - -If introspection data on the host is not built, meson throws the error: -"Unknown variable "typelibs". Because tests are not required, removing -the subdir tests altogether fixes this issue. - -Signed-off-by: Adam Duskett ---- - meson.build | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/meson.build b/meson.build -index c2cb577f..65ce7adf 100644 ---- a/meson.build -+++ b/meson.build -@@ -237,12 +237,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') --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.25.1 - diff --git a/package/gobject-introspection/gobject-introspection.hash b/package/gobject-introspection/gobject-introspection.hash index c39c06d102..044216c65f 100644 --- a/package/gobject-introspection/gobject-introspection.hash +++ b/package/gobject-introspection/gobject-introspection.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gobject-introspection/1.82/gobject-introspection-1.82.0.sha256sum -sha256 0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09 gobject-introspection-1.82.0.tar.xz +# From https://download.gnome.org/sources/gobject-introspection/1.84/gobject-introspection-1.84.0.sha256sum +sha256 945b57da7ec262e5c266b89e091d14be800cc424277d82a02872b7d794a84779 gobject-introspection-1.84.0.tar.xz sha256 faa2e414bd5f91d2d2c39e85c7cc3f2ccde05c3306f96b404f8ed8cf0266c279 COPYING.LGPL sha256 4c1cedcbb4a12ea964f1160dbbf36099e5a59b96129a99a1a1a61f2cb09271fb COPYING.GPL -sha256 fb538e24d22de4f8dab6b48b862be84469bcc089e1cf98f6f46d6f74f6f44655 giscanner/scannerlexer.l +sha256 60cf20b6532aa2f5622f753a55672630b789c04174acca361033e6f1ad29f8ab giscanner/scannerlexer.l diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index eb46fb61c1..dbf0ee3fa8 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -4,7 +4,7 @@ # ################################################################################ -GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.82 +GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.84 GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0 GOBJECT_INTROSPECTION_SITE = https://download.gnome.org/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR) GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz @@ -40,7 +40,9 @@ GOBJECT_INTROSPECTION_NINJA_ENV += \ # .gir and .typelib files. g-ir-scanner does not use LDFLAGS, and by default, # links to the system-installed libglib2 path. To remedy this issue, defining # LD_LIBRARY_PATH forces g-ir-scanner to use our host installed libglib2 files. -HOST_GOBJECT_INTROSPECTION_NINJA_ENV += \ +# As of gobject-introspection version 1.84.0, Meson records the +# LD_LIBRARY_PATH set during config and passes it to g-ir-scanner. +HOST_GOBJECT_INTROSPECTION_CONF_ENV = \ LD_LIBRARY_PATH="$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)$(HOST_DIR)/lib" # Use the host gi-scanner to prevent the scanner from generating incorrect @@ -51,13 +53,16 @@ GOBJECT_INTROSPECTION_CONF_OPTS = \ -Dgi_cross_ldd_wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper" \ -Dbuild_introspection_data=true \ -Ddoctool=disabled \ - -Dcairo=disabled + -Dcairo=disabled \ + -Dtests=false + +HOST_GOBJECT_INTROSPECTION_CONF_OPTS = -Dtests=false # GI_SCANNER_DISABLE_CACHE=1 prevents g-ir-scanner from writing cache data to ${HOME} GOBJECT_INTROSPECTION_CONF_ENV = \ GI_SCANNER_DISABLE_CACHE=1 -HOST_GOBJECT_INTROSPECTION_CONF_ENV = \ +HOST_GOBJECT_INTROSPECTION_CONF_ENV += \ GI_SCANNER_DISABLE_CACHE=1 # Make sure g-ir-tool-template uses the host python.