Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package reproc for openSUSE:Factory checked in at 2023-04-05 21:27:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/reproc (Old) and /work/SRC/openSUSE:Factory/.reproc.new.19717 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "reproc" Wed Apr 5 21:27:17 2023 rev:2 rq:1077368 version:14.2.4 Changes: -------- --- /work/SRC/openSUSE:Factory/reproc/reproc.changes 2023-02-24 18:08:25.557519168 +0100 +++ /work/SRC/openSUSE:Factory/.reproc.new.19717/reproc.changes 2023-04-05 21:35:15.118430424 +0200 @@ -1,0 +2,5 @@ +Tue Apr 4 21:15:55 UTC 2023 - Dirk Müller <dmuel...@suse.com> + +- add gcc13.patch to fix build + +------------------------------------------------------------------- New: ---- gcc13.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ reproc.spec ++++++ --- /var/tmp/diff_new_pack.ODWJ40/_old 2023-04-05 21:35:15.550432888 +0200 +++ /var/tmp/diff_new_pack.ODWJ40/_new 2023-04-05 21:35:15.558432934 +0200 @@ -25,6 +25,8 @@ License: MIT URL: https://github.com/DaanDeMeyer/reproc Source: https://github.com/DaanDeMeyer/reproc/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM: https://github.com/DaanDeMeyer/reproc/commit/0b23d88894ccedde04537fa23ea55cb2f8365342.patch +Patch1: gcc13.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig ++++++ gcc13.patch ++++++ >From 0b23d88894ccedde04537fa23ea55cb2f8365342 Mon Sep 17 00:00:00 2001 From: Daan De Meyer <daan.j.deme...@gmail.com> Date: Sat, 18 Mar 2023 19:38:19 +0100 Subject: [PATCH] reproc++: Try to fix gcc 13 build --- reproc++/include/reproc++/reproc.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Index: reproc-14.2.4/reproc++/include/reproc++/reproc.hpp =================================================================== --- reproc-14.2.4.orig/reproc++/include/reproc++/reproc.hpp +++ reproc-14.2.4/reproc++/include/reproc++/reproc.hpp @@ -88,7 +88,7 @@ struct redirect { struct options { struct { - env::type behavior; + enum 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 @@ struct options { const char *working_directory = nullptr; struct { - redirect in; - redirect out; - redirect err; + struct redirect in; + struct redirect out; + struct redirect err; bool parent; bool discard; FILE *file; @@ -138,30 +138,12 @@ enum class stream { err, }; -class process; - namespace event { -enum { - in = 1 << 0, - out = 1 << 1, - err = 1 << 2, - exit = 1 << 3, - deadline = 1 << 4, -}; - -struct source { - class process &process; - int interests; - int events; -}; +class source; } -REPROCXX_EXPORT std::error_code poll(event::source *sources, - size_t num_sources, - milliseconds timeout = infinite); - /*! Improves on reproc's API by adding RAII and changing the API of some functions to be more idiomatic C++. */ class process { @@ -220,4 +202,26 @@ private: std::unique_ptr<reproc_t, reproc_t *(*) (reproc_t *)> impl_; }; +namespace event { + +enum { + in = 1 << 0, + out = 1 << 1, + err = 1 << 2, + exit = 1 << 3, + deadline = 1 << 4, +}; + +struct source { + class process process; + int interests; + int events; +}; + +} + +REPROCXX_EXPORT std::error_code poll(event::source *sources, + size_t num_sources, + milliseconds timeout = infinite); + } Index: reproc-14.2.4/reproc++/src/reproc.cpp =================================================================== --- reproc-14.2.4.orig/reproc++/src/reproc.cpp +++ reproc-14.2.4/reproc++/src/reproc.cpp @@ -86,8 +86,9 @@ std::pair<bool, std::error_code> process std::pair<int, std::error_code> process::poll(int interests, milliseconds timeout) { - event::source source{ *this, interests, 0 }; + event::source source{ std::move(*this), interests, 0 }; std::error_code ec = ::reproc::poll(&source, 1, timeout); + *this = std::move(source.process); 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 @@ struct options { struct { - enum env::type behavior; + enum redirect_t::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 @@ 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 };
