diff --git a/dev-qt/qtwebkit/patches/qtwebkit-5.212.0~alpha2.patchset b/dev-qt/qtwebkit/patches/qtwebkit-5.212.0~alpha2.patchset index e22485957..1d4f6a98e 100644 --- a/dev-qt/qtwebkit/patches/qtwebkit-5.212.0~alpha2.patchset +++ b/dev-qt/qtwebkit/patches/qtwebkit-5.212.0~alpha2.patchset @@ -1,4 +1,4 @@ -From 10f4b1a5be0b7782968729745f4ccd57615fcf9e Mon Sep 17 00:00:00 2001 +From 1759ee77655dc4ea51a0a503da2faaf04e12b912 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 16 Jun 2017 21:38:08 +1000 Subject: Fix build @@ -874,10 +874,10 @@ index 1930027..9c827a3 100644 set(USE_GSTREAMER_DEFAULT OFF) set(USE_QT_MULTIMEDIA_DEFAULT ON) -- -2.14.2 +2.16.2 -From 2cbbfc2033c112f39f3e63b58bc68323a9edb92a Mon Sep 17 00:00:00 2001 +From 325149e72c50af26fbec29a93762040d32183882 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sat, 17 Jun 2017 12:22:33 +1000 Subject: Add libnetwork @@ -901,10 +901,10 @@ index e5d08ed..deb9f68 100644 find_library(LIBRT_LIBRARIES NAMES rt) mark_as_advanced(LIBRT_LIBRARIES) -- -2.14.2 +2.16.2 -From d18bada409cfe1f80738e03c4692fe73efd5bf5b Mon Sep 17 00:00:00 2001 +From c7f2d0969a331bdacd713135fe82c6e0150072a5 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sat, 17 Jun 2017 12:23:20 +1000 Subject: Add Haiku detection to useragent string @@ -924,10 +924,10 @@ index 4b88762..fa564f9 100644 "GNU Hurd" #elif OS(LINUX) -- -2.14.2 +2.16.2 -From 5fed395ae0d28745f456b52c932b407e976542b9 Mon Sep 17 00:00:00 2001 +From 1894964d742e0ff8f87a4bd34d62a2d200949d0d Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 17 Jul 2017 19:43:24 +1000 Subject: Use gstreamer instead qtmulimadia @@ -947,10 +947,10 @@ index 9c827a3..1930027 100644 set(USE_GSTREAMER_DEFAULT OFF) set(USE_QT_MULTIMEDIA_DEFAULT ON) -- -2.14.2 +2.16.2 -From 99782e7c1f095d643db8770c5a56fd012a012e3c Mon Sep 17 00:00:00 2001 +From c1e7cfabf2536da7efb84d3a910632dc5bf34f4b Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 17 Jul 2017 19:44:23 +1000 Subject: UserAgent improvements @@ -983,10 +983,10 @@ index fa564f9..71920ff 100644 "GNU Hurd" #elif OS(LINUX) -- -2.14.2 +2.16.2 -From 158e71f95d08011d38e569eb83c75fd9b57eb613 Mon Sep 17 00:00:00 2001 +From b6e0bf0ab4922dd86d9b543e8dc7401db2c1f3db Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 21 Jul 2017 21:58:31 +1000 Subject: Add support for notification icon @@ -1133,10 +1133,10 @@ index f53fe51..9f69a31 100644 }; -- -2.14.2 +2.16.2 -From c6e1cd79073670e08329c323ef41faa66a87a886 Mon Sep 17 00:00:00 2001 +From bafda3f8666ef79384eb889b484b6d506f1a1973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Wed, 13 Nov 2013 18:13:36 +0100 Subject: Trigger layout after resizing the FrameView. @@ -1168,10 +1168,10 @@ index e6145b6..941d8df 100644 -- -2.14.2 +2.16.2 -From a8f8a41fc66dbd1bb4cf8365062f0d0171bfbf59 Mon Sep 17 00:00:00 2001 +From 8474c1f3cec7165ad860feae5d95bc2a61e755b5 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 12 Oct 2017 20:15:15 +0300 Subject: Fix for 451c5a10: run adjustViewSize() after relayout @@ -1202,5 +1202,28 @@ index 941d8df..df28e9f 100644 -- -2.14.2 +2.16.2 + + +From 22eaa8f9831e8bc42f9d11f92597ce7fee4bfb4c Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sat, 21 Apr 2018 22:27:07 +1000 +Subject: Update Safari version for UserAgent string + + +diff --git a/Source/WebCore/platform/qt/UserAgentQt.cpp b/Source/WebCore/platform/qt/UserAgentQt.cpp +index 71920ff..89a5035 100644 +--- a/Source/WebCore/platform/qt/UserAgentQt.cpp ++++ b/Source/WebCore/platform/qt/UserAgentQt.cpp +@@ -58,7 +58,7 @@ String UserAgentQt::standardUserAgent(const String &applicationNameForUserAgent, + + if (ua.isNull()) { + +- ua = QStringLiteral("Mozilla/5.0 (%1%2%3) AppleWebKit/%4 (KHTML, like Gecko) %99 Version/9.0 Safari/%5"); ++ ua = QStringLiteral("Mozilla/5.0 (%1%2%3) AppleWebKit/%4 (KHTML, like Gecko) %99 Version/10.0 Safari/%5"); + + // Platform. + ua = ua.arg( +-- +2.16.2 diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0~alpha2.recipe b/dev-qt/qtwebkit/qtwebkit-5.212.0~alpha2.recipe index dc28ac166..c031a0160 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0~alpha2.recipe +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0~alpha2.recipe @@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/annulen/webkit" COPYRIGHT="2015-2017 The Qt Company Ltd." LICENSE="GNU LGPL v2.1 GNU LGPL v3" -REVISION="8" +REVISION="9" SOURCE_URI="https://github.com/annulen/webkit/releases/download/qtwebkit-${portVersion/\~/-}/qtwebkit-${portVersion/\~/-}.tar.xz" CHECKSUM_SHA256="f8f901de567e11fc5659402b6b827eac75505ff9c5072d8e919aa306003f8f8a" SOURCE_DIR="qtwebkit-${portVersion/\~/-}" @@ -38,9 +38,7 @@ REQUIRES=" lib:libgstallocators_1.0$secondaryArchSuffix lib:libgstapp_1.0$secondaryArchSuffix lib:libgstaudio_1.0$secondaryArchSuffix - lib:libgstbadallocators_1.0$secondaryArchSuffix lib:libgstbadaudio_1.0$secondaryArchSuffix - lib:libgstbadbase_1.0$secondaryArchSuffix lib:libgstbadvideo_1.0$secondaryArchSuffix lib:libgstbase_1.0$secondaryArchSuffix lib:libgstbasecamerabinsrc_1.0$secondaryArchSuffix @@ -66,6 +64,7 @@ REQUIRES=" lib:libicui18n$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix + lib:liborc_0.4$secondaryArchSuffix lib:libpng16$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix @@ -103,6 +102,7 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + devel:libgcc$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix devel:libegl$secondaryArchSuffix devel:libfontconfig$secondaryArchSuffix @@ -113,7 +113,6 @@ BUILD_REQUIRES=" devel:libgstapp_1.0$secondaryArchSuffix devel:libgstaudio_1.0$secondaryArchSuffix devel:libgstbadaudio_1.0$secondaryArchSuffix - devel:libgstbadbase_1.0$secondaryArchSuffix devel:libgstbadvideo_1.0$secondaryArchSuffix devel:libgstreamer_1.0$secondaryArchSuffix devel:libgstvideo_1.0$secondaryArchSuffix @@ -121,6 +120,7 @@ BUILD_REQUIRES=" devel:libicuuc$secondaryArchSuffix devel:libintl$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix + devel:liborc_0.4$secondaryArchSuffix devel:libpcre2_16$secondaryArchSuffix devel:libpng$secondaryArchSuffix devel:libQt5Gui$secondaryArchSuffix @@ -135,6 +135,7 @@ BUILD_REQUIRES=" devel:libQt5WebChannel$secondaryArchSuffix devel:libQt5PrintSupport$secondaryArchSuffix devel:libQt5MultimediaWidgets$secondaryArchSuffix + devel:libruby$secondaryArchSuffix devel:libsqlite3$secondaryArchSuffix devel:libssl$secondaryArchSuffix devel:libwebp$secondaryArchSuffix @@ -148,6 +149,7 @@ BUILD_PREREQUIRES=" cmd:cmake cmd:find cmd:flex + cmd:gcc$secondaryArchSuffix cmd:g++$secondaryArchSuffix cmd:gperf cmd:ld$secondaryArchSuffix @@ -155,13 +157,14 @@ BUILD_PREREQUIRES=" cmd:perl cmd:pkg_config$secondaryArchSuffix cmd:python - cmd:ruby + cmd:ruby$secondaryArchSuffix cmd:sed " BUILD() { mkdir -p build && cd build + cmake .. $cmakeDirArgs \ -DCMAKE_INSTALL_PREFIX:PATH=$prefix \ -DCMAKE_INSTALL_INCLUDEDIR=$includeDir \ @@ -172,15 +175,17 @@ BUILD() -DCMAKE_INSTALL_DATAROOTDIR:PATH=$dataDir/Qt5 \ -DCMAKE_BUILD_TYPE=RELEASE \ -DPORT=Qt \ - -DUSE_SYSTEM_MALLOC=ON \ - -DENABLE_SAMPLING_PROFILER=OFF \ + -DENABLE_ALLINONE_BUILD=OFF \ + -DENABLE_API_TESTS=OFF \ -DENABLE_FTPDIR=ON \ + -DENABLE_MEDIA_SOURCE=OFF \ + -DENABLE_SAMPLING_PROFILER=OFF \ -DENABLE_THREADED_COMPOSITOR=ON \ -DENABLE_TOOLS=OFF \ - -DENABLE_MEDIA_SOURCE=OFF \ - -DUSE_QT_MULTIMEDIA=OFF \ -DUSE_GSTREAMER=ON \ - -DUSE_LIBHYPHEN=ON + -DUSE_LIBHYPHEN=ON \ + -DUSE_QT_MULTIMEDIA=OFF \ + -DUSE_SYSTEM_MALLOC=ON make $jobArgs }