diff -ruNp qtwebkit-opensource-src-5.7.1.orig/Source/JavaScriptCore/API/JSBase.h qtwebkit-opensource-src-5.7.1/Source/JavaScriptCore/API/JSBase.h
--- qtwebkit-opensource-src-5.7.1.orig/Source/JavaScriptCore/API/JSBase.h	2016-10-14 15:28:46.000000000 -0400
+++ qtwebkit-opensource-src-5.7.1/Source/JavaScriptCore/API/JSBase.h	2018-01-09 23:38:12.000000000 -0500
@@ -141,7 +141,7 @@ JS_EXPORT void JSGarbageCollect(JSContex
 
 /* Enable the Objective-C API for platforms with a modern runtime. */
 #if !defined(JSC_OBJC_API_ENABLED)
-#define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 && !defined(__i386__))
+#define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1090 && !defined(__i386__))
 #endif
 
 #endif /* JSBase_h */
diff -ruNp qtwebkit-opensource-src-5.7.1.orig/Source/WTF/WTF.pri qtwebkit-opensource-src-5.7.1/Source/WTF/WTF.pri
--- qtwebkit-opensource-src-5.7.1.orig/Source/WTF/WTF.pri	2016-10-14 15:28:46.000000000 -0400
+++ qtwebkit-opensource-src-5.7.1/Source/WTF/WTF.pri	2018-01-10 00:01:07.000000000 -0500
@@ -8,27 +8,9 @@
 # All external modules should include WTF headers by prefixing with "wtf" (#include <wtf/some/thing.h>).
 INCLUDEPATH += $$PWD
 
-mac {
-    # Mac OS does ship libicu but not the associated header files.
-    # Therefore WebKit provides adequate header files.
-    INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH
-    LIBS += -licucore
-} else:!use?(wchar_unicode): {
-    win32 {
-        CONFIG(static, static|shared) {
-            CONFIG(debug, debug|release) {
-                LIBS += -lsicuind -lsicuucd -lsicudtd
-            } else {
-                LIBS += -lsicuin -lsicuuc -lsicudt
-            }
-        } else {
-            LIBS += -licuin -licuuc -licudt
-        }
-    }
-    else:!contains(QT_CONFIG,no-pkg-config):packagesExist("icu-i18n"): PKGCONFIG *= icu-i18n
-    else:android: LIBS += -licui18n -licuuc
-    else: LIBS += -licui18n -licuuc -licudata
-}
+# insert fink's libicu flags
+INCLUDEPATH = $$INCLUDEPATH @FINK_PREFIX@/include
+LIBS += @FINK_ICU_LIBS@
 
 use?(GLIB) {
     PKGCONFIG *= glib-2.0 gio-2.0
diff -ruNp qtwebkit-opensource-src-5.7.1.orig/Source/WebCore/Configurations/WebCore.xcconfig qtwebkit-opensource-src-5.7.1/Source/WebCore/Configurations/WebCore.xcconfig
--- qtwebkit-opensource-src-5.7.1.orig/Source/WebCore/Configurations/WebCore.xcconfig	2016-10-14 15:28:46.000000000 -0400
+++ qtwebkit-opensource-src-5.7.1/Source/WebCore/Configurations/WebCore.xcconfig	2018-01-09 23:38:13.000000000 -0500
@@ -46,7 +46,7 @@ FRAMEWORK_SEARCH_PATHS_macosx = $(STAGED
 STAGED_FRAMEWORKS_SEARCH_PATH = $(STAGED_FRAMEWORKS_SEARCH_PATH_$(USE_STAGING_INSTALL_PATH));
 STAGED_FRAMEWORKS_SEARCH_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
 
-HEADER_SEARCH_PATHS = ForwardingHeaders icu /usr/include/libxslt /usr/include/libxml2 "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore" "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
+HEADER_SEARCH_PATHS = ForwardingHeaders icu @FINK_PREFIX@/include/libxslt @FINK_PREFIX@/include/libxml2 "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore" "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
 INFOPLIST_FILE = Info.plist;
 INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
 INSTALL_PATH_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
diff -ruNp qtwebkit-opensource-src-5.7.1.orig/Source/WebCore/Target.pri qtwebkit-opensource-src-5.7.1/Source/WebCore/Target.pri
--- qtwebkit-opensource-src-5.7.1.orig/Source/WebCore/Target.pri	2016-10-14 15:28:46.000000000 -0400
+++ qtwebkit-opensource-src-5.7.1/Source/WebCore/Target.pri	2018-01-09 23:38:13.000000000 -0500
@@ -26,6 +26,10 @@ CONFIG += staticlib
     }
 }
 
+mac {
+    INCLUDEPATH += @FINK_PREFIX@/include
+}
+
 SOURCES += \
     Modules/geolocation/Coordinates.cpp \
     Modules/geolocation/Geolocation.cpp \
diff -ruNp qtwebkit-opensource-src-5.7.1.orig/Source/WebCore/WebCore.pri qtwebkit-opensource-src-5.7.1/Source/WebCore/WebCore.pri
--- qtwebkit-opensource-src-5.7.1.orig/Source/WebCore/WebCore.pri	2016-10-14 15:28:46.000000000 -0400
+++ qtwebkit-opensource-src-5.7.1/Source/WebCore/WebCore.pri	2018-01-09 23:38:13.000000000 -0500
@@ -113,8 +113,10 @@ INCLUDEPATH += $$WEBCORE_GENERATED_SOURC
 enable?(XSLT) {
     use?(LIBXML2) {
         mac {
-            QMAKE_CXXFLAGS += -iwithsysroot /usr/include/libxslt -iwithsysroot /usr/include/libxml2
-            LIBS += -lxml2 -lxslt
+            #QMAKE_CXXFLAGS += -I@FINK_PREFIX@/include/libxslt -I@FINK_PREFIX@/include/libxml2
+            #LIBS += -lxml2 -lxslt
+            PKGCONFIG += libxslt libxml-2.0
+            CONFIG += link_pkgconfig
         } else {
             PKGCONFIG += libxslt libxml-2.0
         }
diff -ruNp qtwebkit-opensource-src-5.7.1.orig/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp qtwebkit-opensource-src-5.7.1/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp
--- qtwebkit-opensource-src-5.7.1.orig/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp	2016-10-14 15:28:46.000000000 -0400
+++ qtwebkit-opensource-src-5.7.1/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp	2018-01-09 23:38:13.000000000 -0500
@@ -423,7 +423,7 @@ void Connection::receiveSourceEventHandl
     OwnPtr<MessageDecoder> decoder = createMessageDecoder(header);
     ASSERT(decoder);
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
     decoder->setImportanceAssertion(ImportanceAssertion::create(header));
 #endif
 
diff -ruNp qtwebkit-opensource-src-5.7.1.orig/Tools/qmake/config.tests/icu/icu.pro qtwebkit-opensource-src-5.7.1/Tools/qmake/config.tests/icu/icu.pro
--- qtwebkit-opensource-src-5.7.1.orig/Tools/qmake/config.tests/icu/icu.pro	2016-10-14 15:28:46.000000000 -0400
+++ qtwebkit-opensource-src-5.7.1/Tools/qmake/config.tests/icu/icu.pro	2018-01-09 23:38:13.000000000 -0500
@@ -14,6 +14,7 @@ win32 {
         LIBS += -licuin -licuuc -licudt
     }
 } else:!contains(QT_CONFIG,no-pkg-config):packagesExist("icu-i18n") {
+    CONFIG += link_pkgconfig
     PKGCONFIG += icu-i18n
 } else {
     LIBS += -licui18n -licuuc -licudata
diff -ruNp qtwebkit-opensource-src-5.7.1.orig/Tools/qmake/config.tests/libwebp/libwebp.pro qtwebkit-opensource-src-5.7.1/Tools/qmake/config.tests/libwebp/libwebp.pro
--- qtwebkit-opensource-src-5.7.1.orig/Tools/qmake/config.tests/libwebp/libwebp.pro	2016-10-14 15:28:46.000000000 -0400
+++ qtwebkit-opensource-src-5.7.1/Tools/qmake/config.tests/libwebp/libwebp.pro	2018-01-09 23:38:13.000000000 -0500
@@ -1,5 +1,8 @@
 SOURCES = libwebp.cpp
 OBJECTS_DIR = obj
-LIBS += -lwebp
+#LIBS += -lwebp
+PKGCONFIG += libwebp
+CONFIG += link_pkgconfig
+
 
 load(qt_build_config)
diff -ruNp qtwebkit-opensource-src-5.7.1.orig/Tools/qmake/config.tests/libxml2/libxml2.pro qtwebkit-opensource-src-5.7.1/Tools/qmake/config.tests/libxml2/libxml2.pro
--- qtwebkit-opensource-src-5.7.1.orig/Tools/qmake/config.tests/libxml2/libxml2.pro	2016-10-14 15:28:46.000000000 -0400
+++ qtwebkit-opensource-src-5.7.1/Tools/qmake/config.tests/libxml2/libxml2.pro	2018-01-09 23:38:13.000000000 -0500
@@ -1,8 +1,10 @@
 CONFIG -= qt
 SOURCES = libxml2.cpp
 mac {
-    QMAKE_CXXFLAGS += -iwithsysroot /usr/include/libxml2
-    LIBS += -lxml2
+    #QMAKE_CXXFLAGS += -I@FINK_PREFIX@/include/libxml2
+    #LIBS += -lxml2
+    PKGCONFIG += libxml-2.0
+    CONFIG += link_pkgconfig
 } else {
     PKGCONFIG += libxml-2.0
     CONFIG += link_pkgconfig
diff -ruNp qtwebkit-opensource-src-5.7.1.orig/Tools/qmake/config.tests/libxslt/libxslt.pro qtwebkit-opensource-src-5.7.1/Tools/qmake/config.tests/libxslt/libxslt.pro
--- qtwebkit-opensource-src-5.7.1.orig/Tools/qmake/config.tests/libxslt/libxslt.pro	2016-10-14 15:28:46.000000000 -0400
+++ qtwebkit-opensource-src-5.7.1/Tools/qmake/config.tests/libxslt/libxslt.pro	2018-01-09 23:38:13.000000000 -0500
@@ -1,8 +1,10 @@
 CONFIG -= qt
 SOURCES = libxslt.cpp
 mac {
-    QMAKE_CXXFLAGS += -iwithsysroot /usr/include/libxslt -iwithsysroot /usr/include/libxml2
-    LIBS += -lxslt
+    #QMAKE_CXXFLAGS += -I@FINK_PREFIX@/include/libxslt -I@FINK_PREFIX@/include/libxml2
+    #LIBS += -lxslt
+    PKGCONFIG += libxslt
+    CONFIG += link_pkgconfig
 } else {
     PKGCONFIG += libxslt
     CONFIG += link_pkgconfig