Compare commits

...
Sign in to create a new pull request.

10 commits

Author SHA1 Message Date
Fedora Release Engineering
13a1c994e9 Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 08:43:05 +00:00
Fedora Release Engineering
2a677296dc Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 20:08:43 +00:00
Fedora Release Engineering
c2a16bdcea Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 20:19:06 +00:00
Mohamed El Morabity
32e3e359ab Update to 1.0.1 2025-07-12 20:44:15 +02:00
Fedora Release Engineering
699723bd5f Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 14:48:56 +00:00
Miroslav Suchý
6d0b45f899 convert license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-09-04 22:45:56 +02:00
Fedora Release Engineering
033dce3fb7 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 09:10:29 +00:00
Fedora Release Engineering
6e5dd34730 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 08:28:18 +00:00
Fedora Release Engineering
d4529a8ebc Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 18:01:24 +00:00
Mohamed El Morabity
b10c034c2a Fix build with GCC 13 2023-03-26 12:15:50 +02:00
6 changed files with 36 additions and 70 deletions

1
.gitignore vendored
View file

@ -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

View file

@ -1 +1 @@
SHA512 (waylandpp-1.0.0.tar.gz) = 64b59d073a0593ecf442362eb63ec0a9dfeaa1ad1d56b5955cb0c159fd01dc45e012b926811c6ca0dc12d4bb2e640eabc2e778ab7d28de2098eb694d26f01039
SHA512 (waylandpp-1.0.1.tar.gz) = 32c334cc5349c0f15efb5ebc192b60909580ab90b1359c905ca693fe0006747be2a8c7053ffcfc14eaafeeb6aa0b61d1e07a6a3bd9c351d1abb059b2d7c6191b

View file

@ -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

View file

@ -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 <typeinfo>
#include <utility>
#include <vector>
+#include <stdexcept>
#include <wayland-client-core.h>

View file

@ -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}")

View file

@ -1,10 +1,11 @@
Name: waylandpp
Version: 1.0.0
Release: 2%{?dist}
Version: 1.0.1
Release: 4%{?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
@ -90,6 +91,36 @@ rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc/latex/
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sat Jul 12 2025 Mohamed El Morabity <melmorabity@fedoraproject.org> - 1.0.1-1
- Update to 1.0.1
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 1.0.0-7
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sun Mar 26 2023 Mohamed El Morabity <melmorabity@fedoraproject.org> - 1.0.0-3
- Fix build with GCC 13
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild