File n-0092-trivial-aptcc-Build-with-older-Meson-ver... of Package PackageKit

Overview Repositories Revisions Requests Users Attributes Meta

File n-0092-trivial-aptcc-Build-with-older-Meson-versions.patch of Package PackageKit

From 25de1eba8de389a5970bc01bf1ce849cf73a97fc Mon Sep 17 00:00:00 2001
From: Matthias Klumpp <matthias@tenstral.net>
Date: Thu, 17 Feb 2022 02:05:34 +0100
Subject: [PATCH 092/102] trivial: aptcc: Build with older Meson versions

diff --git a/backends/aptcc/apt-intf.cpp b/backends/aptcc/apt-intf.cpp
index a44515a23..d587cd9f9 100644
--- a/backends/aptcc/apt-intf.cpp
+++ b/backends/aptcc/apt-intf.cpp
@@ -2580,7 +2580,7 @@ bool AptIntf::installPackages(PkBitfield flags)
         std::string line;
         std::string shortErrorLog = "";
         while(std::getline(ss, line, '\n')) {
-            if (line.starts_with("E:"))
+            if (g_str_has_prefix (line.c_str(), "E:"))
                 shortErrorLog.append("\n" + line);
         }
 
diff --git a/backends/aptcc/meson.build b/backends/aptcc/meson.build
index fbb8c0b7a..5df8f29e2 100644
--- a/backends/aptcc/meson.build
+++ b/backends/aptcc/meson.build
@@ -65,7 +65,10 @@ shared_module(
   link_args: [
     '-lutil',
   ],
-  override_options: ['c_std=c18', 'cpp_std=c++20'],
+  override_options: [
+    'c_std=c11',
+    'cpp_std=c++17'
+  ],
   install: true,
   install_dir: pk_plugin_dir,
 )
-- 
2.35.1

Places

File n-0092-trivial-aptcc-Build-with-older-Meson-versions.patch of Package PackageKit

Places