diff --git a/.checkpackageignore b/.checkpackageignore index b902157fae..4d1dcc81a7 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -403,7 +403,6 @@ package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch lib_patch.Upstream package/gcc/8.4.0/0002-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch lib_patch.Upstream package/gcc/8.4.0/0003-libsanitizer-Remove-cyclades-from-libsanitizer.patch lib_patch.Upstream package/gcc/8.4.0/0004-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream -package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch lib_patch.Upstream package/gdb/14.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch lib_patch.Upstream package/gdb/14.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch lib_patch.Upstream package/gdb/14.2/0003-use-asm-sgidefs.h.patch lib_patch.Upstream diff --git a/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch b/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch deleted file mode 100644 index a1d4e1b46f..0000000000 --- a/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch +++ /dev/null @@ -1,64 +0,0 @@ -From b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8 Mon Sep 17 00:00:00 2001 -From: Jakub Jirutka -Date: Wed, 12 Jan 2022 00:24:20 +0100 -Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir - -This argument has been removed in Meson 0.61.0: - - gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages" - -https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de: - -> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it. - -Fixes #89 - -[aperez@igalia.com: backport from upstream] -Signed-off-by: Adrian Perez de Castro -[yann.morin.1998@free.fr: make it an actual backport] -Signed-off-by: Yann E. MORIN ---- - gck/meson.build | 1 - - gcr/meson.build | 1 - - ui/meson.build | 1 - - 3 files changed, 3 deletions(-) - -diff --git a/gck/meson.build b/gck/meson.build -index 756b486..a21a1e9 100644 ---- a/gck/meson.build -+++ b/gck/meson.build -@@ -131,7 +131,6 @@ if get_option('introspection') - sources: gck_gir_sources, - namespace: 'Gck', - nsversion: '@0@'.format(gck_major_version), -- packages: gck_deps, - export_packages: 'gck-@0@'.format(gck_major_version), - includes: [ 'GObject-2.0', 'Gio-2.0' ], - header: 'gck/gck.h', -diff --git a/gcr/meson.build b/gcr/meson.build -index 2233a44..c83641b 100644 ---- a/gcr/meson.build -+++ b/gcr/meson.build -@@ -190,7 +190,6 @@ if get_option('introspection') - sources: [ gcr_base_public_sources, gcr_base_headers ], - namespace: 'Gcr', - nsversion: '@0@'.format(gcr_major_version), -- packages: gcr_base_deps, - export_packages: 'gcr-base-@0@'.format(gcr_major_version), - includes: [ - 'GObject-2.0', -diff --git a/ui/meson.build b/ui/meson.build -index e656ea2..32ee057 100644 ---- a/ui/meson.build -+++ b/ui/meson.build -@@ -152,7 +152,6 @@ if get_option('introspection') - export_packages: 'gcr-ui-@0@'.format(gcr_major_version), - identifier_prefix: 'Gcr', - symbol_prefix: 'gcr', -- packages: gcr_ui_deps, - includes: [ - 'GObject-2.0', - 'Gio-2.0', --- -2.25.1 - diff --git a/package/gcr/Config.in b/package/gcr/Config.in index dbc22cf478..751accb723 100644 --- a/package/gcr/Config.in +++ b/package/gcr/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_GCR select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2_DEPENDS # runtime select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBSECRET select BR2_PACKAGE_P11_KIT help Library for cryptographic UIs and accessing PKCS#11 modules. diff --git a/package/gcr/gcr.hash b/package/gcr/gcr.hash index f6cc44e97d..1a67849f86 100644 --- a/package/gcr/gcr.hash +++ b/package/gcr/gcr.hash @@ -1,3 +1,4 @@ -# From https://download.gnome.org/sources/gcr/3.40/gcr-3.40.0.sha256sum -sha256 b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5 gcr-3.40.0.tar.xz +# From https://download.gnome.org/sources/gcr/4.4/gcr-4.4.0.1.sha256sum +sha256 0c3c341e49f9f4f2532a4884509804190a0c2663e6120360bb298c5d174a8098 gcr-4.4.0.1.tar.xz +# Locally computed sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING diff --git a/package/gcr/gcr.mk b/package/gcr/gcr.mk index 3a8c01729f..a3be8ecdf2 100644 --- a/package/gcr/gcr.mk +++ b/package/gcr/gcr.mk @@ -4,14 +4,15 @@ # ################################################################################ -GCR_VERSION_MAJOR = 3.40 -GCR_VERSION = $(GCR_VERSION_MAJOR).0 +GCR_VERSION_MAJOR = 4.4 +GCR_VERSION = $(GCR_VERSION_MAJOR).0.1 GCR_SITE = https://download.gnome.org/sources/gcr/$(GCR_VERSION_MAJOR) GCR_SOURCE = gcr-$(GCR_VERSION).tar.xz GCR_DEPENDENCIES = \ host-pkgconf \ libgcrypt \ libglib2 \ + libsecret \ p11-kit \ $(TARGET_NLS_DEPENDENCIES) GCR_INSTALL_STAGING = YES @@ -29,19 +30,19 @@ endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) GCR_DEPENDENCIES += gobject-introspection host-libxslt host-vala -GCR_CONF_OPTS += -Dintrospection=true +GCR_CONF_OPTS += -Dintrospection=true -Dvapi=true else -GCR_CONF_OPTS += -Dintrospection=false +GCR_CONF_OPTS += -Dintrospection=false -Dvapi=false endif -ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -GCR_DEPENDENCIES += libgtk3 -GCR_CONF_OPTS += -Dgtk=true -else ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) -GCR_DEPENDENCIES += libgtk3 -GCR_CONF_OPTS += -Dgtk=true +ifeq ($(BR2_PACKAGE_LIBGTK4_X11),y) +GCR_DEPENDENCIES += libgtk4 +GCR_CONF_OPTS += -Dgtk4=true +else ifeq ($(BR2_PACKAGE_LIBGTK4_WAYLAND),y) +GCR_DEPENDENCIES += libgtk4 +GCR_CONF_OPTS += -Dgtk4=true else -GCR_CONF_OPTS += -Dgtk=false +GCR_CONF_OPTS += -Dgtk4=false endif $(eval $(meson-package))