Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
196e242451 |
5 changed files with 45 additions and 68 deletions
|
|
@ -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
|
||||
|
|
@ -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>
|
||||
|
||||
|
|
@ -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}")
|
||||
38
waylandpp-1.0.0-gcc13.patch
Normal file
38
waylandpp-1.0.0-gcc13.patch
Normal file
|
|
@ -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 <atomic>
|
||||
+#include <cstdint>
|
||||
#include <functional>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
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 <vector>
|
||||
#include <cctype>
|
||||
#include <cmath>
|
||||
+#include <cstdint>
|
||||
#include <stdexcept>
|
||||
|
||||
#include "pugixml.hpp"
|
||||
@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[])
|
||||
wayland_hpp << "#pragma once" << std::endl
|
||||
<< std::endl
|
||||
<< "#include <array>" << std::endl
|
||||
+ << "#include <cstdint>" << std::endl
|
||||
<< "#include <functional>" << std::endl
|
||||
<< "#include <memory>" << std::endl
|
||||
<< "#include <string>" << std::endl
|
||||
@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[])
|
||||
wayland_server_hpp << "#pragma once" << std::endl
|
||||
<< std::endl
|
||||
<< "#include <array>" << std::endl
|
||||
+ << "#include <cstdint>" << std::endl
|
||||
<< "#include <functional>" << std::endl
|
||||
<< "#include <memory>" << std::endl
|
||||
<< "#include <string>" << std::endl
|
||||
|
|
@ -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 <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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue