Skip to Content.
Sympa Menu

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

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 (cab9ab48912123f12abab00dbb0f7cd75820066c)
  • Date: Fri, 25 May 2018 14:36:03 +0000

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

qt5/qtbase/DEPENDS | 2
qt5/qtbase/HISTORY | 3 +
qt5/qtwebengine/HISTORY | 5 ++
qt5/qtwebengine/PRE_BUILD | 6 ++
qt5/qtwebengine/patches.cr/gcc-8.1.patch | 66
++++++++++++++++++++++++++++++
qt5/qtwebengine/patches/no-location.patch | 36 ++++++++++++++++
6 files changed, 116 insertions(+), 2 deletions(-)

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

qtwebengine - build fixes

commit 6f53ef53674008a0c32f41c84f4bef265d61db6b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qtbase - rename vulkan dependency

diff --git a/qt5/qtbase/DEPENDS b/qt5/qtbase/DEPENDS
index f9f3d12..5bea9ae 100755
--- a/qt5/qtbase/DEPENDS
+++ b/qt5/qtbase/DEPENDS
@@ -111,7 +111,7 @@ optional_depends libinput '-libinput' '-no-libinput'
'LibInput support' &&
optional_depends libproxy '-libproxy' '-no-libproxy' 'Network Proxy
support' &&
optional_depends mtdev '-mtdev' '-no-mtdev' 'Enable multitouch support'
&&
optional_depends double-conversion '-system-doubleconversion' ''
'binary<->decimal conversion'
-optional_depends vulkan-sdk '' '' 'Vulkan support' &&
+optional_depends vulkan-loader '' '' 'Vulkan support' &&
#qt5.11
optional_depends wayland '' '' 'Wayland support'
#optional_depends v4l-utils '' '' 'V4L support'
diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index ac60307..1c4cece 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,6 @@
+2018-05-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: rename vulkan dependency
+
2018-05-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.11.0
* patches/*: update
diff --git a/qt5/qtwebengine/HISTORY b/qt5/qtwebengine/HISTORY
index cd9e7b2..23fcab6 100644
--- a/qt5/qtwebengine/HISTORY
+++ b/qt5/qtwebengine/HISTORY
@@ -1,3 +1,8 @@
+2018-05-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: apply patch
+ * gcc-8.1.fix: added, upstream patch to build with gcc-8.1.0
+ * no-location.patch: added, fix build without qtlocation
+
2018-05-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.11.0
* DEPNDS: delete gyp
diff --git a/qt5/qtwebengine/PRE_BUILD b/qt5/qtwebengine/PRE_BUILD
index d0333fb..93d6107e 100755
--- a/qt5/qtwebengine/PRE_BUILD
+++ b/qt5/qtwebengine/PRE_BUILD
@@ -1,5 +1,9 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY/src/3rdparty/chromium/ui/gfx/codec &&
+cd $SOURCE_DIRECTORY/src/3rdparty &&
+# upstream patch for gcc-8.1.0
+apply_patch_dir patches.cr &&
cd $SOURCE_DIRECTORY &&
+# no qtlocation patch
+apply_patch_dir patches &&
#re2 needs pthread
sed -i '/LIBS/s/re2/re2 -lpthread/' config.tests/re2/re2.pro
diff --git a/qt5/qtwebengine/patches.cr/gcc-8.1.patch
b/qt5/qtwebengine/patches.cr/gcc-8.1.patch
new file mode 100644
index 0000000..de74a7a
--- /dev/null
+++ b/qt5/qtwebengine/patches.cr/gcc-8.1.patch
@@ -0,0 +1,66 @@
+diff --git
a/chromium/mojo/public/cpp/bindings/associated_interface_ptr_info.h
b/chromium/mojo/public/cpp/bindings/associated_interface_ptr_info.h
+index 1f79662bd7..184ba6a9e8 100644
+--- a/chromium/mojo/public/cpp/bindings/associated_interface_ptr_info.h
++++ b/chromium/mojo/public/cpp/bindings/associated_interface_ptr_info.h
+@@ -45,7 +45,7 @@ class AssociatedInterfacePtrInfo {
+
+ bool is_valid() const { return handle_.is_valid(); }
+
+- explicit operator bool() const { return handle_; }
++ explicit operator bool() const { return !!handle_; }
+
+ ScopedInterfaceEndpointHandle PassHandle() {
+ return std::move(handle_);
+diff --git
a/chromium/mojo/public/cpp/bindings/associated_interface_request.h
b/chromium/mojo/public/cpp/bindings/associated_interface_request.h
+index 12d2f3ce1d..fcdc2b9321 100644
+--- a/chromium/mojo/public/cpp/bindings/associated_interface_request.h
++++ b/chromium/mojo/public/cpp/bindings/associated_interface_request.h
+@@ -50,7 +50,7 @@ class AssociatedInterfaceRequest {
+ // handle.
+ bool is_pending() const { return handle_.is_valid(); }
+
+- explicit operator bool() const { return handle_; }
++ explicit operator bool() const { return !!handle_; }
+
+ ScopedInterfaceEndpointHandle PassHandle() { return std::move(handle_); }
+
+diff --git a/chromium/mojo/public/cpp/bindings/interface_request.h
b/chromium/mojo/public/cpp/bindings/interface_request.h
+index 1007cb0b8c..da1f3244a3 100644
+--- a/chromium/mojo/public/cpp/bindings/interface_request.h
++++ b/chromium/mojo/public/cpp/bindings/interface_request.h
+@@ -54,7 +54,7 @@ class InterfaceRequest {
+ // Indicates whether the request currently contains a valid message pipe.
+ bool is_pending() const { return handle_.is_valid(); }
+
+- explicit operator bool() const { return handle_; }
++ explicit operator bool() const { return !!handle_; }
+
+ // Removes the message pipe from the request and returns it.
+ ScopedMessagePipeHandle PassMessagePipe() { return std::move(handle_); }
+diff --git
a/chromium/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h
b/chromium/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h
+index 5d00e5019e..ef8a927ba6 100644
+--- a/chromium/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h
++++ b/chromium/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h
+@@ -45,6 +45,8 @@ class MOJO_CPP_BINDINGS_EXPORT
ScopedInterfaceEndpointHandle {
+
+ bool is_valid() const;
+
++ explicit operator bool() const { return is_valid(); }
++
+ // Returns true if the interface hasn't associated with a message pipe.
+ bool pending_association() const;
+
+diff --git a/chromium/mojo/public/cpp/system/handle.h
b/chromium/mojo/public/cpp/system/handle.h
+index 7c886e8825..c9f9e961db 100644
+--- a/chromium/mojo/public/cpp/system/handle.h
++++ b/chromium/mojo/public/cpp/system/handle.h
+@@ -121,7 +121,7 @@ class ScopedHandleBase {
+
+ bool is_valid() const { return handle_.is_valid(); }
+
+- explicit operator bool() const { return handle_; }
++ explicit operator bool() const { return !!handle_; }
+
+ bool operator==(const ScopedHandleBase& other) const {
+ return handle_.value() == other.get().value();
+
diff --git a/qt5/qtwebengine/patches/no-location.patch
b/qt5/qtwebengine/patches/no-location.patch
new file mode 100644
index 0000000..771bbc5
--- /dev/null
+++ b/qt5/qtwebengine/patches/no-location.patch
@@ -0,0 +1,36 @@
+diff --git a/src/core/content_browser_client_qt.cpp
b/src/core/content_browser_client_qt.cpp
+index 30ec43ca..1949823f 100644
+--- a/src/core/content_browser_client_qt.cpp
++++ b/src/core/content_browser_client_qt.cpp
+@@ -68,6 +68,7 @@
+ #include "content/public/common/main_function_params.h"
+ #include "content/public/common/service_names.mojom.h"
+ #include "content/public/common/url_constants.h"
++#include "device/geolocation/public/cpp/location_provider.h"
+ #include "mojo/public/cpp/bindings/binding.h"
+ #include "mojo/public/cpp/bindings/binding_set.h"
+ #include "printing/features/features.h"
+@@ -123,6 +124,10 @@
+ #include "renderer_host/pepper/pepper_host_factory_qt.h"
+ #endif
+
++#if defined(QT_USE_POSITIONING)
++#include "location_provider_qt.h"
++#endif
++
+ #include <QGuiApplication>
+ #include <QLocale>
+ #ifndef QT_NO_OPENGL
+@@ -737,7 +742,11 @@ bool ContentBrowserClientQt::CanCreateWindow(
+
+ std::unique_ptr<device::LocationProvider>
ContentBrowserClientQt::OverrideSystemLocationProvider()
+ {
++#if defined(QT_USE_POSITIONING)
+ return base::WrapUnique(new LocationProviderQt());
++#else
++ return nullptr;
++#endif
+ }
+
+ scoped_refptr<net::URLRequestContextGetter>
GetSystemRequestContextOnUIThread()
+



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (cab9ab48912123f12abab00dbb0f7cd75820066c), Treeve Jelbert, 05/25/2018

Archive powered by MHonArc 2.6.24.

Top of Page