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 @@ -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.2.bb b/meta-gnome/recipes-gnome/gnome-software/gnome-software_50.0.bb similarity index 88% rename from meta-gnome/recipes-gnome/gnome-software/gnome-software_49.2.bb rename to 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" EXTRA_OEMESON += "-Dtests=false" -SRC_URI += "file://0001-meson.build-dont-look-for-flatpak-http_backend-varia.patch" -SRC_URI[archive.sha256sum] = "b610b6932a8d666432bc58d6c78c4568cd63d442ae736db8be2c4ca01bbc946c" +SRC_URI[archive.sha256sum] = "3515e2015f235b6abb7a342806008acb1f184c29d9c4ced3581f8ed4c1f1c241" PACKAGECONFIG ?= "flatpak" PACKAGECONFIG[flatpak] = "-Dflatpak=true,-Dflatpak=false,flatpak ostree"