[packages/wlcs] - added upstream patch for std::remove issue, disable -Werror; release 3

qboosh qboosh at pld-linux.org
Fri Sep 13 21:01:52 CEST 2024


commit 01561f390f1e92ff8fec7a254f681ba19b9dd7f0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Sep 13 21:04:47 2024 +0200

    - added upstream patch for std::remove issue, disable -Werror; release 3

 wlcs-remove.patch | 26 ++++++++++++++++++++++++++
 wlcs.spec         | 14 ++++++++++----
 2 files changed, 36 insertions(+), 4 deletions(-)
---
diff --git a/wlcs.spec b/wlcs.spec
index ced870e..5e5cdb0 100644
--- a/wlcs.spec
+++ b/wlcs.spec
@@ -15,13 +15,14 @@ Summary:	Wayland Conformance Test Suite
 Summary(pl.UTF-8):	Wayland Conformance Test Suite - testy zgodności Waylanda
 Name:		wlcs
 Version:	1.7.0
-Release:	2
+Release:	3
 License:	GPL v3
 Group:		Libraries
-#Source0Download: https://github.com/MirServer/wlcs/releases
-Source0:	https://github.com/MirServer/wlcs/archive/v%{version}/%{name}-%{version}.tar.gz
+#Source0Download: https://github.com/canonical/wlcs/releases
+Source0:	https://github.com/canonical/wlcs/archive/v%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	67d7233657987b335944fe658a76dd2c
-URL:		https://github.com/MirServer/wlcs
+Patch0:		%{name}-remove.patch
+URL:		https://github.com/canonical/wlcs
 BuildRequires:	boost-devel
 BuildRequires:	cmake >= 3.5
 BuildRequires:	gmock-devel
@@ -32,6 +33,7 @@ BuildRequires:	libstdc++-devel >= 6:8
 %{?with_tsan:BuildRequires:	libtsan-devel}
 %{?with_ubsan:BuildRequires:	libubsan-devel}
 BuildRequires:	pkgconfig
+BuildRequires:	sed >= 4.0
 # client, server, scanner
 BuildRequires:	wayland-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -57,6 +59,10 @@ Pliki nagłówkowe wlcs.
 
 %prep
 %setup -q
+%patch0 -p1
+
+# maybe-uninitialized warning from std::optional<std::function>
+%{__sed} -i -e '/CXX_FLAGS/ s/-Werror //' CMakeLists.txt
 
 %build
 install -d build
diff --git a/wlcs-remove.patch b/wlcs-remove.patch
new file mode 100644
index 0000000..631b83c
--- /dev/null
+++ b/wlcs-remove.patch
@@ -0,0 +1,26 @@
+From 5c812e560052e2cbff4c6d26439935020ddee52f Mon Sep 17 00:00:00 2001
+From: Alan Griffiths <alan at octopull.co.uk>
+Date: Tue, 19 Mar 2024 10:30:13 +0000
+Subject: [PATCH] "remove"? I don't think that algorithm does what you think it
+ does
+
+---
+ tests/wlr_foreign_toplevel_management_v1.cpp | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/tests/wlr_foreign_toplevel_management_v1.cpp b/tests/wlr_foreign_toplevel_management_v1.cpp
+index b824d3db..b7a59de9 100644
+--- a/tests/wlr_foreign_toplevel_management_v1.cpp
++++ b/tests/wlr_foreign_toplevel_management_v1.cpp
+@@ -110,10 +110,7 @@ ForeignToplevelHandle::ForeignToplevelHandle(zwlr_foreign_toplevel_handle_v1* ha
+             wl_output* output)
+             {
+                 auto self = get_self(data);
+-                std::remove(
+-                    self->outputs_.begin(),
+-                    self->outputs_.end(),
+-                    output);
++                std::erase(self->outputs_, output);
+                 self->dirty_ = true;
+             },
+         [] /*state */ (
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wlcs.git/commitdiff/01561f390f1e92ff8fec7a254f681ba19b9dd7f0



More information about the pld-cvs-commit mailing list