From patchwork Thu Dec 25 19:34:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 77535 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 15D7AE7AD6C for ; Thu, 25 Dec 2025 19:35:23 +0000 (UTC) Received: from mailout06.t-online.de (mailout06.t-online.de [194.25.134.19]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.143639.1766691320722468907 for ; Thu, 25 Dec 2025 11:35:21 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: t-online.de, ip: 194.25.134.19, mailfrom: f_l_k@t-online.de) Received: from fwd72.aul.t-online.de (fwd72.aul.t-online.de [10.223.144.98]) by mailout06.t-online.de (Postfix) with SMTP id F1C08168 for ; Thu, 25 Dec 2025 20:34:45 +0100 (CET) Received: from intel-corei7-64.fritz.box ([79.219.239.223]) by fwd72.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1vYr6f-135MiP0; Thu, 25 Dec 2025 20:34:41 +0100 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [meta-gnome][PATCH 1/2] gnome-software: fix build with flatpak 1.17.1 Date: Thu, 25 Dec 2025 20:34:30 +0100 Message-ID: <20251225193431.1365161-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.52.0 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1766691281-C27D04AF-0F845CE5/0/0 CLEAN NORMAL X-TOI-MSGID: 0b739ab1-b281-449b-a3c7-66bc0c5c393b List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 25 Dec 2025 19:35:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/122933 fixes: ../sources/gnome-software-49.1/meson.build:218:32: ERROR: Could not get pkg-config variable and no default provided for = 1.14.1']> Signed-off-by: Markus Volk --- ...-look-for-flatpak-http_backend-varia.patch | 56 +++++++++++++++++++ .../gnome-software/gnome-software_49.1.bb | 1 + 2 files changed, 57 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gnome-software/gnome-software/0001-meson.build-dont-look-for-flatpak-http_backend-varia.patch diff --git a/meta-gnome/recipes-gnome/gnome-software/gnome-software/0001-meson.build-dont-look-for-flatpak-http_backend-varia.patch b/meta-gnome/recipes-gnome/gnome-software/gnome-software/0001-meson.build-dont-look-for-flatpak-http_backend-varia.patch new file mode 100644 index 0000000000..2296b7acd2 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-software/gnome-software/0001-meson.build-dont-look-for-flatpak-http_backend-varia.patch @@ -0,0 +1,56 @@ +From 4588a3d34f574619c6f3a4290d53e2ac063ab56a Mon Sep 17 00:00:00 2001 +From: Markus Volk +Date: Thu, 25 Dec 2025 20:04:49 +0100 +Subject: [PATCH] meson.build: dont look for flatpak http_backend variable + +flatpak 1.17.1 release dropped libsoup2 support: +[https://github.com/flatpak/flatpak/blob/c324778b0720cb2d01c217fdc70358e232c38b4d/NEWS#L20] + +* Drop libsoup2 support in favor of libcurl. The `http_backend` build option has + been dropped as well. (#6395) + +gnome-software still searches for the http_backend variable and fails: + ../sources/gnome-software-49.1/meson.build:218:32: ERROR: Could not get pkg-config variable and no default provided for = 1.14.1']> + +Signed-off-by: Markus Volk + +Upstream-Status: Inappropriate +--- + meson.build | 20 +------------------- + 1 file changed, 1 insertion(+), 19 deletions(-) + +diff --git a/meson.build b/meson.build +index 3704e2abc..7e0496a22 100644 +--- a/meson.build ++++ b/meson.build +@@ -212,26 +212,8 @@ if get_option('fwupd') + endif + + if get_option('flatpak') +- flatpak = dependency('flatpak', version : '>= 1.14.1') ++ flatpak = dependency('flatpak', version : '>= 1.17.1') + ostree = dependency('ostree-1') +- +- flatpak_httpbackend = flatpak.get_variable('httpbackend') +- if flatpak_httpbackend == 'soup' +- flatpak_soupapiversion = flatpak.get_variable('soupapiversion', default_value: '2') +- if flatpak_soupapiversion.version_compare('< 3') +- error('''Flatpak library has been built with 'libsoup2' http backend, which conflicts with 'libsoup3' used by gnome-software. +- +-You can either: +- +-1. Build gnome-software without flatpak support (with -Dflatpak=false) or +-2. Rebuild flatpak library with http backend other than 'libsoup2'.''') +- else +- flatpak_summary = '@0@ (@1@)'.format(flatpak_httpbackend, flatpak_soupapiversion) +- endif +- else +- flatpak_summary = flatpak_httpbackend +- endif +- summary('Flatpak http backend', '@0@'.format(flatpak_summary), section : 'Misc') + endif + + if get_option('malcontent') +-- +2.52.0 + diff --git a/meta-gnome/recipes-gnome/gnome-software/gnome-software_49.1.bb b/meta-gnome/recipes-gnome/gnome-software/gnome-software_49.1.bb index 14ea91359e..9c441f5b2f 100644 --- a/meta-gnome/recipes-gnome/gnome-software/gnome-software_49.1.bb +++ b/meta-gnome/recipes-gnome/gnome-software/gnome-software_49.1.bb @@ -28,6 +28,7 @@ RDEPENDS:${PN} = "iso-codes" EXTRA_OEMESON += "-Dtests=false" +SRC_URI += "file://0001-meson.build-dont-look-for-flatpak-http_backend-varia.patch" SRC_URI[archive.sha256sum] = "49dfeca77928801756d0c5386c1d20454ca077600a5d1ed66ec46ee33a32c66d" PACKAGECONFIG ?= "flatpak" From patchwork Thu Dec 25 19:34:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 77534 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 14BE9E7AD6B for ; Thu, 25 Dec 2025 19:35:23 +0000 (UTC) Received: from mailout06.t-online.de (mailout06.t-online.de [194.25.134.19]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.142857.1766691320819501155 for ; Thu, 25 Dec 2025 11:35:21 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: t-online.de, ip: 194.25.134.19, mailfrom: f_l_k@t-online.de) Received: from fwd72.aul.t-online.de (fwd72.aul.t-online.de [10.223.144.98]) by mailout06.t-online.de (Postfix) with SMTP id F3AA5182 for ; Thu, 25 Dec 2025 20:34:45 +0100 (CET) Received: from intel-corei7-64.fritz.box ([79.219.239.223]) by fwd72.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1vYr6f-135MiQ0; Thu, 25 Dec 2025 20:34:42 +0100 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [meta-gnome][PATCH 2/2] gnome-software: update 49.1 -> 49.2 Date: Thu, 25 Dec 2025 20:34:31 +0100 Message-ID: <20251225193431.1365161-2-f_l_k@t-online.de> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251225193431.1365161-1-f_l_k@t-online.de> References: <20251225193431.1365161-1-f_l_k@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1766691282-267D04AF-7C2AA569/0/0 CLEAN NORMAL X-TOI-MSGID: f674e3ac-b2d5-4f99-9c7e-12e516845dba List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 25 Dec 2025 19:35:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/122934 - inherit pkgconfig Version 49.2 ~~~~~~~~~~~~ Released: 2025-11-20 This is a stable release with the following changes: * Fixed version history sometimes not showing for flatpak apps This release also updates translations: * Bokmål, Norwegian (Brage Fuglseth) * Catalan (Victor Dargallo) * Friulian (Fabio Tomat) * Greek, Modern (1453-) (Efstathios Iosifidis) * Persian (Danial Behzadi) * Romanian (Antonio Marin) * Serbian (Милош Поповић) Signed-off-by: Markus Volk --- .../{gnome-software_49.1.bb => gnome-software_49.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-gnome/recipes-gnome/gnome-software/{gnome-software_49.1.bb => gnome-software_49.2.bb} (92%) diff --git a/meta-gnome/recipes-gnome/gnome-software/gnome-software_49.1.bb b/meta-gnome/recipes-gnome/gnome-software/gnome-software_49.2.bb similarity index 92% rename from meta-gnome/recipes-gnome/gnome-software/gnome-software_49.1.bb rename to meta-gnome/recipes-gnome/gnome-software/gnome-software_49.2.bb index 9c441f5b2f..5c8be9bfb1 100644 --- a/meta-gnome/recipes-gnome/gnome-software/gnome-software_49.1.bb +++ b/meta-gnome/recipes-gnome/gnome-software/gnome-software_49.2.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" GTKDOC_MESON_OPTION ?= "gtk_doc" -inherit gnomebase gsettings itstool gnome-help gtk-icon-cache gtk-doc mime mime-xdg gettext upstream-version-is-even features_check +inherit gnomebase gsettings itstool gnome-help gtk-icon-cache gtk-doc mime mime-xdg gettext upstream-version-is-even features_check pkgconfig REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam" @@ -29,7 +29,7 @@ RDEPENDS:${PN} = "iso-codes" EXTRA_OEMESON += "-Dtests=false" SRC_URI += "file://0001-meson.build-dont-look-for-flatpak-http_backend-varia.patch" -SRC_URI[archive.sha256sum] = "49dfeca77928801756d0c5386c1d20454ca077600a5d1ed66ec46ee33a32c66d" +SRC_URI[archive.sha256sum] = "b610b6932a8d666432bc58d6c78c4568cd63d442ae736db8be2c4ca01bbc946c" PACKAGECONFIG ?= "flatpak" PACKAGECONFIG[flatpak] = "-Dflatpak=true,-Dflatpak=false,flatpak ostree"