From b10c034c2a3302dbca61f23876fc3d385c4d3061 Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Sun, 26 Mar 2023 12:15:50 +0200 Subject: [PATCH 01/10] Fix build with GCC 13 --- waylandpp-0.2.5-pugixml.patch | 37 ---------------------------------- waylandpp-0.2.7-gcc10.patch | 11 ---------- waylandpp-0.2.7-pugixml.patch | 18 ----------------- waylandpp-1.0.0-gcc13.patch | 38 +++++++++++++++++++++++++++++++++++ waylandpp.spec | 9 +++++++-- 5 files changed, 45 insertions(+), 68 deletions(-) delete mode 100644 waylandpp-0.2.5-pugixml.patch delete mode 100644 waylandpp-0.2.7-gcc10.patch delete mode 100644 waylandpp-0.2.7-pugixml.patch create mode 100644 waylandpp-1.0.0-gcc13.patch diff --git a/waylandpp-0.2.5-pugixml.patch b/waylandpp-0.2.5-pugixml.patch deleted file mode 100644 index ac906ce..0000000 --- a/waylandpp-0.2.5-pugixml.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up ./CMakeLists.txt.orig ./CMakeLists.txt ---- ./CMakeLists.txt.orig 2019-02-24 16:25:11.000000000 +0100 -+++ ./CMakeLists.txt 2019-03-01 22:40:21.727808742 +0100 -@@ -27,6 +27,7 @@ cmake_minimum_required(VERSION 3.1) - # packages - include(FindPkgConfig) - include(GNUInstallDirs) -+include(FindPackageHandleStandardArgs) - find_package(Doxygen) - - # version information -@@ -59,13 +60,18 @@ set(CMAKE_CXX_STANDARD 11) - - # build scanner - if(BUILD_SCANNER) -- pkg_check_modules(PUGIXML REQUIRED "pugixml>=1.4") -- add_executable(wayland-scanner++ scanner/scanner.cpp) -- target_link_libraries(wayland-scanner++ ${PUGIXML_LIBRARIES}) -- target_compile_options(wayland-scanner++ PUBLIC ${PUGIXML_CFLAGS}) -- configure_file(wayland-scanner++.pc.in wayland-scanner++.pc @ONLY) -- install(TARGETS wayland-scanner++ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}") -- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/wayland-scanner++.pc" DESTINATION "${INSTALL_FULL_PKGCONFIGDIR}") -+ find_path(PUGIXML_INCLUDE_DIR NAMES pugixml.hpp) -+ find_library(PUGIXML_LIBRARY NAMES pugixml) -+ find_package_handle_standard_args(PugiXML DEFAULT_MSG PUGIXML_LIBRARY PUGIXML_INCLUDE_DIR) -+ if (PUGIXML_FOUND) -+ set(PUGIXML_LIBRARIES ${PUGIXML_LIBRARY}) -+ mark_as_advanced(PUGIXML_LIBRARY PUGIXML_INCLUDE_DIR) -+ add_executable(wayland-scanner++ scanner/scanner.cpp) -+ target_link_libraries(wayland-scanner++ ${PUGIXML_LIBRARIES}) -+ configure_file(wayland-scanner++.pc.in wayland-scanner++.pc @ONLY) -+ install(TARGETS wayland-scanner++ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}") -+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/wayland-scanner++.pc" DESTINATION "${INSTALL_FULL_PKGCONFIGDIR}") -+ endif() - endif() - - # build libraries diff --git a/waylandpp-0.2.7-gcc10.patch b/waylandpp-0.2.7-gcc10.patch deleted file mode 100644 index d6ecb27..0000000 --- a/waylandpp-0.2.7-gcc10.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nrup a/include/wayland-util.hpp b/include/wayland-util.hpp ---- include/wayland-util.hpp 2019-02-24 08:25:11.000000000 -0700 -+++ include/wayland-util.hpp 2019-09-23 10:07:38.646666012 -0600 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #include - diff --git a/waylandpp-0.2.7-pugixml.patch b/waylandpp-0.2.7-pugixml.patch deleted file mode 100644 index 03bd95d..0000000 --- a/waylandpp-0.2.7-pugixml.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up ./CMakeLists.txt.orig ./CMakeLists.txt ---- ./CMakeLists.txt.orig 2019-10-14 19:03:11.000000000 +0200 -+++ ./CMakeLists.txt 2019-12-04 16:47:37.722206039 +0100 -@@ -81,10 +81,11 @@ endfunction() - - # build scanner - if(BUILD_SCANNER) -- pkg_check_modules(PUGIXML REQUIRED "pugixml>=1.4") -- pkg_libs_full_path(PUGIXML) -+ find_package(pugixml REQUIRED) -+ MESSAGE("cflags: ${PUGIXML_CFLAGS}") -+ MESSAGE("libs: ${PUGIXML_LIBRARIES}") - add_executable(wayland-scanner++ scanner/scanner.cpp) -- target_link_libraries(wayland-scanner++ ${PUGIXML_LIBRARIES}) -+ target_link_libraries(wayland-scanner++ pugixml) - target_compile_options(wayland-scanner++ PUBLIC ${PUGIXML_CFLAGS}) - configure_file(wayland-scanner++.pc.in wayland-scanner++.pc @ONLY) - install(TARGETS wayland-scanner++ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}") diff --git a/waylandpp-1.0.0-gcc13.patch b/waylandpp-1.0.0-gcc13.patch new file mode 100644 index 0000000..d14716a --- /dev/null +++ b/waylandpp-1.0.0-gcc13.patch @@ -0,0 +1,38 @@ +diff -up ./include/wayland-client.hpp.orig ./include/wayland-client.hpp +--- ./include/wayland-client.hpp.orig 2022-04-25 18:04:33.000000000 +0200 ++++ ./include/wayland-client.hpp 2023-03-26 11:58:50.003952654 +0200 +@@ -29,6 +29,7 @@ + /** \file */ + + #include ++#include + #include + #include + #include +diff -up ./scanner/scanner.cpp.orig ./scanner/scanner.cpp +--- ./scanner/scanner.cpp.orig 2022-04-25 18:04:33.000000000 +0200 ++++ ./scanner/scanner.cpp 2023-03-26 11:49:29.853386221 +0200 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + + #include "pugixml.hpp" +@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[]) + wayland_hpp << "#pragma once" << std::endl + << std::endl + << "#include " << std::endl ++ << "#include " << std::endl + << "#include " << std::endl + << "#include " << std::endl + << "#include " << std::endl +@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[]) + wayland_server_hpp << "#pragma once" << std::endl + << std::endl + << "#include " << std::endl ++ << "#include " << std::endl + << "#include " << std::endl + << "#include " << std::endl + << "#include " << std::endl diff --git a/waylandpp.spec b/waylandpp.spec index 77ce3a1..8287cca 100644 --- a/waylandpp.spec +++ b/waylandpp.spec @@ -1,12 +1,14 @@ Name: waylandpp Version: 1.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Wayland C++ bindings # waylandpp includes part of Wayland under MIT, wayland-scanner++ is GPLv3+ License: BSD and MIT and GPLv3+ URL: https://github.com/NilsBrause/%{name}/ Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +# Fix build with GCC 13 +Patch0: %{name}-1.0.0-gcc13.patch BuildRequires: cmake BuildRequires: doxygen @@ -47,7 +49,7 @@ The %{name}-doc package contains development documentation for %{name}. %prep -%autosetup +%autosetup -p0 %build @@ -90,6 +92,9 @@ rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc/latex/ %changelog +* Sun Mar 26 2023 Mohamed El Morabity - 1.0.0-3 +- Fix build with GCC 13 + * Sat Jan 21 2023 Fedora Release Engineering - 1.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From d4529a8ebce14609868ca0cfb273576dd143e414 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:01:24 +0000 Subject: [PATCH 02/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- waylandpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/waylandpp.spec b/waylandpp.spec index 8287cca..f5bc704 100644 --- a/waylandpp.spec +++ b/waylandpp.spec @@ -1,6 +1,6 @@ Name: waylandpp Version: 1.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Wayland C++ bindings # waylandpp includes part of Wayland under MIT, wayland-scanner++ is GPLv3+ @@ -92,6 +92,9 @@ rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc/latex/ %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sun Mar 26 2023 Mohamed El Morabity - 1.0.0-3 - Fix build with GCC 13 From 6e5dd34730cb606e37402440e645f653262a3fae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:28:18 +0000 Subject: [PATCH 03/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- waylandpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/waylandpp.spec b/waylandpp.spec index f5bc704..2bd8540 100644 --- a/waylandpp.spec +++ b/waylandpp.spec @@ -1,6 +1,6 @@ Name: waylandpp Version: 1.0.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Wayland C++ bindings # waylandpp includes part of Wayland under MIT, wayland-scanner++ is GPLv3+ @@ -92,6 +92,9 @@ rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc/latex/ %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 1.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 033dce3fb7d27095e9e6c6ce497a4533517b5912 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:10:29 +0000 Subject: [PATCH 04/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- waylandpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/waylandpp.spec b/waylandpp.spec index 2bd8540..b0d702d 100644 --- a/waylandpp.spec +++ b/waylandpp.spec @@ -1,6 +1,6 @@ Name: waylandpp Version: 1.0.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Wayland C++ bindings # waylandpp includes part of Wayland under MIT, wayland-scanner++ is GPLv3+ @@ -92,6 +92,9 @@ rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc/latex/ %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 1.0.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 6d0b45f899ef23fa4e8506d342228bd9dd1bed57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 22:45:56 +0200 Subject: [PATCH 05/10] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- waylandpp.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/waylandpp.spec b/waylandpp.spec index b0d702d..f9833dc 100644 --- a/waylandpp.spec +++ b/waylandpp.spec @@ -1,10 +1,11 @@ Name: waylandpp Version: 1.0.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Wayland C++ bindings # waylandpp includes part of Wayland under MIT, wayland-scanner++ is GPLv3+ -License: BSD and MIT and GPLv3+ +# Automatically converted from old format: BSD and MIT and GPLv3+ - review is highly recommended. +License: LicenseRef-Callaway-BSD AND LicenseRef-Callaway-MIT AND GPL-3.0-or-later URL: https://github.com/NilsBrause/%{name}/ Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz # Fix build with GCC 13 @@ -92,6 +93,9 @@ rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc/latex/ %changelog +* Wed Sep 04 2024 Miroslav Suchý - 1.0.0-7 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 1.0.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 699723bd5f474d46626a24cfaaac93b5881cbaab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:48:56 +0000 Subject: [PATCH 06/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- waylandpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/waylandpp.spec b/waylandpp.spec index f9833dc..db57b29 100644 --- a/waylandpp.spec +++ b/waylandpp.spec @@ -1,6 +1,6 @@ Name: waylandpp Version: 1.0.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Wayland C++ bindings # waylandpp includes part of Wayland under MIT, wayland-scanner++ is GPLv3+ @@ -93,6 +93,9 @@ rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc/latex/ %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.0.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Sep 04 2024 Miroslav Suchý - 1.0.0-7 - convert license to SPDX From 32e3e359ab65220d8a0b08d5e190fb714c7982b1 Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Sat, 12 Jul 2025 20:43:48 +0200 Subject: [PATCH 07/10] Update to 1.0.1 --- .gitignore | 1 + sources | 2 +- waylandpp-1.0.0-gcc13.patch | 38 ------------------------------------- waylandpp.spec | 11 ++++++----- 4 files changed, 8 insertions(+), 44 deletions(-) delete mode 100644 waylandpp-1.0.0-gcc13.patch diff --git a/.gitignore b/.gitignore index ef7af88..a631825 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /waylandpp-0.2.8.tar.gz /waylandpp-0.2.9.tar.gz /waylandpp-1.0.0.tar.gz +/waylandpp-1.0.1.tar.gz diff --git a/sources b/sources index b576c41..9c6cea5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (waylandpp-1.0.0.tar.gz) = 64b59d073a0593ecf442362eb63ec0a9dfeaa1ad1d56b5955cb0c159fd01dc45e012b926811c6ca0dc12d4bb2e640eabc2e778ab7d28de2098eb694d26f01039 +SHA512 (waylandpp-1.0.1.tar.gz) = 32c334cc5349c0f15efb5ebc192b60909580ab90b1359c905ca693fe0006747be2a8c7053ffcfc14eaafeeb6aa0b61d1e07a6a3bd9c351d1abb059b2d7c6191b diff --git a/waylandpp-1.0.0-gcc13.patch b/waylandpp-1.0.0-gcc13.patch deleted file mode 100644 index d14716a..0000000 --- a/waylandpp-1.0.0-gcc13.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up ./include/wayland-client.hpp.orig ./include/wayland-client.hpp ---- ./include/wayland-client.hpp.orig 2022-04-25 18:04:33.000000000 +0200 -+++ ./include/wayland-client.hpp 2023-03-26 11:58:50.003952654 +0200 -@@ -29,6 +29,7 @@ - /** \file */ - - #include -+#include - #include - #include - #include -diff -up ./scanner/scanner.cpp.orig ./scanner/scanner.cpp ---- ./scanner/scanner.cpp.orig 2022-04-25 18:04:33.000000000 +0200 -+++ ./scanner/scanner.cpp 2023-03-26 11:49:29.853386221 +0200 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - - #include "pugixml.hpp" -@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[]) - wayland_hpp << "#pragma once" << std::endl - << std::endl - << "#include " << std::endl -+ << "#include " << std::endl - << "#include " << std::endl - << "#include " << std::endl - << "#include " << std::endl -@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[]) - wayland_server_hpp << "#pragma once" << std::endl - << std::endl - << "#include " << std::endl -+ << "#include " << std::endl - << "#include " << std::endl - << "#include " << std::endl - << "#include " << std::endl diff --git a/waylandpp.spec b/waylandpp.spec index db57b29..087b195 100644 --- a/waylandpp.spec +++ b/waylandpp.spec @@ -1,6 +1,6 @@ Name: waylandpp -Version: 1.0.0 -Release: 8%{?dist} +Version: 1.0.1 +Release: 1%{?dist} Summary: Wayland C++ bindings # waylandpp includes part of Wayland under MIT, wayland-scanner++ is GPLv3+ @@ -8,8 +8,6 @@ Summary: Wayland C++ bindings License: LicenseRef-Callaway-BSD AND LicenseRef-Callaway-MIT AND GPL-3.0-or-later URL: https://github.com/NilsBrause/%{name}/ Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -# Fix build with GCC 13 -Patch0: %{name}-1.0.0-gcc13.patch BuildRequires: cmake BuildRequires: doxygen @@ -50,7 +48,7 @@ The %{name}-doc package contains development documentation for %{name}. %prep -%autosetup -p0 +%autosetup %build @@ -93,6 +91,9 @@ rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc/latex/ %changelog +* Sat Jul 12 2025 Mohamed El Morabity - 1.0.1-1 +- Update to 1.0.1 + * Sun Jan 19 2025 Fedora Release Engineering - 1.0.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From c2a16bdcea6d28e363e7c44f42560303af89c002 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:19:06 +0000 Subject: [PATCH 08/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- waylandpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/waylandpp.spec b/waylandpp.spec index 087b195..68ae898 100644 --- a/waylandpp.spec +++ b/waylandpp.spec @@ -1,6 +1,6 @@ Name: waylandpp Version: 1.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wayland C++ bindings # waylandpp includes part of Wayland under MIT, wayland-scanner++ is GPLv3+ @@ -91,6 +91,9 @@ rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc/latex/ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jul 12 2025 Mohamed El Morabity - 1.0.1-1 - Update to 1.0.1 From 2a677296dc48f37e55ddaccc953cd726fff77893 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:08:43 +0000 Subject: [PATCH 09/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- waylandpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/waylandpp.spec b/waylandpp.spec index 68ae898..aecf973 100644 --- a/waylandpp.spec +++ b/waylandpp.spec @@ -1,6 +1,6 @@ Name: waylandpp Version: 1.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Wayland C++ bindings # waylandpp includes part of Wayland under MIT, wayland-scanner++ is GPLv3+ @@ -91,6 +91,9 @@ rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc/latex/ %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 1.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 13a1c994e997cdbeea7b334384023b59d92bdba3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:43:05 +0000 Subject: [PATCH 10/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- waylandpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/waylandpp.spec b/waylandpp.spec index aecf973..c9a0f82 100644 --- a/waylandpp.spec +++ b/waylandpp.spec @@ -1,6 +1,6 @@ Name: waylandpp Version: 1.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Wayland C++ bindings # waylandpp includes part of Wayland under MIT, wayland-scanner++ is GPLv3+ @@ -91,6 +91,9 @@ rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc/latex/ %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 1.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild