diff mbox series

[meta-gnome,1/2] gnome-software: fix build with flatpak 1.17.1

Message ID 20251225193431.1365161-1-f_l_k@t-online.de
State New
Headers show
Series [meta-gnome,1/2] gnome-software: fix build with flatpak 1.17.1 | expand

Commit Message

Markus Volk Dec. 25, 2025, 7:34 p.m. UTC
fixes:
../sources/gnome-software-49.1/meson.build:218:32: ERROR: Could not get pkg-config variable and no default provided for <PkgConfigDependency flatpak: True ['>= 1.14.1']>

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 ...-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 mbox series

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 <f_l_k@t-online.de>
+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 <PkgConfigDependency flatpak: True ['>= 1.14.1']>
+
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+
+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"