From patchwork Fri Jan 12 12:53:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 37661 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFBB1C4725D for ; Fri, 12 Jan 2024 12:53:43 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.6186.1705064023117859647 for ; Fri, 12 Jan 2024 04:53:43 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3C3CD1FB for ; Fri, 12 Jan 2024 04:54:28 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 98E113F73F for ; Fri, 12 Jan 2024 04:53:41 -0800 (PST) From: ross.burton@arm.com To: openembedded-devel@lists.openembedded.org Subject: [PATCH 1/4] libuser: fix gtk-doc configure call Date: Fri, 12 Jan 2024 12:53:37 +0000 Message-Id: <20240112125340.495067-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 12 Jan 2024 12:53:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/108236 From: Ross Burton Update the GTK_DOC_CHECK invocation to specify where the documentation will be built (as the default is ./docs). This is needed so that gtkdocize as run by autopoint knows where the documentation will be built. At the moment we manually call gtkdocize but this will change to autopoint in the future. Signed-off-by: Ross Burton --- .../libuser/libuser/gtkdoc.patch | 22 +++++++++++++++++++ .../recipes-support/libuser/libuser_0.64.bb | 1 + 2 files changed, 23 insertions(+) create mode 100644 meta-gnome/recipes-support/libuser/libuser/gtkdoc.patch diff --git a/meta-gnome/recipes-support/libuser/libuser/gtkdoc.patch b/meta-gnome/recipes-support/libuser/libuser/gtkdoc.patch new file mode 100644 index 0000000000..4d11b94e02 --- /dev/null +++ b/meta-gnome/recipes-support/libuser/libuser/gtkdoc.patch @@ -0,0 +1,22 @@ +Update the GTK_DOC_CHECK invocation to specify where the +documentation will be built (as the default is ./docs). + +This is needed so that gtkdocize as run by autopoint knows where the +documentation will be built. + +Upstream-Status: Submitted [https://pagure.io/libuser/pull-request/70] +Signed-off-by: Ross Burton + +diff --git a/configure.ac b/configure.ac +index 0bd4a67..51508b7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -169,7 +169,7 @@ if test "$GCC" = yes ; then + AC_MSG_RESULT([$enable_Werror]) + fi + +-GTK_DOC_CHECK ++GTK_DOC_CHECK([1.14],[--flavour no-tmpl --docdir docs/reference]) + + AC_CONFIG_FILES([Makefile po/Makefile.in docs/Makefile docs/reference/Makefile + libuser.pc]) diff --git a/meta-gnome/recipes-support/libuser/libuser_0.64.bb b/meta-gnome/recipes-support/libuser/libuser_0.64.bb index d86a577b10..973159c792 100644 --- a/meta-gnome/recipes-support/libuser/libuser_0.64.bb +++ b/meta-gnome/recipes-support/libuser/libuser_0.64.bb @@ -14,6 +14,7 @@ SECTION = "base" SRC_URI = "https://releases.pagure.org/libuser/libuser-${PV}.tar.gz \ file://0001-docs-Disable-building.patch \ file://0002-remove-unused-execinfo.h.patch \ + file://gtkdoc.patch \ " SRC_URI[sha256sum] = "ea6094c72cb9e60a42fb53509dc98d124a340f1c9222783b503208adc16a0a8f" From patchwork Fri Jan 12 12:53:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 37662 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFB7DC4706C for ; Fri, 12 Jan 2024 12:53:43 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.6188.1705064023314461766 for ; Fri, 12 Jan 2024 04:53:43 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C7B202F4 for ; Fri, 12 Jan 2024 04:54:28 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 281A33F73F for ; Fri, 12 Jan 2024 04:53:42 -0800 (PST) From: ross.burton@arm.com To: openembedded-devel@lists.openembedded.org Subject: [PATCH 2/4] libuser: remove obsolete GTKDOC_DOCDIR assignment Date: Fri, 12 Jan 2024 12:53:38 +0000 Message-Id: <20240112125340.495067-2-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240112125340.495067-1-ross.burton@arm.com> References: <20240112125340.495067-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 12 Jan 2024 12:53:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/108237 From: Ross Burton Now that autotools uses autopoint to call gtkdocize, this variable is no longer needed. Signed-off-by: Ross Burton --- meta-gnome/recipes-support/libuser/libuser_0.64.bb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/meta-gnome/recipes-support/libuser/libuser_0.64.bb b/meta-gnome/recipes-support/libuser/libuser_0.64.bb index 973159c792..6d3bce8a1c 100644 --- a/meta-gnome/recipes-support/libuser/libuser_0.64.bb +++ b/meta-gnome/recipes-support/libuser/libuser_0.64.bb @@ -27,11 +27,6 @@ REQUIRED_DISTRO_FEATURES = "pam" EXTRA_OEMAKE = "PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}" -GTKDOC_DOCDIR = "${S}/docs/reference" - -# run autopoint since it needs ABOUT-NLS and admin/config.rpath from gettext -#EXTRA_AUTORECONF:remove = "--exclude=autopoint" - do_configure:prepend() { install -d ${S}/admin -d ${S}/m4 touch ${S}/ABOUT-NLS ${S}/admin/config.rpath From patchwork Fri Jan 12 12:53:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 37664 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3590C4725D for ; Fri, 12 Jan 2024 12:53:53 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.6207.1705064023442449060 for ; Fri, 12 Jan 2024 04:53:43 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 56A9712FC for ; Fri, 12 Jan 2024 04:54:29 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id B49403F73F for ; Fri, 12 Jan 2024 04:53:42 -0800 (PST) From: ross.burton@arm.com To: openembedded-devel@lists.openembedded.org Subject: [PATCH 3/4] gtksourceview4: remove check for target gtk-doc Date: Fri, 12 Jan 2024 12:53:39 +0000 Message-Id: <20240112125340.495067-3-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240112125340.495067-1-ross.burton@arm.com> References: <20240112125340.495067-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 12 Jan 2024 12:53:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/108238 From: Ross Burton Packages that use gtk-doc want to find a native gtk-doc not a target gtk-doc, so remove the pointless check for a target gtk-doc package. This only worked before as it was being pulled in via DEPENDS in glib-2.0, but as of oe-core f91694f this no longer happens. Signed-off-by: Ross Burton --- .../files/0001-remove-pointless-check.patch | 38 +++++++++++++++++++ .../gtksourceview/gtksourceview4_4.8.4.bb | 4 +- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 meta-gnome/recipes-gnome/gtksourceview/files/0001-remove-pointless-check.patch diff --git a/meta-gnome/recipes-gnome/gtksourceview/files/0001-remove-pointless-check.patch b/meta-gnome/recipes-gnome/gtksourceview/files/0001-remove-pointless-check.patch new file mode 100644 index 0000000000..8230bbbd16 --- /dev/null +++ b/meta-gnome/recipes-gnome/gtksourceview/files/0001-remove-pointless-check.patch @@ -0,0 +1,38 @@ +From 397751846130f79d5fbe8d617b788f3bcbb36816 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Tue, 9 Jan 2024 22:20:03 +0000 +Subject: [PATCH] meson: remove pointless gtk-doc check + +There's no point explicitly checking for gtk-doc, for two reasons: + +1) In cross-compiled environments this looks for a target gtk-doc, not a + native gtk-doc, so it should set native:true. + +2) The gnome.gtkdoc() function checks for gtk-doc itself. + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gtksourceview/-/merge_requests/351] +Signed-off-by: Ross Burton +--- + meson.build | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/meson.build b/meson.build +index ba07da70..1109daea 100644 +--- a/meson.build ++++ b/meson.build +@@ -107,12 +107,6 @@ else + vapigen_dep = [] + endif + +-if build_gtk_doc +- gtk_doc_dep = dependency('gtk-doc', version: gtk_doc_req) +-else +- gtk_doc_dep = [] +-endif +- + # Look for the libxml2 library manually on Visual Studio if + # its pkg-config file could not be found, as the NMake + # Makefiles of libxml2 do not generate the pkg-config files +-- +2.34.1 + diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb index 353f02f1ba..5d7d02a2c9 100644 --- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb +++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb @@ -10,12 +10,12 @@ PNAME = "gtksourceview" S = "${WORKDIR}/${PNAME}-${PV}" - inherit gnomebase lib_package gettext features_check gtk-doc gobject-introspection vala ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI = "https://download.gnome.org/sources/gtksourceview/4.8/${PNAME}-${PV}.tar.xz" +SRC_URI = "https://download.gnome.org/sources/gtksourceview/4.8/${PNAME}-${PV}.tar.xz \ + file://0001-remove-pointless-check.patch" SRC_URI[sha256sum] = "7ec9d18fb283d1f84a3a3eff3b7a72b09a10c9c006597b3fbabbb5958420a87d" GIR_MESON_OPTION = 'gir' From patchwork Fri Jan 12 12:53:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 37663 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EEACC4706C for ; Fri, 12 Jan 2024 12:53:53 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.6208.1705064023974641758 for ; Fri, 12 Jan 2024 04:53:44 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E20B91FB for ; Fri, 12 Jan 2024 04:54:29 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 4365B3F73F for ; Fri, 12 Jan 2024 04:53:43 -0800 (PST) From: ross.burton@arm.com To: openembedded-devel@lists.openembedded.org Subject: [PATCH 4/4] gtksourceview4: remove obsolete workaround for build failures Date: Fri, 12 Jan 2024 12:53:40 +0000 Message-Id: <20240112125340.495067-4-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240112125340.495067-1-ross.burton@arm.com> References: <20240112125340.495067-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 12 Jan 2024 12:53:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/108239 From: Ross Burton This was likely fixed in 9bea9d1 upstream. Signed-off-by: Ross Burton --- .../gtksourceview/gtksourceview4_4.8.4.bb | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb index 5d7d02a2c9..38ca4a39e6 100644 --- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb +++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb @@ -21,16 +21,4 @@ SRC_URI[sha256sum] = "7ec9d18fb283d1f84a3a3eff3b7a72b09a10c9c006597b3fbabbb59584 GIR_MESON_OPTION = 'gir' GTKDOC_MESON_OPTION = "gtk_doc" -# Override the definition in meson.bbclass. The dependencies in mason.build are incomplete -# and the recipe will not build with "-j 1". This fix is benign but should be reviewed when -# updating versions. -# -meson_do_compile() { - bbnote "========== generating gtksourceview-gresources.h ========" - bbnote "PARALLEL_MAKE is ${PARALLEL_MAKE}" - ninja ${PARALLEL_MAKE} gtksourceview/gtksourceview-gresources.h - bbnote "========== compiling target all ========" - ninja ${PARALLEL_MAKE} -} - FILES:${PN} += "${datadir}/gtksourceview-4"