Merge 16eeba5 into e08a468

opencor · Mar 30, 2020 · 74130fd · 74130fd
2 parents e08a468 + 16eeba5
commit 74130fd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 56 deletions.
diff --git a/src/3rdparty/QtWebKit/CMakeLists.txt b/src/3rdparty/QtWebKit/CMakeLists.txt
@@ -13,14 +13,14 @@ set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.${MINOR_LIBRARY_VERSION}.0)
 
 # Git tags for our libraries
 
-set(GIT_TAG v5.212.0-alpha3-opencor)
+set(GIT_TAG v5.212.0-alpha4-opencor)
 set(GIT_TAG_LIBJPEG 1.5.90)
 set(GIT_TAG_LIBPNG v1.6.34)
 set(GIT_TAG_ZLIB v1.2.11)
 
 # Release tag
 
-set(RELEASE_TAG v5.212.0-alpha3-opencor)
+set(RELEASE_TAG v5.212.0-alpha4-opencor)
 
 # Specify where our local package will be installed
 
@@ -98,43 +98,43 @@ if(USE_PREBUILT_QTWEBKIT_PACKAGE)
     if(WIN32)
         if(RELEASE_MODE)
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 4f2b929bc80a3d23ecb2e1e558cd358542242444
+                                  ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 85a16500c778380f6a1a7168f8df60130b7cefd7
                                   RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES 49094bb6f4060ee51ef3add6e46fbe4b138dc252
-                                              a61f75c32f9ec0802d79b437bca0a062e0e2bc07
+                                  SHA1_VALUES 8a075f1f13de63fd9686d7778720c86efc7ef993
+                                              061145d8cb310f95cf59e16c38e069dc867f61d6
                                               874175a6db51afe0902882f0b00f7855ab498c79
                                               47cb72ba7c899ca218be75dd89a0c0f900b968b8
                                               a386658900a742f31f1f08d55c0915d577af2d7e
-                                              a7bde32bfba64fb037927b6e0355516cb4508ccc
+                                              d589f42e6b4934459c88c61317d267d63982be05
                                               172fba699a361cc93597c4968cacd2cf44985095)
         else()
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 1ccbb8d582ee72789dcbc4e39c6988380baf1022
+                                  ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} c9a75283ba7e073a505ed270ac6cf350381c12ec
                                   RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES 8ddccd77d7dda04197233e8e3ec98e1ae0e884f8
-                                              2c07c561b44dbb7db1c046dcc849db3558ec1f22
+                                  SHA1_VALUES 890790088c9d896da150dc260ca5bab770f5741d
+                                              475861625c5b0d587f28588e5ef9d7bc6a074653
                                               43497bf1a89173badccc0b945b43473cf5d5f12a
                                               2ef114df767c6fe4184ef458545ff8d71f4f4917
                                               5eeaf7c066cca05413a35bba5efc71526c46f478
-                                              c4b431401965c2fb2f139ffd462fe0a52213a615
+                                              342bc082f97553d663e08a48cf88e5feac8938ae
                                               7ddf6870922fc2eb7db94d3f037a5c9ba8dd450d)
         endif()
     elseif(APPLE)
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} e4c32b340516792d4d16807b1cac28bd5181abbe
+                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 11e9ac7fe969577156fa34ec64c0ce9a7f374e4f
                               RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 818ce4e16892876260559494c6ae56f16935fd38
-                                          06e5a1a883d52481d636a7fa790c745738bf20aa)
+                              SHA1_VALUES d4deee0f4920f234d62a275616c9f595e5a26b54
+                                          fbd53415cd7566a24426ff95d7a9ffc67f47eae5)
     else()
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 2a8472a8894842cf515cac601705e4e8a4e80970
+                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 2a86672ba37d55a425d610272a8feb9a42e4b0df
                               RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 360c9d2b13f651e3544fe994618178421fc04b8e
-                                          b7ec82ddcbb42f13783ef1c0ce3c67e97a1f980f)
+                              SHA1_VALUES 3b53c0a9c1bfed19ff5b774df1e3dc664d7eeb0b
+                                          05f8e8e332798e7a11b0d46de23f279f0e532126)
     endif()
 else()
     # Build JPEG, PNG and ZLIB as external projects, if on Linux or macOS
