File 0001-flatpak-Allow-building-with-flatpaks-older... of Package discover6

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-flatpak-Allow-building-with-flatpaks-older-than-1.15.patch of Package discover6 (Revision 595f6e4be45ca80b4747bfb67be55503)

Currently displaying revision 595f6e4be45ca80b4747bfb67be55503 , Show latest

From 9dc0e73edc861b14c009a8304d33e65dfd898123 Mon Sep 17 00:00:00 2001
From: Aleix Pol Gonzalez <aleixpol@kde.org>
Date: Tue, 28 May 2024 22:04:17 +0000
Subject: [PATCH] flatpak: Allow building with flatpaks older than 1.15

It's still fresh and not even considered stable

(cherry picked from commit 20704080a35db5278f8ab6f7f0b6b03375acdb61)

2f5074e4 flatpak: Allow building with flatpaks older than 1.15
---
 .../backends/FlatpakBackend/FlatpakTransactionThread.cpp     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.cpp b/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.cpp
index 4211f30a3..f9b877119 100644
--- a/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.cpp
+++ b/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.cpp
@@ -415,7 +415,12 @@ bool FlatpakTransactionThread::end_of_lifed_with_rebase(const char *remote,
     }
 
     GError *localError = nullptr;
+#if FLATPAK_CHECK_VERSION(1, 15, 0)
     const auto correct = flatpak_transaction_add_rebase_and_uninstall(m_transaction, remote, rebased_to_ref, ref, nullptr, previous_ids, &localError);
+#else
+    const auto correct = flatpak_transaction_add_rebase(m_transaction, remote, rebased_to_ref, nullptr, previous_ids, &localError)
+        && flatpak_transaction_add_uninstall(m_transaction, ref, &localError);
+#endif
     if (!correct || localError) {
         fail(ref, localError);
         return false;
-- 
2.45.1

Places

File 0001-flatpak-Allow-building-with-flatpaks-older-than-1.15.patch of Package discover6 (Revision 595f6e4be45ca80b4747bfb67be55503)

Places