mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-21 02:42:18 +00:00
bd25f8f370skip CMAKE_QA, one file from fluidsynth (3rd party), unused deps : add optional support for pipewire add optional support for websockets (qtwebsockets) add utfcpp (unbundled) xml is now handled by pugixml (unbundled) instead of tinyxml libsndfile is no longer required add qtbase:6[X] because upstream forces X11 (see PR 28461). wayland still could be forced with MU_QT_QPA_PLATFORM=wayland cmake options : disable PCH conditional pipewire conditional websockets skip more tests Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/44140 Closes: https://github.com/gentoo/gentoo/pull/44140 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
unbundle utfcpp
|
|
--- a/src/framework/global/CMakeLists.txt
|
|
+++ b/src/framework/global/CMakeLists.txt
|
|
@@ -25,7 +25,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/async/async.cmake)
|
|
include(${CMAKE_CURRENT_LIST_DIR}/thirdparty/kors_logger/logger.cmake)
|
|
include(${CMAKE_CURRENT_LIST_DIR}/thirdparty/kors_profiler/profiler/profiler.cmake)
|
|
include(${CMAKE_CURRENT_LIST_DIR}/thirdparty/kors_modularity/modularity/modularity.cmake)
|
|
-include(${CMAKE_CURRENT_LIST_DIR}/thirdparty/utfcpp/utfcpp.cmake)
|
|
|
|
find_package(TinyXml REQUIRED)
|
|
set(MODULE_SRC
|
|
@@ -33,7 +32,6 @@ set(MODULE_SRC
|
|
${ASYNC_SRC}
|
|
${KORS_LOGGER_SRC}
|
|
${KORS_PROFILER_SRC}
|
|
- ${UTFCPP_SRC}
|
|
${CMAKE_CURRENT_LIST_DIR}/globaltypes.h
|
|
${CMAKE_CURRENT_LIST_DIR}/iapplication.h
|
|
${CMAKE_CURRENT_LIST_DIR}/iinteractive.h
|
|
@@ -268,6 +266,10 @@ list(APPEND MODULE_LINK ${Z_LIB})
|
|
list(APPEND MODULE_LINK ${TINYXML_MODULE_LINK})
|
|
set(MODULE_DEF ${TINYXML_MODULE_DEF})
|
|
|
|
+find_package(utf8cpp REQUIRED CONFIG)
|
|
+get_target_property(UTFCPP_INC utf8::cpp INTERFACE_INCLUDE_DIRECTORIES)
|
|
+list(APPEND MODULE_INCLUDE_PRIVATE ${UTFCPP_INC})
|
|
+
|
|
if (QT_SUPPORT)
|
|
# These are needed by so many modules, that we make them public here,
|
|
# so that other modules get them transitively.
|
|
--- a/src/framework/global/serialization/xmlstreamwriter.cpp
|
|
+++ b/src/framework/global/serialization/xmlstreamwriter.cpp
|
|
@@ -23,7 +23,7 @@
|
|
|
|
#include <list>
|
|
|
|
-#include <global/thirdparty/utfcpp/utf8.h>
|
|
+#include <utf8.h>
|
|
|
|
#include "global/containers.h"
|
|
#include "textstream.h"
|
|
--- a/src/framework/global/types/string.cpp
|
|
+++ b/src/framework/global/types/string.cpp
|
|
@@ -32,7 +32,7 @@
|
|
#include <sstream>
|
|
#include <utility>
|
|
|
|
-#include "global/thirdparty/utfcpp/utf8.h"
|
|
+#include <utf8.h>
|
|
|
|
#include "bytearray.h"
|
|
|