Accepting request 1087902 from devel:libraries:c_c++
- gcc13.patch: refresh with the patch that landed upstream OBS-URL: https://build.opensuse.org/request/show/1087902 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/reproc?expand=0&rev=3
This commit is contained in:
57
gcc13.patch
57
gcc13.patch
@@ -107,47 +107,30 @@ Index: reproc-14.2.4/reproc++/src/reproc.cpp
|
||||
return { source.events, ec };
|
||||
}
|
||||
|
||||
--- reproc-14.2.4/reproc++/include/reproc++/reproc.hpp 2023-04-04 23:14:25.549923395 +0200
|
||||
+++ reproc-14.2.4/reproc++/include/reproc++/reproc.hpp 2023-04-04 23:13:00.824489755 +0200
|
||||
@@ -65,7 +65,7 @@
|
||||
using handle = int;
|
||||
#endif
|
||||
|
||||
-struct redirect {
|
||||
+struct redirect_t {
|
||||
enum type {
|
||||
default_, // Unfortunately, both `default` and `auto` are keywords.
|
||||
pipe,
|
||||
@@ -88,7 +88,7 @@
|
||||
|
||||
From 9f399675b821e175f85ac3ee6e3fd2e6056573eb Mon Sep 17 00:00:00 2001
|
||||
From: Daan De Meyer <daan.j.demeyer@gmail.com>
|
||||
Date: Fri, 21 Apr 2023 19:36:45 +0200
|
||||
Subject: [PATCH] Fix gcc 13 build
|
||||
|
||||
---
|
||||
reproc++/include/reproc++/reproc.hpp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/reproc++/include/reproc++/reproc.hpp b/reproc++/include/reproc++/reproc.hpp
|
||||
index b52f495e..7b614a94 100644
|
||||
--- a/reproc++/include/reproc++/reproc.hpp
|
||||
+++ b/reproc++/include/reproc++/reproc.hpp
|
||||
@@ -88,10 +88,10 @@ struct redirect {
|
||||
|
||||
struct options {
|
||||
struct {
|
||||
- enum env::type behavior;
|
||||
+ enum redirect_t::type behavior;
|
||||
+ reproc::env::type behavior;
|
||||
/*! Implicitly converts from any STL container of string pairs to the
|
||||
environment format expected by `reproc_start`. */
|
||||
class env extra;
|
||||
@@ -97,9 +97,9 @@
|
||||
- class env extra;
|
||||
+ reproc::env extra;
|
||||
} env = {};
|
||||
|
||||
const char *working_directory = nullptr;
|
||||
|
||||
struct {
|
||||
- struct redirect in;
|
||||
- struct redirect out;
|
||||
- struct redirect err;
|
||||
+ struct redirect_t in;
|
||||
+ struct redirect_t out;
|
||||
+ struct redirect_t err;
|
||||
bool parent;
|
||||
bool discard;
|
||||
FILE *file;
|
||||
--- reproc-14.2.4/reproc++/src/reproc.cpp 2023-04-04 23:14:25.549923395 +0200
|
||||
+++ reproc-14.2.4/reproc++/src/reproc.cpp 2023-04-04 23:13:41.693181299 +0200
|
||||
@@ -39,7 +39,7 @@
|
||||
};
|
||||
}
|
||||
|
||||
-static reproc_redirect reproc_redirect_from(redirect redirect)
|
||||
+static reproc_redirect reproc_redirect_from(redirect_t redirect)
|
||||
{
|
||||
return { static_cast<REPROC_REDIRECT>(redirect.type), redirect.handle,
|
||||
redirect.file, redirect.path };
|
||||
|
@@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri May 19 08:08:57 UTC 2023 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
- gcc13.patch: refresh with the patch that landed upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 4 21:15:55 UTC 2023 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
|
Reference in New Issue
Block a user