From patchwork Mon Nov 7 19:04:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 15153 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 3AC4EC4332F for ; Mon, 7 Nov 2022 19:05:12 +0000 (UTC) Received: from mailout12.t-online.de (mailout12.t-online.de [194.25.134.22]) by mx.groups.io with SMTP id smtpd.web09.1920.1667847911340372982 for ; Mon, 07 Nov 2022 11:05:11 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.22, mailfrom: f_l_k@t-online.de) Received: from fwd83.dcpf.telekom.de (fwd83.aul.t-online.de [10.223.144.109]) by mailout12.t-online.de (Postfix) with SMTP id 589C41587B for ; Mon, 7 Nov 2022 20:05:09 +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 1os7Qh-28ACOH0; Mon, 7 Nov 2022 20:05:07 +0100 From: Markus Volk To: openembedded-devel@lists.openembedded.org Cc: Markus Volk Subject: [meta-gnome][PATCH 1/5] geary: update 40.0 -> 43.0 Date: Mon, 7 Nov 2022 20:04:50 +0100 Message-Id: <20221107190454.39581-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1667847907-62A0A2DC-276F7074/0/0 CLEAN NORMAL X-TOI-MSGID: 06f499c7-7dd1-4bac-a837-6872759b7ff7 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:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/99476 --- .../geary/{geary_40.0.bb => geary_43.0.bb} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename meta-gnome/recipes-connectivity/geary/{geary_40.0.bb => geary_43.0.bb} (87%) diff --git a/meta-gnome/recipes-connectivity/geary/geary_40.0.bb b/meta-gnome/recipes-connectivity/geary/geary_43.0.bb similarity index 87% rename from meta-gnome/recipes-connectivity/geary/geary_40.0.bb rename to meta-gnome/recipes-connectivity/geary/geary_43.0.bb index 3ff0a412e..8dd0ea67d 100644 --- a/meta-gnome/recipes-connectivity/geary/geary_40.0.bb +++ b/meta-gnome/recipes-connectivity/geary/geary_43.0.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2a2244d5a13871ad950c55877546a6a2" DEPENDS = " \ appstream-glib \ cairo \ + desktop-file-utils-native \ enchant2 \ evolution-data-server \ folks \ @@ -34,12 +35,10 @@ inherit meson pkgconfig mime-xdg gtk-icon-cache gobject-introspection vala featu SRC_URI = " \ git://github.com/GNOME/geary.git;nobranch=1;protocol=https \ - file://0001-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch \ - file://0002-Fix-accessibility-issues-with-initializer-of-constan.patch \ " S = "${WORKDIR}/git" -SRCREV = "e561775c1580a9f60a726355b2b897bfc9cb3382" +SRCREV = "94d6bec861daffb27efea85a296f347db7a5af6d" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" From patchwork Mon Nov 7 19:04:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 15155 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 3B221C43217 for ; Mon, 7 Nov 2022 19:05:22 +0000 (UTC) Received: from mailout12.t-online.de (mailout12.t-online.de [194.25.134.22]) by mx.groups.io with SMTP id smtpd.web11.1932.1667847912554987973 for ; Mon, 07 Nov 2022 11:05:12 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.22, mailfrom: f_l_k@t-online.de) Received: from fwd83.dcpf.telekom.de (fwd83.aul.t-online.de [10.223.144.109]) by mailout12.t-online.de (Postfix) with SMTP id C574F1587C for ; Mon, 7 Nov 2022 20:05:10 +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 1os7Qk-28ACOI0; Mon, 7 Nov 2022 20:05:10 +0100 From: Markus Volk To: openembedded-devel@lists.openembedded.org Cc: Markus Volk Subject: [meta-gnome][PATCH 2/5] gnome-online-accounts: update 3.44.0 -> 3.46.0 Date: Mon, 7 Nov 2022 20:04:51 +0100 Message-Id: <20221107190454.39581-2-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::1667847910-62A0A2DC-87088AF2/0/0 CLEAN NORMAL X-TOI-MSGID: f2e63a9c-e64d-4963-804f-174bde0dbc15 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/99477 --- .../gnome-online-accounts_3.44.0.bb | 34 ------------------- .../gnome-online-accounts_3.46.0.bb | 31 +++++++++++++++++ 2 files changed, 31 insertions(+), 34 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.44.0.bb create mode 100644 meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.46.0.bb diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.44.0.bb b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.44.0.bb deleted file mode 100644 index 451670e64..000000000 --- a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.44.0.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "GNOME Online Accounts - Single sign-on framework for GNOME" -LICENSE = "LGPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=34c88b124db5fb2762c1676be7dadd36" - -GNOMEBASEBUILDCLASS = "autotools" - -inherit gnomebase gsettings gobject-introspection gsettings gtk-doc vala gettext features_check - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -DEPENDS = "glib-2.0" - -SRC_URI += "file://0001-Update-to-rest-1.0.patch" -SRC_URI[archive.sha256sum] = "381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342" - -# backend is required for gnome-control-center -PACKAGECONFIG = "backend other" - -PACKAGECONFIG[backend] = "--enable-backend,--disable-backend,gtk+3 webkitgtk libsoup-2.4 json-glib libsecret rest libxml2" -PACKAGECONFIG[krb5] = "--enable-kerberos, --disable-kerberos , krb5 gcr" - -# no extra dependencies! -PACKAGECONFIG[other] = " \ - --enable-facebook --enable-foursquare --enable-exchange --enable-flickr --enable-google --enable-imap-smtp --enable-owncloud --enable-windows-live,\ - --disable-facebook --disable-foursquare --disable-exchange --disable-flickr --disable-google --disable-imap-smtp --disable-owncloud --disable-windows-live, \ -" - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${libdir}/goa-1.0/web-extensions/*.so \ -" - -# looked into pkg-config file: it is not a bug - they mean it -FILES:${PN}-dev += "${libdir}/goa-1.0/include" diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.46.0.bb b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.46.0.bb new file mode 100644 index 000000000..0603a2d89 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.46.0.bb @@ -0,0 +1,31 @@ +SUMMARY = "GNOME Online Accounts - Single sign-on framework for GNOME" +LICENSE = "LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=34c88b124db5fb2762c1676be7dadd36" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gobject-introspection gtk-icon-cache vala features_check + +DEPENDS = "gtk+3 gtk+3-native gdk-pixbuf dbus json-glib libxml2 webkitgtk glib-2.0 rest libsecret" + +SRC_URI[archive.sha256sum] = "5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa" + +PACKAGECONFIG_SOUP ?= "soup3" +PACKAGECONFIG ?= "kerberos owncloud lastfm google windows_live ${PACKAGECONFIG_SOUP}" + +PACKAGECONFIG[kerberos] = "-Dkerberos=true, -Dkerberos=false,krb5 gcr" +PACKAGECONFIG[exchange] = "-Dexchange=true, -Dexchange=false" +PACKAGECONFIG[google] = "-Dgoogle=true, -Dgoogle=false" +PACKAGECONFIG[owncloud] = "-Downcloud=true, -Downcloud=false" +PACKAGECONFIG[windows_live] = "-Dwindows_live=true, -Dwindows_live=false" +PACKAGECONFIG[lastfm] = "-Dlastfm=true, -Dlastfm=false" +PACKAGECONFIG[soup2] = ",,libsoup-2.4,,,soup3" +PACKAGECONFIG[soup3] = ",,libsoup-3.0,,,soup2" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${libdir}/goa-1.0/web-extensions/*.so \ +" + +# looked into pkg-config file: it is not a bug - they mean it +FILES:${PN}-dev += "${libdir}/goa-1.0/include" From patchwork Mon Nov 7 19:04:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 15154 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 33F31C433FE 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.1936.1667847915043808377 for ; Mon, 07 Nov 2022 11:05:15 -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 1E7F49CE 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 1os7Qm-28ACOJ0; Mon, 7 Nov 2022 20:05:12 +0100 From: Markus Volk To: openembedded-devel@lists.openembedded.org Cc: Markus Volk Subject: [meta-gnome][PATCH 3/5] rest: upgrade 0.8.1 -> 0.9.0 Date: Mon, 7 Nov 2022 20:04:52 +0100 Message-Id: <20221107190454.39581-3-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::1667847912-60A0E2DC-339F5D6E/0/0 CLEAN NORMAL X-TOI-MSGID: f075e0a7-d57d-4c24-9dfd-df3e109a0a10 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/99479 --- meta-gnome/recipes-gnome/rest/rest_0.8.1.bb | 33 --------------------- meta-gnome/recipes-gnome/rest/rest_0.9.0.bb | 22 ++++++++++++++ 2 files changed, 22 insertions(+), 33 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/rest/rest_0.8.1.bb create mode 100644 meta-gnome/recipes-gnome/rest/rest_0.9.0.bb diff --git a/meta-gnome/recipes-gnome/rest/rest_0.8.1.bb b/meta-gnome/recipes-gnome/rest/rest_0.8.1.bb deleted file mode 100644 index f1c9915c0..000000000 --- a/meta-gnome/recipes-gnome/rest/rest_0.8.1.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "library to access web services that claim to be "RESTful"" -HOMEPAGE = "https://wiki.gnome.org/Projects/Librest" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -GNOMEBASEBUILDCLASS = "autotools" - -DEPENDS = " \ - libxml2-native \ - glib-2.0-native \ - glib-2.0 \ - libsoup-2.4 \ -" - -inherit gnomebase gobject-introspection gtk-doc vala - -PV .= "+git${SRCPV}" -SRCREV = "7b46065dea860ef09861f4d70124728b8270c8b7" -SRC_URI = "git://gitlab.gnome.org/GNOME/librest;protocol=https;branch=master \ - file://0001-Use-GUri-instead-of-SoupURI.patch \ - file://0002-Port-to-libsoup3.patch \ -" -S = "${WORKDIR}/git" - -do_configure:prepend() { - # rest expects introspection.m4 at custom location (see aclocal.m4). - cp -f ${STAGING_DIR_TARGET}/${datadir}/aclocal/introspection.m4 ${S}/build -} - -do_compile:prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/rest/.libs" -} - diff --git a/meta-gnome/recipes-gnome/rest/rest_0.9.0.bb b/meta-gnome/recipes-gnome/rest/rest_0.9.0.bb new file mode 100644 index 000000000..6fb208abd --- /dev/null +++ b/meta-gnome/recipes-gnome/rest/rest_0.9.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "library to access web services that claim to be "RESTful"" +HOMEPAGE = "https://wiki.gnome.org/Projects/Librest" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = " \ + gi-docgen \ + gi-docgen-native \ + glib-2.0 \ + glib-2.0-native \ + json-glib \ + libsoup-3.0 \ + libxml2-native \ +" + +inherit gnomebase gobject-introspection vala pkgconfig + +EXTRA_OEMESON = "-Dsoup2=false" + +SRC_URI[archive.sha256sum] = "85b2bc9341128139539b53ee53f0533310bc96392fd645863a040410b81ebe66" From patchwork Mon Nov 7 19:04:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 15156 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 41523C43219 for ; Mon, 7 Nov 2022 19:05:22 +0000 (UTC) Received: from mailout12.t-online.de (mailout12.t-online.de [194.25.134.22]) by mx.groups.io with SMTP id smtpd.web11.1935.1667847914847558544 for ; Mon, 07 Nov 2022 11:05:15 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.22, mailfrom: f_l_k@t-online.de) Received: from fwd83.dcpf.telekom.de (fwd83.aul.t-online.de [10.223.144.109]) by mailout12.t-online.de (Postfix) with SMTP id 5DF321587C 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 1os7Qm-28ACOK0; Mon, 7 Nov 2022 20:05:13 +0100 From: Markus Volk To: openembedded-devel@lists.openembedded.org Cc: Markus Volk Subject: [meta-gnome][PATCH 4/5] yelp: use libsoup-3.0 by default Date: Mon, 7 Nov 2022 20:04:53 +0100 Message-Id: <20221107190454.39581-4-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-759CF744/0/0 CLEAN NORMAL X-TOI-MSGID: bb63e3a9-5868-423b-9236-1b5aa862d32a 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/99478 Signed-off-by: Markus Volk --- meta-gnome/recipes-gnome/yelp/yelp_42.2.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb b/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb index fe3b1105c..200ed0f70 100644 --- a/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb +++ b/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb @@ -22,11 +22,13 @@ DEPENDS += " \ webkitgtk \ yelp-xsl \ " -PACKAGECONFIG ?= "" +PACKAGECONFIG_SOUP ?= "soup3" +PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" -# Enable if soup3 is enabled in webkit recipe +PACKAGECONFIG[soup2] = "--with-webkit2gtk-4-0,," PACKAGECONFIG[soup3] = ",--with-webkit2gtk-4-0," + do_configure:prepend() { export ITSTOOL=${STAGING_BINDIR_NATIVE}/itstool } 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}"