pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

qt5-qtwebkit: Fix build with CMake 3.10



Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Sun Dec 31 07:44:20 2017 +1300
Changeset:	e963dccb0dc965a691bf22628aa450b3f58d2e12

Modified Files:
	qt5-qtwebkit/Makefile
	qt5-qtwebkit/distinfo
Added Files:
	qt5-qtwebkit/patches/patch-Source_WebKit_PlatformQt.cmake

Log Message:
qt5-qtwebkit: Fix build with CMake 3.10

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e963dccb0dc965a691bf22628aa450b3f58d2e12

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qt5-qtwebkit/Makefile                              |  1 +
 qt5-qtwebkit/distinfo                              |  1 +
 .../patches/patch-Source_WebKit_PlatformQt.cmake   | 22 ++++++++++++++++++++++
 3 files changed, 24 insertions(+)

diffs:
diff --git a/qt5-qtwebkit/Makefile b/qt5-qtwebkit/Makefile
index fbef3b348b..b1a73b6587 100644
--- a/qt5-qtwebkit/Makefile
+++ b/qt5-qtwebkit/Makefile
@@ -31,6 +31,7 @@ CMAKE_ARGS+=		-DENABLE_TOOLS=OFF
 CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=		-DSHARED_CORE:BOOL=ON
 CMAKE_ARGS+=		-DUSE_SYSTEM_MALLOC:BOOL=ON
+CMAKE_ARGS+=		-DUSE_LD_GOLD:BOOL=OFF
 ## requires gcc >= 4.9
 #CMAKE_ARGS+=		-DENABLE_FTL_JIT:BOOL=OFF
 #CMAKE_ARGS+=		-DENABLE_INDEXED_DATABASE:BOOL=OFF
diff --git a/qt5-qtwebkit/distinfo b/qt5-qtwebkit/distinfo
index 44a042e29e..bce40496cb 100644
--- a/qt5-qtwebkit/distinfo
+++ b/qt5-qtwebkit/distinfo
@@ -21,4 +21,5 @@ SHA1 (patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp)
 SHA1 (patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurface.h) = d1d986afd5525143fc786a959240a72167f03352
 SHA1 (patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurfaceToken.h) = 838acb2d7ecf41e5f6989d98459d103f4268cdcf
 SHA1 (patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp) = d18013d0e07d7ad7e9d84cb6ef2d418d9bba4c7e
+SHA1 (patch-Source_WebKit_PlatformQt.cmake) = 5dfde3b2e3092ffcd11fc6746bed1767b2c3b692
 SHA1 (patch-Source_cmake_OptionsQt.cmake) = 2527e56468709bd9fd0a98bf754ac9c692cac4dc
diff --git a/qt5-qtwebkit/patches/patch-Source_WebKit_PlatformQt.cmake b/qt5-qtwebkit/patches/patch-Source_WebKit_PlatformQt.cmake
new file mode 100644
index 0000000000..48be546876
--- /dev/null
+++ b/qt5-qtwebkit/patches/patch-Source_WebKit_PlatformQt.cmake
@@ -0,0 +1,22 @@
+$NetBSD$
+
+Fix build with CMake 3.10
+
+--- Source/WebKit/PlatformQt.cmake.orig	2017-06-09 14:11:36.000000000 +0000
++++ Source/WebKit/PlatformQt.cmake
+@@ -786,6 +786,7 @@ if (COMPILER_IS_GCC_OR_CLANG)
+     set_source_files_properties(
+         qt/Api/qwebdatabase.cpp
+         qt/Api/qwebelement.cpp
++        qt/Api/qwebfullscreenrequest.cpp
+         qt/Api/qwebhistory.cpp
+         qt/Api/qwebhistoryinterface.cpp
+         qt/Api/qwebpluginfactory.cpp
+@@ -795,7 +796,6 @@ if (COMPILER_IS_GCC_OR_CLANG)
+ 
+         qt/WidgetApi/qgraphicswebview.cpp
+         qt/WidgetApi/qwebframe.cpp
+-        qt/WidgetApi/qwebfullscreenrequest.cpp
+         qt/WidgetApi/qwebinspector.cpp
+         qt/WidgetApi/qwebpage.cpp
+         qt/WidgetApi/qwebview.cpp


Home | Main Index | Thread Index | Old Index