package/gcr: fix introspection option
PATCH 1/2 package/gcr: fix introspection option
introspection option was wrongly named --with-introspection instead of --enable-introspection since commit d4e7c720aa78dbe659db82f4eb38ff58ebae4c57:
configure: WARNING: unrecognized options: --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6, --with-introspection
--- package/gcr/gcr.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/gcr/gcr.mk +2 -2
@@ -25,9 +25,9 @@ GCR_LICENSE_FILES = COPYING ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) GCR_DEPENDENCIES += gobject-introspection host-libxslt -GCR_CONF_OPTS += --with-introspection +GCR_CONF_OPTS += --enable-introspection else -GCR_CONF_OPTS += --without-introspection +GCR_CONF_OPTS += --disable-introspection endif # Only the X11 backend is supported for the simple GUI
Signature · 1 line
2.30.2
PATCH 2/2 package/gcr: bump to version 3.40.0
- Switch to meson-package
- Update indention in hash file (two spaces)
https://gitlab.gnome.org/GNOME/gcr/-/blob/3.40.0/NEWS
--- package/gcr/gcr.hash | 6 +++--- package/gcr/gcr.mk | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-)
package/gcr/gcr.hash +3 -3
@@ -1,3 +1,3 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/gcr/3.34/gcr-3.34.0.sha256sum -sha256 29df50974a90987af694c0fb8926a6b366e68cacd8abd813817cfe1eb5d54524 gcr-3.34.0.tar.xz -sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING +# From http://ftp.acc.umu.se/pub/gnome/sources/gcr/3.40/gcr-3.40.0.sha256sum +sha256 b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5 gcr-3.40.0.tar.xz +sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING
package/gcr/gcr.mk +10 -10
@@ -4,7 +4,7 @@ # ################################################################################ -GCR_VERSION_MAJOR = 3.34 +GCR_VERSION_MAJOR = 3.40 GCR_VERSION = $(GCR_VERSION_MAJOR).0 GCR_SITE = http://ftp.acc.umu.se/pub/gnome/sources/gcr/$(GCR_VERSION_MAJOR) GCR_SOURCE = gcr-$(GCR_VERSION).tar.xz
@@ -15,27 +15,27 @@ GCR_DEPENDENCIES = \ p11-kit \ $(TARGET_NLS_DEPENDENCIES) GCR_INSTALL_STAGING = YES -GCR_CONF_ENV = ac_cv_path_GNUPG=/usr/bin/gpg2 GCR_CONF_OPTS = \ - --disable-gtk-doc \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr + -Dgpg_path=/usr/bin/gpg2 \ + -Dgtk_doc=false # Even though COPYING is v2 the code states v2.1+ GCR_LICENSE = LGPL-2.1+ GCR_LICENSE_FILES = COPYING +GCR_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -GCR_DEPENDENCIES += gobject-introspection host-libxslt -GCR_CONF_OPTS += --enable-introspection +GCR_DEPENDENCIES += gobject-introspection host-libxslt host-vala +GCR_CONF_OPTS += -Dintrospection=true else -GCR_CONF_OPTS += --disable-introspection +GCR_CONF_OPTS += -Dintrospection=false endif # Only the X11 backend is supported for the simple GUI ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) GCR_DEPENDENCIES += libgtk3 -GCR_CONF_OPTS += --with-gtk +GCR_CONF_OPTS += -Dgtk=true else -GCR_CONF_OPTS += --without-gtk +GCR_CONF_OPTS += -Dgtk=false endif -$(eval $(autotools-package)) +$(eval $(meson-package))
Signature · 1 line
2.30.2
PATCH 1/2 package/gcr: fix introspection option
In reply to Fabrice FontaineQuoted 10 lines · On Wed, 14 Jul 2021 23:31:14 +0200 Fabrice Fontaine…
introspection option was wrongly named --with-introspection instead of --enable-introspection since commit
d4e7c720aa78dbe659db82f4eb38ff58ebae4c57:configure: WARNING: unrecognized options: --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6, --with-introspection
Signed-off-by Fabrice Fontaine <[email protected]>--- package/gcr/gcr.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Both applied, thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
introspection option was wrongly named --with-introspection instead of --enable-introspection since commit
d4e7c720aa78dbe659db82f4eb38ff58ebae4c57:configure: WARNING: unrecognized options: --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6, --with-introspection
Signed-off-by Fabrice Fontaine <[email protected]>
Committed to 2021.02.x and 2021.05.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] http://lists.busybox.net/mailman/listinfo/buildroot