From patchwork Mon Nov 7 19:04:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 15157 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 3B1FDC4332F for ; Mon, 7 Nov 2022 19:05:22 +0000 (UTC) Received: from mailout04.t-online.de (mailout04.t-online.de [194.25.134.18]) by mx.groups.io with SMTP id smtpd.web11.1937.1667847916201467778 for ; Mon, 07 Nov 2022 11:05:16 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.18, mailfrom: f_l_k@t-online.de) Received: from fwd83.dcpf.telekom.de (fwd83.aul.t-online.de [10.223.144.109]) by mailout04.t-online.de (Postfix) with SMTP id E7A669D3 for ; Mon, 7 Nov 2022 20:05:13 +0100 (CET) Received: from flk-MS-7C91.fritz.box ([79.219.226.160]) by fwd83.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1os7Qn-28ACOL0; Mon, 7 Nov 2022 20:05:13 +0100 From: Markus Volk To: openembedded-devel@lists.openembedded.org Cc: Markus Volk Subject: [meta-gnome][PATCH 5/5] surf: use libsoup-3.0 by default Date: Mon, 7 Nov 2022 20:04:54 +0100 Message-Id: <20221107190454.39581-5-f_l_k@t-online.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107190454.39581-1-f_l_k@t-online.de> References: <20221107190454.39581-1-f_l_k@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1667847913-60A0E2DC-B2B9C74F/0/0 CLEAN NORMAL X-TOI-MSGID: d6f6d6e2-e1fc-4ed3-b193-7c9867d514d2 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, 07 Nov 2022 19:05:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/99480 Signed-off-by: Markus Volk --- meta-oe/recipes-graphics/surf/surf_2.1.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-graphics/surf/surf_2.1.bb b/meta-oe/recipes-graphics/surf/surf_2.1.bb index 51c14624a..45ae79305 100644 --- a/meta-oe/recipes-graphics/surf/surf_2.1.bb +++ b/meta-oe/recipes-graphics/surf/surf_2.1.bb @@ -12,15 +12,16 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" SRCREV = "bcd7d74e613fb8af11b40c351f0a6c1a771b2d2b" SRC_URI = "git://git.suckless.org/surf;branch=surf-webkit2 \ " -SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'soup3', 'file://0001-config.mk-Fix-compiler-and-linke,ig.ml-make-compatible-with-webkitgtk-2.34.0.patch', '', d)}" +SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'soup3', 'file://0001-config.mk-Fix-compiler-and-linker.patch file://0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch', '', d)}" S = "${WORKDIR}/git" inherit pkgconfig features_check -PACKAGECONFIG ?= "" +PACKAGECONFIG_SOUP ?= "soup3" +PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" -# Enable if soup3 is enabled in webkit recipe +PACKAGECONFIG[soup2] = ",,," PACKAGECONFIG[soup3] = ",,," TARGET_CC_ARCH += "${LDFLAGS}"