@@ -265,44 +265,7 @@ else()
             ${CMAKE_EXTRA_ARGS}
             -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
             -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-            -DENABLE_ACCELERATED_2D_CANVAS=ON
-            -DENABLE_ALLINONE_BUILD=ON
-            -DENABLE_API_TESTS=ON
-            -DENABLE_CSS_GRID_LAYOUT=ON
-            -DENABLE_DATABASE_PROCESS=ON
-            -DENABLE_DATALIST_ELEMENT=ON
-            -DENABLE_DEVICE_ORIENTATION=ON
-            -DENABLE_DRAG_SUPPORT=ON
-            -DENABLE_FULLSCREEN_API=ON
-            -DENABLE_GAMEPAD_DEPRECATED=OFF
-            -DENABLE_GEOLOCATION=ON
-            -DENABLE_ICONDATABASE=ON
-            -DENABLE_INDEXED_DATABASE=ON
-            -DENABLE_INSPECTOR_UI=ON
-            -DENABLE_JIT=ON
-            -DENABLE_LEGACY_WEB_AUDIO=OFF
-            -DENABLE_LINK_PREFETCH=ON
-            -DENABLE_MEDIA_SOURCE=OFF
-            -DENABLE_NETSCAPE_PLUGIN_API=OFF
-            -DENABLE_OPENGL=ON
-            -DENABLE_PRINT_SUPPORT=ON
-            -DENABLE_QT_GESTURE_EVENTS=ON
-            -DENABLE_QT_WEBCHANNEL=ON
-            -DENABLE_SAMPLING_PROFILER=ON
-            -DENABLE_SPELLCHECK=ON
-            -DENABLE_TOUCH_EVENTS=ON
-            -DENABLE_VIDEO=ON
-            -DENABLE_WEBKIT2=ON
-            -DENABLE_WEB_AUDIO=OFF
-            -DENABLE_X11_TARGET=OFF
-            -DENABLE_XSLT=ON
             -DPORT=Qt
-            -DUSE_GSTREAMER=OFF
-            -DUSE_LIBHYPHEN=OFF
-            -DUSE_MEDIA_FOUNDATION=OFF
-            -DUSE_QT_MULTIMEDIA=ON
-            -DUSE_SYSTEM_MALLOC=OFF
-            -DUSE_WOFF2=ON
         BUILD_BYPRODUCTS
             <INSTALL_DIR>/${IMPORT_LIBRARIES_DIR}/${QTWEBKIT_IMPORT_LIBRARY}
             <INSTALL_DIR>/${IMPORT_LIBRARIES_DIR}/${QTWEBKITWIDGETS_IMPORT_LIBRARY}

diff --git a/src/3rdparty/QtWebKit/README.rst b/src/3rdparty/QtWebKit/README.rst
@@ -1,9 +1,9 @@
-In order to build `QtWebKit <https://wiki.qt.io/QtWebKit>`__, we need to:
+In order to build `QtWebKit <https://github.com/qt/qtwebkit>`__, we need to:
 
 - **Windows:** install:
 
   - `Perl >= 5.20 <https://activestate.com/activeperl>`__;
-  - `Python 2.7 <https://python.org/>`__;
+  - `Python 3.x <https://python.org/>`__;
   - `Ruby >= 1.9 <https://rubyinstaller.org/>`__;
   - `Bison and Flex <https://sourceforge.net/projects/winflexbison/>`__;
   - `gperf <http://gnuwin32.sourceforge.net/packages/gperf.htm>`__; and
@@ -15,7 +15,7 @@ In order to build `QtWebKit <https://wiki.qt.io/QtWebKit>`__, we need to:
 
   ::
 
-    sudo apt install bison gperf libsqlite3-dev libxml2-dev libxslt1-dev nasm ruby zlib1g-dev
+    sudo apt install bison gperf libgstreamer-plugins-base1.0-dev libhyphen-dev libsqlite3-dev libxcomposite-dev libxml2-dev libxrender-dev libxslt1-dev nasm ruby zlib1g-dev
 
 - **macOS:** run the following command from the terminal (if needed, install `Homebrew <https://brew.sh/>`__):