aboutsummaryrefslogtreecommitdiff
From 05465d486afdba116dbc22fc22c1e6573aea4f22 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Mon, 24 Jan 2022 12:11:57 +0000
Subject: [PATCH] meson: drop unused argument for i18n.merge_file()

Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.

data/meson.build:15:0: ERROR: Function does not take positional arguments.
data/meson.build:27:0: ERROR: Function does not take positional arguments.
---
 data/meson.build | 2 --
 1 file changed, 2 deletions(-)

diff --git a/data/meson.build b/data/meson.build
index 026bd80..3b03b94 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -13,7 +13,6 @@ desktop_in = configure_file(
 )
 
 i18n.merge_file(
-  desktop,
   type: 'desktop',
   input: desktop_in,
   output: '@BASENAME@',
@@ -25,7 +24,6 @@ i18n.merge_file(
 appdata = df_namespace + '.appdata.xml'
 
 i18n.merge_file(
-  appdata,
   input: appdata + '.in',
   output: '@BASENAME@',
   po_dir: po_dir,
-- 
GitLab

mented using ASIO serial diff --git a/gpstcp_v2.h b/gpstcp_v2.h index 75ec2e9..ab46216 100644 --- a/gpstcp_v2.h +++ b/gpstcp_v2.h @@ -29,7 +29,7 @@ #define ASIO_HAS_STD_CHRONO #define ASIO_HAS_MOVE -#include "boost/asio.hpp" +#include <boost/asio.hpp> using boost::asio::ip::tcp; diff --git a/kis_external.h b/kis_external.h index 217f18a..af397b5 100644 --- a/kis_external.h +++ b/kis_external.h @@ -42,7 +42,7 @@ #include "kis_external_packet.h" #include "kis_net_beast_httpd.h" -#include "boost/asio.hpp" +#include <boost/asio.hpp> using boost::asio::ip::tcp; #include <google/protobuf/message_lite.h> diff --git a/kis_net_beast_httpd.h b/kis_net_beast_httpd.h index 355996c..989745e 100644 --- a/kis_net_beast_httpd.h +++ b/kis_net_beast_httpd.h @@ -28,9 +28,9 @@ #include <thread> #include <unordered_map> -#include "boost/asio.hpp" -#include "boost/beast.hpp" -#include "boost/optional.hpp" +#include <boost/asio.hpp> +#include <boost/beast.hpp> +#include <boost/optional.hpp> #include "entrytracker.h" #include "future_chainbuf.h" -- 2.35.1