From patchwork Mon Nov 13 01:13:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 34365 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 C07F9C4332F for ; Mon, 13 Nov 2023 01:13:25 +0000 (UTC) Received: from mailout05.t-online.de (mailout05.t-online.de [194.25.134.82]) by mx.groups.io with SMTP id smtpd.web11.28060.1699838000906204896 for ; Sun, 12 Nov 2023 17:13:21 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: t-online.de, ip: 194.25.134.82, mailfrom: f_l_k@t-online.de) Received: from fwd74.aul.t-online.de (fwd74.aul.t-online.de [10.223.144.100]) by mailout05.t-online.de (Postfix) with SMTP id BB8D9ADA4 for ; Mon, 13 Nov 2023 02:13:18 +0100 (CET) Received: from intel-corei7-64.fritz.box ([84.163.34.200]) by fwd74.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1r2LVs-25JNwX0; Mon, 13 Nov 2023 02:13:16 +0100 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 1/2] ghex: backport patch to fix build for clang Date: Mon, 13 Nov 2023 02:13:35 +0100 Message-ID: <20231113011336.2843244-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1699837996-E4E0893F-3DBA8D03/0/0 CLEAN NORMAL X-TOI-MSGID: f56daf7f-5adb-47d6-82be-9f2cf532fe0a 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 ; Mon, 13 Nov 2023 01:13:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/106621 Signed-off-by: Markus Volk --- ...iables-in-switch-statement-should-be.patch | 50 +++++++++++++++++++ meta-gnome/recipes-gnome/ghex/ghex_45.0.bb | 1 + 2 files changed, 51 insertions(+) create mode 100644 meta-gnome/recipes-gnome/ghex/ghex/0001-gtkhex-Local-variables-in-switch-statement-should-be.patch diff --git a/meta-gnome/recipes-gnome/ghex/ghex/0001-gtkhex-Local-variables-in-switch-statement-should-be.patch b/meta-gnome/recipes-gnome/ghex/ghex/0001-gtkhex-Local-variables-in-switch-statement-should-be.patch new file mode 100644 index 000000000..61cd3b180 --- /dev/null +++ b/meta-gnome/recipes-gnome/ghex/ghex/0001-gtkhex-Local-variables-in-switch-statement-should-be.patch @@ -0,0 +1,50 @@ +From b00b8332ab19e41c75ce143f45ab4585502c020b Mon Sep 17 00:00:00 2001 +From: Logan Rathbone +Date: Tue, 24 Oct 2023 14:06:04 -0400 +Subject: [PATCH] gtkhex: Local variables in switch statement should be in own + scope + +Fixes: #74 + +Thanks to: David C. Manuelda + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/ghex/-/commit/b00b8332ab19e41c75ce143f45ab4585502c020b] +--- + src/gtkhex.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/gtkhex.c b/src/gtkhex.c +index b401cd9..18e0433 100644 +--- a/src/gtkhex.c ++++ b/src/gtkhex.c +@@ -1941,6 +1941,7 @@ key_press_cb (GtkEventControllerKey *controller, + break; + + case GDK_KEY_Home: ++ { + gint64 line_beg = self->cursor_pos; + + while (line_beg % self->cpl != 0) +@@ -1948,9 +1949,11 @@ key_press_cb (GtkEventControllerKey *controller, + + hex_widget_set_cursor (self, line_beg); + ret = GDK_EVENT_STOP; ++ } + break; + + case GDK_KEY_End: ++ { + gint64 line_end = self->cursor_pos; + + while (line_end % self->cpl != self->cpl - 1) +@@ -1958,6 +1961,7 @@ key_press_cb (GtkEventControllerKey *controller, + + hex_widget_set_cursor (self, MIN (line_end, payload_size)); + ret = GDK_EVENT_STOP; ++ } + break; + + default: +-- +2.42.0 + diff --git a/meta-gnome/recipes-gnome/ghex/ghex_45.0.bb b/meta-gnome/recipes-gnome/ghex/ghex_45.0.bb index 6d3e9b978..42c53471b 100644 --- a/meta-gnome/recipes-gnome/ghex/ghex_45.0.bb +++ b/meta-gnome/recipes-gnome/ghex/ghex_45.0.bb @@ -15,6 +15,7 @@ GIR_MESON_DISABLE_FLAG = 'disabled' inherit gnomebase gsettings gtk-icon-cache gnome-help gettext gobject-introspection vala gi-docgen +SRC_URI += "file://0001-gtkhex-Local-variables-in-switch-statement-should-be.patch" SRC_URI[archive.sha256sum] = "05cecc4561ca40b257c5db31da9f68d696133efc0ae427ed82fb985a986e840e" FILES:${PN} += "${libdir} ${datadir}/metainfo" From patchwork Mon Nov 13 01:13:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 34366 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 A0863C4332F for ; Mon, 13 Nov 2023 01:13:35 +0000 (UTC) Received: from mailout11.t-online.de (mailout11.t-online.de [194.25.134.85]) by mx.groups.io with SMTP id smtpd.web11.28062.1699838010262395138 for ; Sun, 12 Nov 2023 17:13:30 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: t-online.de, ip: 194.25.134.85, mailfrom: f_l_k@t-online.de) Received: from fwd74.aul.t-online.de (fwd74.aul.t-online.de [10.223.144.100]) by mailout11.t-online.de (Postfix) with SMTP id 8811F7303 for ; Mon, 13 Nov 2023 02:13:28 +0100 (CET) Received: from intel-corei7-64.fritz.box ([84.163.34.200]) by fwd74.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1r2LVw-25JNwY0; Mon, 13 Nov 2023 02:13:20 +0100 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 2/2] qpdf: cleanup Date: Mon, 13 Nov 2023 02:13:36 +0100 Message-ID: <20231113011336.2843244-2-f_l_k@t-online.de> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231113011336.2843244-1-f_l_k@t-online.de> References: <20231113011336.2843244-1-f_l_k@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1699838000-E4E0893F-D076667D/0/0 CLEAN NORMAL X-TOI-MSGID: f41f8e69-5ee6-423d-a1ae-f130507dc184 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 ; Mon, 13 Nov 2023 01:13:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/106622 - remove autotools remains - select tls depending on packageconfig instead of doing autoselect - preselect gnutls because thats the default if both gnutls/openssl are built - disable the internal tls fallback - enable pkgconfig - fix license, it was changed to Apache-2.0 - dont create an additional package just to rdepend on it afterwards - dont build static lib - fetch source from git Signed-off-by: Markus Volk --- meta-oe/recipes-printing/qpdf/qpdf_11.6.3.bb | 41 ++++++++------------ 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/meta-oe/recipes-printing/qpdf/qpdf_11.6.3.bb b/meta-oe/recipes-printing/qpdf/qpdf_11.6.3.bb index b56f8a822..ceb9f25ae 100644 --- a/meta-oe/recipes-printing/qpdf/qpdf_11.6.3.bb +++ b/meta-oe/recipes-printing/qpdf/qpdf_11.6.3.bb @@ -1,40 +1,31 @@ DESCRIPTION = "PDF transformation/inspection software" HOMEPAGE = "http://qpdf.sourceforge.net" -LICENSE = "Artistic-2.0" -SECTION = "libs" -DEPENDS = "libpcre zlib libjpeg-turbo openssl gnutls" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "${SOURCEFORGE_MIRROR}/qpdf/qpdf-${PV}.tar.gz" -SRC_URI[sha256sum] = "c394b1b0cff4cd9d13b0f5e16bdf3cf54da424dc434f9d40264b7fe67acd90bc" +DEPENDS = "zlib jpeg ${@bb.utils.contains('PACKAGECONFIG', 'gnutls', 'gnutls', 'openssl', d)}" -LIC_FILES_CHKSUM = "file://Artistic-2.0;md5=7806296b9fae874361e6fb10072b7ee3" +SRC_URI = "git://github.com/qpdf/qpdf.git;protocol=https;branch=main" +SRCREV = "81823f4032caefd1050bccb207d315839c1c48db" -inherit cmake gettext +inherit cmake pkgconfig gettext -# disable random file detection for cross-compile -EXTRA_OECONF = "--without-random \ - --disable-static \ - --disable-check-autofiles \ - " - -EXTRA_OECMAKE = '-DRANDOM_DEVICE="/dev/random"' +EXTRA_OECMAKE = ' \ + -DRANDOM_DEVICE="/dev/random" \ + -DBUILD_STATIC_LIBS=OFF \ + -DALLOW_CRYPTO_NATIVE=OFF \ + -DUSE_IMPLICIT_CRYPTO=OFF \ +' LDFLAGS:append:mipsarch = " -latomic" LDFLAGS:append:riscv32 = " -latomic" -S="${WORKDIR}/${BPN}-${PV}" +S="${WORKDIR}/git" + +PACKAGECONFIG ?= "gnutls" +PACKAGECONFIG[gnutls] = "-DREQUIRE_CRYPTO_GNUTLS=ON,-DREQUIRE_CRYPTO_OPENSSL=ON" do_install:append() { # Change the fully defined path on the target sed -i -e 's|${STAGING_LIBDIR}|${libdir}|g' ${D}${libdir}/cmake/${BPN}/libqpdfTargets.cmake } - -# avoid Makefile returning error on 'make clean' before configure was run -CLEANBROKEN = "1" - -DEBIAN_NOAUTONAME:libqpdf = "1" - -PACKAGES =+ "libqpdf" -FILES:libqpdf = "${libdir}/libqpdf.so.*" - -RDEPENDS:${PN} = "libqpdf"