diff options
Diffstat (limited to 'dev-cpp/cppgir/files')
4 files changed, 54 insertions, 92 deletions
diff --git a/dev-cpp/cppgir/files/cppgir-0_p20230606-fix-install-paths.patch b/dev-cpp/cppgir/files/cppgir-0_p20230606-fix-install-paths.patch deleted file mode 100644 index c27d1e9f29b0..000000000000 --- a/dev-cpp/cppgir/files/cppgir-0_p20230606-fix-install-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -Install cmake targets in correct directory - ---- cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.orig/CMakeLists.txt -+++ cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e/CMakeLists.txt -@@ -259,7 +259,7 @@ - DESTINATION ${GI_IGNORE_FILE_INSTALL_DIR}) - - # cmake EXPORTS --set(CONFIG_PACKAGE_LOCATION lib/cmake/${PROJECT_NAME}) -+set(CONFIG_PACKAGE_LOCATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) - set(CONFIG_VERSION_NAME ${PROJECT_NAME}-config-version.cmake) - set(CONFIG_TARGETS_NAME ${PROJECT_NAME}-targets.cmake) - set(CONFIG_NAME ${PROJECT_NAME}-config.cmake) diff --git a/dev-cpp/cppgir/files/cppgir-0_p20230606-prevent-automagic.patch b/dev-cpp/cppgir/files/cppgir-0_p20230606-prevent-automagic.patch deleted file mode 100644 index 8bb3ab5c4496..000000000000 --- a/dev-cpp/cppgir/files/cppgir-0_p20230606-prevent-automagic.patch +++ /dev/null @@ -1,42 +0,0 @@ -Remove checks for libraries that are completely unnecessary - ---- cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.orig/CMakeLists.txt -+++ cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e/CMakeLists.txt -@@ -79,15 +79,14 @@ - find_package(expected-lite REQUIRED) - target_link_libraries(gi PUBLIC expected-lite) - --include(FindPkgConfig) --pkg_check_modules(GOBJECT gobject-2.0) --pkg_check_modules(GIO gio-2.0 gio-unix-2.0) --pkg_check_modules(GST gstreamer-1.0) --pkg_check_modules(GTK gtk+-3.0) -+if (BUILD_TESTING) -+ include(FindPkgConfig REQUIRED) -+ pkg_check_modules(GOBJECT gobject-2.0 REQUIRED) -+endif() - - ## TEST ## - --if (BUILD_TESTING AND GOBJECT_FOUND) -+if (BUILD_TESTING) - add_executable(gi-test test/main.cpp - test/test_object.c test/test_object.h test/test_boxed.c test/test_boxed.h) - target_include_directories(gi-test PRIVATE "gi" "override") -@@ -113,7 +112,7 @@ - set(EXAMPLE_TARGETS "") - set(EXAMPLE_NS "") - --if (GOBJECT_FOUND) -+if (FALSE) - add_executable(example-gobject EXCLUDE_FROM_ALL examples/gobject.cpp) - target_compile_options(example-gobject PRIVATE ${GOBJECT_CFLAGS}) - target_link_libraries(example-gobject PRIVATE ${GOBJECT_LDFLAGS}) -@@ -179,7 +178,6 @@ - endif () - - # optional Qt example --find_package(Qt5Core 5.9) - if (Qt5Core_FOUND AND GIO_FOUND) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - add_executable(example-gio-qt-async EXCLUDE_FROM_ALL examples/gio-qt-async.cpp) diff --git a/dev-cpp/cppgir/files/cppgir-0_p20230606-system-expected-lite.patch b/dev-cpp/cppgir/files/cppgir-0_p20230606-system-expected-lite.patch deleted file mode 100644 index 096ed39dc03b..000000000000 --- a/dev-cpp/cppgir/files/cppgir-0_p20230606-system-expected-lite.patch +++ /dev/null @@ -1,37 +0,0 @@ -Use system-wide copy of expected-lite - ---- cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.orig/CMakeLists.txt -+++ cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e/CMakeLists.txt -@@ -76,14 +76,8 @@ - "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/override>" - ) - --set(EXPECTED_LITE_INCLUDE "expected-lite/include") --if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/${EXPECTED_LITE_INCLUDE}/nonstd/expected.hpp) -- target_include_directories(gi INTERFACE -- "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/${EXPECTED_LITE_INCLUDE}>" -- ) --else () -- message (FATAL_ERROR "missing submodule expected-lite") --endif () -+find_package(expected-lite REQUIRED) -+target_link_libraries(gi INTERFACE nonstd::expected-lite) - - include(FindPkgConfig) - pkg_check_modules(GOBJECT gobject-2.0) -@@ -241,8 +235,6 @@ - # headers - install(DIRECTORY gi override - DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${PROJECT_NAME}) --install(DIRECTORY ${EXPECTED_LITE_INCLUDE}/nonstd -- DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${PROJECT_NAME}/gi) - - # doc - install(FILES README.md docs/cppgir.md ---- cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.orig/cmake/cppgir-config.cmake -+++ cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e/cmake/cppgir-config.cmake -@@ -1 +1,4 @@ -+include(CMakeFindDependencyMacro) -+find_dependency(expected-lite) -+ - include("${CMAKE_CURRENT_LIST_DIR}/cppgir-targets.cmake") diff --git a/dev-cpp/cppgir/files/cppgir-0_p20230625-fix-libcxx-16.patch b/dev-cpp/cppgir/files/cppgir-0_p20230625-fix-libcxx-16.patch new file mode 100644 index 000000000000..6ca80e05594b --- /dev/null +++ b/dev-cpp/cppgir/files/cppgir-0_p20230625-fix-libcxx-16.patch @@ -0,0 +1,54 @@ +Fix building with libcxx-16 + +https://bugs.gentoo.org/909316 +https://gitlab.com/mnauw/cppgir/-/issues/41 + +--- cppgir-70b0e3d522cec60316d116dcbd919b797e85685a.orig/CMakeLists.txt ++++ cppgir-70b0e3d522cec60316d116dcbd919b797e85685a/CMakeLists.txt +@@ -65,8 +65,8 @@ + -DDEFAULT_GIRPATH=${GI_DEFAULT_GIRPATH}) + target_compile_definitions(cppgir PRIVATE + -DDEFAULT_IGNORE_FILE=${GI_IGNORE_FILE_INSTALL_DIR}/${GI_IGNORE_FILE}:${GI_IGNORE_FILE_INSTALL_DIR}/${GI_IGNORE_FILE_PLATFORM}) +-target_link_libraries(cppgir Boost::program_options stdc++fs ${FORMAT_LIBRARIES}) +-set_property(TARGET cppgir PROPERTY CXX_STANDARD 14) ++target_link_libraries(cppgir Boost::program_options ${FORMAT_LIBRARIES}) ++set_property(TARGET cppgir PROPERTY CXX_STANDARD 17) + + add_library(gi INTERFACE) + target_include_directories(gi INTERFACE +--- cppgir-70b0e3d522cec60316d116dcbd919b797e85685a.orig/tools/cppgir.cpp ++++ cppgir-70b0e3d522cec60316d116dcbd919b797e85685a/tools/cppgir.cpp +@@ -3,8 +3,8 @@ + #include "genns.hpp" + #include "repository.hpp" + +-#include <experimental/filesystem> +-namespace fs = std::experimental::filesystem; ++#include <filesystem> ++namespace fs = std::filesystem; + + #include <boost/algorithm/string/classification.hpp> + #include <boost/algorithm/string/split.hpp> +--- cppgir-70b0e3d522cec60316d116dcbd919b797e85685a.orig/tools/genbase.hpp ++++ cppgir-70b0e3d522cec60316d116dcbd919b797e85685a/tools/genbase.hpp +@@ -6,6 +6,7 @@ + #include "repository.hpp" + + #include <set> ++#include <map> + + struct GeneratorOptions + { +--- cppgir-70b0e3d522cec60316d116dcbd919b797e85685a.orig/tools/genns.cpp ++++ cppgir-70b0e3d522cec60316d116dcbd919b797e85685a/tools/genns.cpp +@@ -5,8 +5,8 @@ + #include <boost/algorithm/string/join.hpp> + #include <boost/format.hpp> + +-#include <experimental/filesystem> +-namespace fs = std::experimental::filesystem; ++#include <filesystem> ++namespace fs = std::filesystem; + + #include <boost/property_tree/xml_parser.hpp> + |