More build hacks

qtwebkit · Sep 24, 2023 · c72ba3d · c72ba3d
1 parent 7910477
commit c72ba3d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake
@@ -207,7 +207,7 @@ WEBKIT_OPTION_BEGIN()
 if (APPLE)
     set(MACOS_COMPATIBILITY_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}" CACHE STRING "Compatibility version that macOS dylibs should have")
 
-    option(MACOS_FORCE_SYSTEM_XML_LIBRARIES "Use system installation of libxml2 and libxslt on macOS" ON)
+    option(MACOS_FORCE_SYSTEM_XML_LIBRARIES "Use system installation of libxml2 and libxslt on macOS" OFF)
     option(MACOS_USE_SYSTEM_ICU "Use system installation of ICU on macOS" ON)
     option(USE_UNIX_DOMAIN_SOCKETS "Use Unix domain sockets instead of native IPC code on macOS" OFF)
     option(USE_APPSTORE_COMPLIANT_CODE "Avoid using private macOS APIs which are not allowed on App Store (experimental)" OFF)
@@ -474,6 +474,11 @@ endif ()
     endif ()
 #endif ()
 
+# !!! REMOVE THIS !!!
+if (APPLE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem /Users/runner/.conan/data/harfbuzz/8.1.1/_/_/package/42e8f350c98f458f8ee3938ac668a6a72c571a6b/include")
+endif ()
+
 if (UNIX AND NOT APPLE AND CMAKE_OBJCOPY AND NOT SKIP_DWZ)
     find_package(Dwz 0.13)
     if (DWZ_FOUND)

diff --git a/Tools/qt/conanfile.py b/Tools/qt/conanfile.py
@@ -48,9 +48,10 @@ class QtWebKitConan(ConanFile):
         #"icu:data_packaging": "library",
 
         "libxml2:shared": True,
-        "libxml2:iconv": False,
-        "libxml2:icu": True,
-        "libxml2:zlib": False,
+# FIXME
+#        "libxml2:iconv": False,
+#        "libxml2:icu": True,
+#        "libxml2:zlib": False,
 
         "libxslt:shared": True,