diff --git a/.gitignore b/.gitignore index a631825..8a6b195 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,4 @@ /waylandpp-0.2.7.tar.gz /waylandpp-0.2.8.tar.gz /waylandpp-0.2.9.tar.gz -/waylandpp-1.0.0.tar.gz -/waylandpp-1.0.1.tar.gz +/waylandpp-0.2.10.tar.gz diff --git a/sources b/sources index 9c6cea5..3fdf5ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (waylandpp-1.0.1.tar.gz) = 32c334cc5349c0f15efb5ebc192b60909580ab90b1359c905ca693fe0006747be2a8c7053ffcfc14eaafeeb6aa0b61d1e07a6a3bd9c351d1abb059b2d7c6191b +SHA512 (waylandpp-0.2.10.tar.gz) = 02f0844e4003435d0e9edc4664b2843616aaeb46bd908b2301dc97945f285a57e62fba0d8693ce7a009bbb422aa23bf5261521a545f482e9f8c588e095340c99 diff --git a/waylandpp-0.2.5-pugixml.patch b/waylandpp-0.2.5-pugixml.patch new file mode 100644 index 0000000..ac906ce --- /dev/null +++ b/waylandpp-0.2.5-pugixml.patch @@ -0,0 +1,37 @@ +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 new file mode 100644 index 0000000..d6ecb27 --- /dev/null +++ b/waylandpp-0.2.7-gcc10.patch @@ -0,0 +1,11 @@ +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 new file mode 100644 index 0000000..03bd95d --- /dev/null +++ b/waylandpp-0.2.7-pugixml.patch @@ -0,0 +1,18 @@ +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.spec b/waylandpp.spec index c9a0f82..8d7f747 100644 --- a/waylandpp.spec +++ b/waylandpp.spec @@ -1,23 +1,22 @@ Name: waylandpp -Version: 1.0.1 -Release: 4%{?dist} +Version: 0.2.10 +Release: 1%{?dist} Summary: Wayland C++ bindings # waylandpp includes part of Wayland under MIT, wayland-scanner++ is 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 +License: BSD and MIT and GPLv3+ URL: https://github.com/NilsBrause/%{name}/ Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: cmake BuildRequires: doxygen BuildRequires: gcc-c++ +BuildRequires: graphviz BuildRequires: mesa-libEGL-devel -BuildRequires: pkgconfig(pugixml) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-egl) -BuildRequires: pkgconfig(wayland-server) +BuildRequires: pugixml-devel %description Wayland is an object oriented display protocol, which features request and @@ -91,41 +90,8 @@ 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* Sat Jan 21 2023 Fedora Release Engineering - 1.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Oct 05 2022 Mohamed El Morabity - 1.0.0-1 -- Update to 1.0.0 +* Wed Oct 05 2022 Mohamed El Morabity - 0.2.10-1 +- Update to 0.2.10 * Sat Jul 23 2022 Fedora Release Engineering - 0.2.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild