summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-gnome/recipes-gnome/gnome-software/gnome-software/0001-meson.build-dont-look-for-flatpak-http_backend-varia.patch56
-rw-r--r--meta-gnome/recipes-gnome/gnome-software/gnome-software_50.0.bb (renamed from meta-gnome/recipes-gnome/gnome-software/gnome-software_49.2.bb)3
2 files changed, 1 insertions, 58 deletions
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
deleted file mode 100644
index 2296b7acd2..0000000000
--- a/meta-gnome/recipes-gnome/gnome-software/gnome-software/0001-meson.build-dont-look-for-flatpak-http_backend-varia.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 4588a3d34f574619c6f3a4290d53e2ac063ab56a Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de>
3Date: Thu, 25 Dec 2025 20:04:49 +0100
4Subject: [PATCH] meson.build: dont look for flatpak http_backend variable
5
6flatpak 1.17.1 release dropped libsoup2 support:
7[https://github.com/flatpak/flatpak/blob/c324778b0720cb2d01c217fdc70358e232c38b4d/NEWS#L20]
8
9* Drop libsoup2 support in favor of libcurl. The `http_backend` build option has
10 been dropped as well. (#6395)
11
12gnome-software still searches for the http_backend variable and fails:
13 ../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']>
14
15Signed-off-by: Markus Volk <f_l_k@t-online.de>
16
17Upstream-Status: Inappropriate
18---
19 meson.build | 20 +-------------------
20 1 file changed, 1 insertion(+), 19 deletions(-)
21
22diff --git a/meson.build b/meson.build
23index 3704e2abc..7e0496a22 100644
24--- a/meson.build
25+++ b/meson.build
26@@ -212,26 +212,8 @@ if get_option('fwupd')
27 endif
28
29 if get_option('flatpak')
30- flatpak = dependency('flatpak', version : '>= 1.14.1')
31+ flatpak = dependency('flatpak', version : '>= 1.17.1')
32 ostree = dependency('ostree-1')
33-
34- flatpak_httpbackend = flatpak.get_variable('httpbackend')
35- if flatpak_httpbackend == 'soup'
36- flatpak_soupapiversion = flatpak.get_variable('soupapiversion', default_value: '2')
37- if flatpak_soupapiversion.version_compare('< 3')
38- error('''Flatpak library has been built with 'libsoup2' http backend, which conflicts with 'libsoup3' used by gnome-software.
39-
40-You can either:
41-
42-1. Build gnome-software without flatpak support (with -Dflatpak=false) or
43-2. Rebuild flatpak library with http backend other than 'libsoup2'.''')
44- else
45- flatpak_summary = '@0@ (@1@)'.format(flatpak_httpbackend, flatpak_soupapiversion)
46- endif
47- else
48- flatpak_summary = flatpak_httpbackend
49- endif
50- summary('Flatpak http backend', '@0@'.format(flatpak_summary), section : 'Misc')
51 endif
52
53 if get_option('malcontent')
54--
552.52.0
56
diff --git a/meta-gnome/recipes-gnome/gnome-software/gnome-software_49.2.bb b/meta-gnome/recipes-gnome/gnome-software/gnome-software_50.0.bb
index 5c8be9bfb1..0cbf238181 100644
--- a/meta-gnome/recipes-gnome/gnome-software/gnome-software_49.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-software/gnome-software_50.0.bb
@@ -28,8 +28,7 @@ RDEPENDS:${PN} = "iso-codes"
28 28
29EXTRA_OEMESON += "-Dtests=false" 29EXTRA_OEMESON += "-Dtests=false"
30 30
31SRC_URI += "file://0001-meson.build-dont-look-for-flatpak-http_backend-varia.patch" 31SRC_URI[archive.sha256sum] = "3515e2015f235b6abb7a342806008acb1f184c29d9c4ced3581f8ed4c1f1c241"
32SRC_URI[archive.sha256sum] = "b610b6932a8d666432bc58d6c78c4568cd63d442ae736db8be2c4ca01bbc946c"
33 32
34PACKAGECONFIG ?= "flatpak" 33PACKAGECONFIG ?= "flatpak"
35PACKAGECONFIG[flatpak] = "-Dflatpak=true,-Dflatpak=false,flatpak ostree" 34PACKAGECONFIG[flatpak] = "-Dflatpak=true,-Dflatpak=false,flatpak ostree"