summaryrefslogtreecommitdiffstats
path: root/qt5
diff options
context:
space:
mode:
authorTreeve Jelbert2019-09-05 18:52:39 +0200
committerTreeve Jelbert2019-09-05 18:53:54 +0200
commit667f7488ea0736ecb63162702bb759f06d5700fa (patch)
treeb37ed0cc0b030dfb6684f3b950ce86749c738b5a /qt5
parent33069e9bc4dea1f19c1e56d4387331f5a09d372c (diff)
qtwebengine - add missing patch
Diffstat (limited to 'qt5')
-rw-r--r--qt5/qtwebengine/HISTORY2
-rwxr-xr-xqt5/qtwebengine/PRE_BUILD4
-rw-r--r--qt5/qtwebengine/patches/webrtc.patch15
3 files changed, 20 insertions, 1 deletions
diff --git a/qt5/qtwebengine/HISTORY b/qt5/qtwebengine/HISTORY
index 35c5e4597a..00891e9629 100644
--- a/qt5/qtwebengine/HISTORY
+++ b/qt5/qtwebengine/HISTORY
@@ -1,6 +1,8 @@
2019-09-05 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 5.13.1
* depends: it actually insists on python2
+ * webrtc.patch: added, apply missing patch
+ * PRE_BUILD: tweak
2019-08-23 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: SECURITY_PATCH++
diff --git a/qt5/qtwebengine/PRE_BUILD b/qt5/qtwebengine/PRE_BUILD
index f420492e14..c86ecbce60 100755
--- a/qt5/qtwebengine/PRE_BUILD
+++ b/qt5/qtwebengine/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
#re2 needs pthread
-sed -i '/LIBS/s/re2/re2 -lpthread/' config.tests/re2/re2.pro
+sed -i '/LIBS/s/re2/re2 -lpthread/' config.tests/re2/re2.pro &&
+# missing upstrem patch
+apply_patch_dir patches
diff --git a/qt5/qtwebengine/patches/webrtc.patch b/qt5/qtwebengine/patches/webrtc.patch
new file mode 100644
index 0000000000..46b6b5f6ca
--- /dev/null
+++ b/qt5/qtwebengine/patches/webrtc.patch
@@ -0,0 +1,15 @@
+diff --git a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
+index 4845a73..c38d7fd 100644 (file)
+--- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
+@@ -51,6 +51,10 @@
+ #include "rtc_base/null_socket_server.h"
+ #include "rtc_base/time_utils.h"
+
++#if defined(WEBRTC_LINUX)
++#include <linux/sockios.h>
++#endif
++
+ #if defined(WEBRTC_WIN)
+ #define LAST_SYSTEM_ERROR (::GetLastError())
+ #elif defined(__native_client__) && __native_client__