Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (667f7488ea0736ecb63162702bb759f06d5700fa)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (667f7488ea0736ecb63162702bb759f06d5700fa)
  • Date: Thu, 5 Sep 2019 16:54:03 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

qt5/qtwebengine/HISTORY | 2 ++
qt5/qtwebengine/PRE_BUILD | 4 +++-
qt5/qtwebengine/patches/webrtc.patch | 15 +++++++++++++++
3 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 667f7488ea0736ecb63162702bb759f06d5700fa
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qtwebengine - add missing patch

diff --git a/qt5/qtwebengine/HISTORY b/qt5/qtwebengine/HISTORY
index 35c5e45..00891e9 100644
--- a/qt5/qtwebengine/HISTORY
+++ b/qt5/qtwebengine/HISTORY
@@ -1,6 +1,8 @@
2019-09-05 Treeve Jelbert <treeve AT 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 AT sourcemage.org>
* DETAILS: SECURITY_PATCH++
diff --git a/qt5/qtwebengine/PRE_BUILD b/qt5/qtwebengine/PRE_BUILD
index f420492..c86ecbc 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 0000000..46b6b5f
--- /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__



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (667f7488ea0736ecb63162702bb759f06d5700fa), Treeve Jelbert, 09/05/2019

Archive powered by MHonArc 2.6.24.

Top of Page