From b789e0340bd2bf8e771fd3146348976711e87ae919afb3eb94a674cc393c9292 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 14 Dec 2018 19:52:36 +0000 Subject: [PATCH] Accepting request 656578 from KDE:Qt5 Qt 5.12.0 final OBS-URL: https://build.opensuse.org/request/show/656578 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwebengine?expand=0&rev=41 --- chromium-66.0.3359.170-gcc8-alignof.patch | 11 +- chromium-non-void-return.patch | 443 ++++++++++++++++++ ...le-gpu-when-using-nouveau-boo-1005323.diff | 16 +- harmony-fix.diff | 20 +- libqt5-qtwebengine.changes | 68 +++ libqt5-qtwebengine.spec | 15 +- no-return-in-nonvoid-function.diff | 12 - qtwebengine-everywhere-src-5.11.2.tar.xz | 3 - qtwebengine-everywhere-src-5.12.0.tar.xz | 3 + 9 files changed, 546 insertions(+), 45 deletions(-) create mode 100644 chromium-non-void-return.patch delete mode 100644 no-return-in-nonvoid-function.diff delete mode 100644 qtwebengine-everywhere-src-5.11.2.tar.xz create mode 100644 qtwebengine-everywhere-src-5.12.0.tar.xz diff --git a/chromium-66.0.3359.170-gcc8-alignof.patch b/chromium-66.0.3359.170-gcc8-alignof.patch index 713709c..467b313 100644 --- a/chromium-66.0.3359.170-gcc8-alignof.patch +++ b/chromium-66.0.3359.170-gcc8-alignof.patch @@ -4,11 +4,12 @@ Subject: Fix build for 32-bit platforms Apparently not upstream, can't find this anywhere. So I assume Fedora is the actual source? https://src.fedoraproject.org/cgit/rpms/chromium.git/tree/chromium-66.0.3359.170-gcc8-alignof.patch -diff -up chromium-66.0.3359.170/src/3rdparty/chromium/mojo/public/c/system/macros.h.gcc8-alignof chromium-66.0.3359.170/src/3rdparty/chromium/mojo/public/c/system/macros.h ---- chromium-66.0.3359.170/src/3rdparty/chromium/mojo/public/c/system/macros.h.gcc8-alignof 2018-05-15 14:58:46.448912634 -0400 -+++ chromium-66.0.3359.170/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:52.041784613 -0400 -@@ -18,7 +18,13 @@ - #endif +Index: qtwebengine-everywhere-src-5.12.0-beta1/src/3rdparty/chromium/mojo/public/c/system/macros.h +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta1.orig/src/3rdparty/chromium/mojo/public/c/system/macros.h ++++ qtwebengine-everywhere-src-5.12.0-beta1/src/3rdparty/chromium/mojo/public/c/system/macros.h +@@ -27,7 +27,13 @@ + (sizeof(void*) == 4 ? 32 : 0) // Like the C++11 |alignof| operator. -#if __cplusplus >= 201103L diff --git a/chromium-non-void-return.patch b/chromium-non-void-return.patch new file mode 100644 index 0000000..85e72ac --- /dev/null +++ b/chromium-non-void-return.patch @@ -0,0 +1,443 @@ +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/media/gpu/vaapi/vaapi_wrapper.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/media/gpu/vaapi/vaapi_wrapper.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/media/gpu/vaapi/vaapi_wrapper.cc +@@ -400,6 +400,8 @@ static VAEntrypoint GetVaEntryPoint(Vaap + case VaapiWrapper::kCodecModeMax: + NOTREACHED(); + return VAEntrypointVLD; ++ default: ++ return 0; + } + } + +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/cc/input/snap_fling_controller.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/cc/input/snap_fling_controller.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/cc/input/snap_fling_controller.cc +@@ -26,6 +26,8 @@ bool SnapFlingController::FilterEventFor + case GestureScrollType::kEnd: { + return state_ == State::kActive || state_ == State::kFinished; + } ++ default: ++ return false; + } + } + +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/chrome/browser/ui/webui/discards/discards_ui.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/chrome/browser/ui/webui/discards/discards_ui.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/chrome/browser/ui/webui/discards/discards_ui.cc +@@ -48,6 +48,8 @@ mojom::LifecycleUnitVisibility GetLifecy + return mojom::LifecycleUnitVisibility::OCCLUDED; + case content::Visibility::VISIBLE: + return mojom::LifecycleUnitVisibility::VISIBLE; ++ default: ++ return mojom::LifecycleUnitVisibility::VISIBLE; + } + #if defined(COMPILER_MSVC) + NOTREACHED(); +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/autofill/core/browser/autofill_manager.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/components/autofill/core/browser/autofill_manager.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/autofill/core/browser/autofill_manager.cc +@@ -285,6 +285,7 @@ PopupType AutofillManager::GetPopupType( + + default: + NOTREACHED(); ++ return PopupType::kUnspecified; + } + } + +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/cast_channel/cast_message_util.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/components/cast_channel/cast_message_util.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/cast_channel/cast_message_util.cc +@@ -368,6 +368,8 @@ const char* GetAppAvailabilityResultToSt + return "unavailable"; + case GetAppAvailabilityResult::kUnknown: + return "unknown"; ++ default: ++ return "unknown"; + } + } + +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/data_reduction_proxy/core/browser/data_reduction_proxy_util.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/components/data_reduction_proxy/core/browser/data_reduction_proxy_util.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/data_reduction_proxy/core/browser/data_reduction_proxy_util.cc +@@ -337,6 +337,8 @@ PageloadMetrics_ConnectionType ProtoConn + return PageloadMetrics_ConnectionType_CONNECTION_NONE; + case net::NetworkChangeNotifier::CONNECTION_BLUETOOTH: + return PageloadMetrics_ConnectionType_CONNECTION_BLUETOOTH; ++ default: ++ return PageloadMetrics_ConnectionType_CONNECTION_UNKNOWN; + } + } + +@@ -351,6 +353,8 @@ RequestInfo_Protocol ProtoRequestInfoPro + return RequestInfo_Protocol_QUIC; + case DataReductionProxyData::RequestInfo::Protocol::UNKNOWN: + return RequestInfo_Protocol_UNKNOWN; ++ default: ++ return RequestInfo_Protocol_UNKNOWN; + } + } + +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/content/browser/cache_storage/cache_storage_quota_client.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/content/browser/cache_storage/cache_storage_quota_client.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/content/browser/cache_storage/cache_storage_quota_client.cc +@@ -98,6 +98,8 @@ storage::QuotaClient::ID CacheStorageQuo + return kServiceWorkerCache; + case CacheStorageOwner::kBackgroundFetch: + return kBackgroundFetch; ++ default: ++ return kBackgroundFetch; + } + } + +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/media/capture/video/video_capture_device_descriptor.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/media/capture/video/video_capture_device_descriptor.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/media/capture/video/video_capture_device_descriptor.cc +@@ -94,6 +94,8 @@ const char* VideoCaptureDeviceDescriptor + return "Virtual Device"; + case VideoCaptureApi::UNKNOWN: + return "Unknown"; ++ default: ++ return "Unknown"; + } + } + +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/net/nqe/network_quality_estimator.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/net/nqe/network_quality_estimator.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/net/nqe/network_quality_estimator.cc +@@ -1342,6 +1342,8 @@ base::TimeDelta NetworkQualityEstimator: + case nqe::internal::OBSERVATION_CATEGORY_COUNT: + NOTREACHED(); + return base::TimeDelta(); ++ default: ++ return base::TimeDelta(); + } + } + +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/services/audio/public/cpp/audio_system_to_service_adapter.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/services/audio/public/cpp/audio_system_to_service_adapter.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/services/audio/public/cpp/audio_system_to_service_adapter.cc +@@ -66,6 +66,8 @@ const char* GetTraceEvent(Action action) + return "AudioSystemToServiceAdapter::GetAssociatedOutputDeviceID"; + case kGetInputDeviceInfo: + return "AudioSystemToServiceAdapter::GetInputDeviceInfo"; ++ default: ++ return "Unknown"; + } + NOTREACHED(); + } +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/services/network/cross_origin_read_blocking.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/services/network/cross_origin_read_blocking.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/services/network/cross_origin_read_blocking.cc +@@ -800,6 +800,8 @@ bool CrossOriginReadBlocking::ResponseAn + return sniffers_.empty() && !found_blockable_content_; + case kBlock: + return false; ++ default: ++ return true; + } + } + +@@ -811,6 +813,8 @@ bool CrossOriginReadBlocking::ResponseAn + return sniffers_.empty() && found_blockable_content_; + case kBlock: + return true; ++ default: ++ return false; + } + } + +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc +@@ -1191,6 +1191,8 @@ AXTextPosition AXLayoutObject::GetTextPo + return kAXTextPositionSubscript; + case EVerticalAlign::kSuper: + return kAXTextPositionSuperscript; ++ default: ++ return AXNodeObject::GetTextPosition(); + } + } + +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/modules/webaudio/audio_param.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/third_party/blink/renderer/modules/webaudio/audio_param.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/modules/webaudio/audio_param.cc +@@ -144,6 +144,7 @@ String AudioParamHandler::GetParamName() + return custom_param_name_; + default: + NOTREACHED(); ++ return "Unknown"; + } + } + +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc +@@ -1291,6 +1291,8 @@ AtkRole AXPlatformNodeAuraLinux::GetAtkR + case ax::mojom::Role::kPresentational: + case ax::mojom::Role::kUnknown: + return ATK_ROLE_REDUNDANT_OBJECT; ++ default: ++ return ATK_ROLE_REDUNDANT_OBJECT; + } + } + +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/password_manager/core/browser/browser_save_password_progress_logger.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/components/password_manager/core/browser/browser_save_password_progress_logger.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/password_manager/core/browser/browser_save_password_progress_logger.cc +@@ -86,6 +86,8 @@ std::string VoteTypeToString( + return "HTML classifier"; + case AutofillUploadContents::Field::FIRST_USE: + return "First use"; ++ default: ++ return "No information"; + } + } + +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/previews/content/previews_hints.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/components/previews/content/previews_hints.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/previews/content/previews_hints.cc +@@ -94,6 +94,8 @@ ConvertProtoOptimizationTypeToPreviewsOp + return PreviewsType::NOSCRIPT; + case optimization_guide::proto::RESOURCE_LOADING: + return PreviewsType::RESOURCE_LOADING_HINTS; ++ default: ++ return base::nullopt; + } + } + +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/previews/core/previews_black_list.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/components/previews/core/previews_black_list.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/previews/core/previews_black_list.cc +@@ -33,6 +33,9 @@ PreviewsEligibilityReason BlacklistReaso + return PreviewsEligibilityReason::ALLOWED; + case blacklist::BlacklistReason::kAllowed: + return PreviewsEligibilityReason::ALLOWED; ++ default: ++ NOTREACHED() << "Previews does not support type-base blacklisting"; ++ return PreviewsEligibilityReason::ALLOWED; + } + } + +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/content/browser/frame_host/frame_tree_node.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/content/browser/frame_host/frame_tree_node.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/content/browser/frame_host/frame_tree_node.cc +@@ -624,6 +624,7 @@ bool FrameTreeNode::UpdateUserActivation + return NotifyUserActivation(); + } + NOTREACHED() << "Invalid update_type."; ++ return false; + } + + void FrameTreeNode::OnSetHasReceivedUserGestureBeforeNavigation(bool value) { +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/content/renderer/input/input_event_prediction.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/content/renderer/input/input_event_prediction.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/content/renderer/input/input_event_prediction.cc +@@ -76,6 +76,8 @@ std::unique_ptr Inpu + return std::make_unique(); + case PredictorType::kKalman: + return std::make_unique(); ++ default: ++ return std::make_unique(); + } + } + +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/content/renderer/media/webrtc/peer_connection_tracker.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/content/renderer/media/webrtc/peer_connection_tracker.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/content/renderer/media/webrtc/peer_connection_tracker.cc +@@ -112,6 +112,8 @@ static const char* SerializeDirection( + return "'recvonly'"; + case webrtc::RtpTransceiverDirection::kInactive: + return "'inactive'"; ++ default: ++ return "'unknown'"; + } + } + +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic.cc +@@ -397,6 +397,8 @@ bool BluetoothRemoteGattCharacteristic:: + return hasNotify; + case NotificationType::kIndication: + return hasIndicate; ++ default: ++ return false; + } + } + +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/media/blink/watch_time_reporter.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/media/blink/watch_time_reporter.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/media/blink/watch_time_reporter.cc +@@ -571,6 +571,8 @@ WatchTimeKey WatchTimeReporter::GetDispl + return DISPLAY_TYPE_KEY(DisplayFullscreen); + case DisplayType::kPictureInPicture: + return DISPLAY_TYPE_KEY(DisplayPictureInPicture); ++ default: ++ return DISPLAY_TYPE_KEY(DisplayInline); + } + } + +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/services/ui/public/cpp/gpu/command_buffer_metrics.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/services/ui/public/cpp/gpu/command_buffer_metrics.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/services/ui/public/cpp/gpu/command_buffer_metrics.cc +@@ -86,6 +86,8 @@ std::string ContextTypeToString(ContextT + return "Unknown"; + case ContextType::FOR_TESTING: + return "ForTesting"; ++ default: ++ return "Unknown"; + } + } + +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/core/css/style_environment_variables.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/third_party/blink/renderer/core/css/style_environment_variables.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/core/css/style_environment_variables.cc +@@ -67,6 +67,7 @@ const AtomicString StyleEnvironmentVaria + } + + NOTREACHED(); ++ return "unknown"; + } + + // static +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/core/html/media/media_controls.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/third_party/blink/renderer/core/html/media/media_controls.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/core/html/media/media_controls.cc +@@ -36,6 +36,9 @@ AtomicString MediaControls::GetSizingCSS + return kMediaControlsSizingMediumCSSClass; + case MediaControlsSizingClass::kLarge: + return kMediaControlsSizingLargeCSSClass; ++ default: ++ NOTREACHED(); ++ return kMediaControlsSizingMediumCSSClass; + } + + NOTREACHED(); +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/modules/cookie_store/cookie_change_event.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/third_party/blink/renderer/modules/cookie_store/cookie_change_event.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/modules/cookie_store/cookie_change_event.cc +@@ -53,6 +53,9 @@ String ToCookieListItemSameSite(network: + return "lax"; + case network::mojom::CookieSameSite::NO_RESTRICTION: + return "unrestricted"; ++ default: ++ NOTREACHED(); ++ return "unknown"; + } + + NOTREACHED(); +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/platform/heap/heap_stats_collector.h +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/third_party/blink/renderer/platform/heap/heap_stats_collector.h ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/platform/heap/heap_stats_collector.h +@@ -94,6 +94,8 @@ class PLATFORM_EXPORT ThreadHeapStatsCol + return "BlinkGC.VisitPersistents"; + case Id::kVisitStackRoots: + return "BlinkGC.VisitStackRoots"; ++ default: ++ return "BlinkGC.Unknown"; + } + } + +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc +@@ -688,6 +688,9 @@ PageSchedulerImpl::PageLifecycleStateTra + NOTREACHED(); + return base::nullopt; + } ++ default: ++ NOTREACHED(); ++ return base::nullopt; + } + } + +Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/ui/base/mojo/clipboard_struct_traits.h +=================================================================== +--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/ui/base/mojo/clipboard_struct_traits.h ++++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/ui/base/mojo/clipboard_struct_traits.h +@@ -20,6 +20,9 @@ struct EnumTraits #ifndef QT_NO_OPENGL # include @@ -19,7 +19,7 @@ Index: qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp #endif #include #include -@@ -178,6 +179,39 @@ void dummyGetPluginCallback(const std::v +@@ -162,6 +163,39 @@ void dummyGetPluginCallback(const std::v } #endif @@ -59,13 +59,13 @@ Index: qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp } // namespace namespace QtWebEngineCore { -@@ -414,6 +448,27 @@ WebEngineContext::WebEngineContext() +@@ -440,6 +474,27 @@ WebEngineContext::WebEngineContext() const char *glType = 0; #ifndef QT_NO_OPENGL + bool disableGpu = qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_GPU"); + -+ if (!qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_WAYLAND_WORKAROUND") && platform.startsWith("wayland", Qt::CaseInsensitive)) ++ if (!qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_WAYLAND_WORKAROUND") && qApp->platformName().startsWith("wayland", Qt::CaseInsensitive)) + { + qWarning() << "Running on wayland. Qt WebEngine will disable usage of the GPU.\n" + "Note: you can set the QT_WEBENGINE_DISABLE_WAYLAND_WORKAROUND\n" @@ -87,7 +87,7 @@ Index: qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp bool tryGL = !usingANGLE() && (!usingSoftwareDynamicGL() -@@ -424,7 +479,7 @@ WebEngineContext::WebEngineContext() +@@ -450,7 +505,7 @@ WebEngineContext::WebEngineContext() || enableWebGLSoftwareRendering #endif ) diff --git a/harmony-fix.diff b/harmony-fix.diff index 65f4970..eb1d7a1 100644 --- a/harmony-fix.diff +++ b/harmony-fix.diff @@ -3,20 +3,20 @@ Date: 2017-09-19 23:30:08 -0700 Subject: This is required for QtWebEngine to show the patent-free LCD rendering. Without this patch, only grayscale rendering is used. References: boo#1061344 Upstream: submitted -Index: qtwebengine-everywhere-src-5.11.0/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp +Index: qtwebengine-everywhere-src-5.12.0-beta1/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp =================================================================== ---- qtwebengine-everywhere-src-5.11.0.orig/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp -+++ qtwebengine-everywhere-src-5.11.0/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp -@@ -99,8 +99,6 @@ public: - FreeTypeLibrary() +--- qtwebengine-everywhere-src-5.12.0-beta1.orig/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp ++++ qtwebengine-everywhere-src-5.12.0-beta1/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp +@@ -112,8 +112,6 @@ public: : fGetVarDesignCoordinates(nullptr) + , fGetVarAxisFlags(nullptr) , fLibrary(nullptr) - , fIsLCDSupported(false) - , fLCDExtra(0) { if (FT_New_Library(&gFTMemory, &fLibrary)) { return; -@@ -150,8 +148,6 @@ public: +@@ -176,8 +174,6 @@ public: // Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs. // The default has changed over time, so this doesn't mean the same thing to all users. if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) { @@ -25,7 +25,7 @@ Index: qtwebengine-everywhere-src-5.11.0/src/3rdparty/chromium/third_party/skia/ } } ~FreeTypeLibrary() { -@@ -161,8 +157,6 @@ public: +@@ -187,8 +183,6 @@ public: } FT_Library library() { return fLibrary; } @@ -34,7 +34,7 @@ Index: qtwebengine-everywhere-src-5.11.0/src/3rdparty/chromium/third_party/skia/ // FT_Get_{MM,Var}_{Blend,Design}_Coordinates were added in FreeType 2.7.1. // Prior to this there was no way to get the coordinates out of the FT_Face. -@@ -173,8 +167,6 @@ public: +@@ -205,8 +199,6 @@ public: private: FT_Library fLibrary; @@ -43,7 +43,7 @@ Index: qtwebengine-everywhere-src-5.11.0/src/3rdparty/chromium/third_party/skia/ // FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0. // The following platforms provide FreeType of at least 2.4.0. -@@ -659,17 +651,6 @@ void SkTypeface_FreeType::onFilterRec(Sk +@@ -704,17 +696,6 @@ void SkTypeface_FreeType::onFilterRec(Sk rec->fTextSize = SkIntToScalar(1 << 14); } @@ -61,7 +61,7 @@ Index: qtwebengine-everywhere-src-5.11.0/src/3rdparty/chromium/third_party/skia/ SkPaint::Hinting h = rec->getHinting(); if (SkPaint::kFull_Hinting == h && !isLCD(*rec)) { // collapse full->normal hinting if we're not doing LCD -@@ -1062,11 +1043,11 @@ bool SkScalerContext_FreeType::getCBoxFo +@@ -1109,11 +1090,11 @@ bool SkScalerContext_FreeType::getCBoxFo void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) { if (isLCD(fRec)) { if (fLCDIsVert) { diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes index e61c61b..548e2a6 100644 --- a/libqt5-qtwebengine.changes +++ b/libqt5-qtwebengine.changes @@ -1,3 +1,71 @@ +------------------------------------------------------------------- +Thu Dec 6 13:37:44 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0: + * New feature release + * For more details please see: + * http://code.qt.io/cgit/qt/qtwebengine.git/plain/dist/changes-5.12.0/?h=v5.12.0 + +------------------------------------------------------------------- +Mon Dec 3 08:17:29 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0-rc2: + * New bugfix release + * Only important bugfixes +- Changelog for Qt 5.12.0: + * http://code.qt.io/cgit/qt/qtwebengine.git/plain/dist/changes-5.12.0/?h=5.12.0 + +------------------------------------------------------------------- +Thu Nov 22 13:40:08 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0-rc: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Thu Nov 8 15:25:48 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0-beta4: + * New bugfix release + * No changelog available +- Add yet another hunk to chromium-non-void-return.patch + +------------------------------------------------------------------- +Fri Oct 26 07:21:23 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0-beta3: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Wed Oct 17 08:24:15 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0-beta2: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Fri Oct 5 19:35:36 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0-beta1: + * New bugfix release + * No changelog available +- Refresh patches: + * harmony-fix.diff + * chromium-66.0.3359.170-gcc8-alignof.patch +- Replace no-return-in-nonvoid-function.diff with + with chromium-non-void-return.patch from the chromium package + +------------------------------------------------------------------- +Tue Oct 2 07:34:48 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0-alpha: + * New feature release + * For more details please see: + * http://wiki.qt.io/New_Features_in_Qt_5.12 +- Refresh disable-gpu-when-using-nouveau-boo-1005323.diff +- Raise mem_per_process to 200M + ------------------------------------------------------------------- Fri Sep 21 07:59:57 UTC 2018 - fabian@ritter-vogt.de diff --git a/libqt5-qtwebengine.spec b/libqt5-qtwebengine.spec index 55fd12f..b7f203c 100644 --- a/libqt5-qtwebengine.spec +++ b/libqt5-qtwebengine.spec @@ -52,17 +52,17 @@ %global _qtwebengine_dictionaries_dir %{_libqt5_datadir}/qtwebengine_dictionaries Name: libqt5-qtwebengine -Version: 5.11.2 +Version: 5.12.0 Release: 0 Summary: Qt 5 WebEngine Library License: LGPL-3.0-only or GPL-2.0-only or GPL-3.0-only Group: Development/Libraries/X11 Url: https://www.qt.io %define base_name libqt5 -%define real_version 5.11.2 -%define so_version 5.11.2 -%define tar_version qtwebengine-everywhere-src-5.11.2 -Source: https://download.qt.io/official_releases/qt/5.11/%{real_version}/submodules/%{tar_version}.tar.xz +%define real_version 5.12.0 +%define so_version 5.12.0 +%define tar_version qtwebengine-everywhere-src-5.12.0 +Source: https://download.qt.io/official_releases/qt/5.12/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf # PATCH-FIX-UPSTREAM armv6-ffmpeg-no-thumb.patch - Fix ffmpeg configuration for armv6 Patch1: armv6-ffmpeg-no-thumb.patch @@ -70,9 +70,10 @@ Patch1: armv6-ffmpeg-no-thumb.patch Patch2: disable-gpu-when-using-nouveau-boo-1005323.diff # PATCH-FIX-UPSTREAM harmony-fix.diff -- Show the patent-free LCD rendering. Without this patch, only grayscale rendering is used. (for freetype-2.8.1) boo#1061344 Patch5: harmony-fix.diff -Patch6: no-return-in-nonvoid-function.diff # PATCH-FIX-UPSTREAM Patch8: chromium-66.0.3359.170-gcc8-alignof.patch +# PATCH-FIX-OPENSUSE (copied from the chromium package) +Patch9: chromium-non-void-return.patch # http://www.chromium.org/blink not ported to PowerPC ExcludeArch: ppc ppc64 ppc64le s390 s390x # Try to fix i586 MemoryErrors with rpmlint @@ -298,7 +299,7 @@ cat /proc/meminfo echo "System limits:" ulimit -a if test -n "$makeproc" -a "$makeproc" -gt 1 ; then - mem_per_process=1300000 + mem_per_process=2000000 max_mem=$(awk '/MemTotal/ { print $2 }' /proc/meminfo) max_jobs="$(($max_mem / $mem_per_process))" test "$makeproc" -gt "$max_jobs" && makeproc="$max_jobs" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" diff --git a/no-return-in-nonvoid-function.diff b/no-return-in-nonvoid-function.diff deleted file mode 100644 index de1c097..0000000 --- a/no-return-in-nonvoid-function.diff +++ /dev/null @@ -1,12 +0,0 @@ -Index: qtwebengine-everywhere-src-5.11.0-rc/src/3rdparty/chromium/third_party/protobuf/src/google/protobuf/compiler/js/js_generator.cc -=================================================================== ---- qtwebengine-everywhere-src-5.11.0-rc.orig/src/3rdparty/chromium/third_party/protobuf/src/google/protobuf/compiler/js/js_generator.cc -+++ qtwebengine-everywhere-src-5.11.0-rc/src/3rdparty/chromium/third_party/protobuf/src/google/protobuf/compiler/js/js_generator.cc -@@ -505,6 +505,7 @@ string JSByteGetterSuffix(BytesMode byte - return "U8"; - default: - assert(false); -+ __builtin_unreachable (); - } - return ""; - } diff --git a/qtwebengine-everywhere-src-5.11.2.tar.xz b/qtwebengine-everywhere-src-5.11.2.tar.xz deleted file mode 100644 index 0c64647..0000000 --- a/qtwebengine-everywhere-src-5.11.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3ff9bba5f631cfdd454ce298489360b3e2d9a2de4eb82bb121d838ef65f9b772 -size 233642812 diff --git a/qtwebengine-everywhere-src-5.12.0.tar.xz b/qtwebengine-everywhere-src-5.12.0.tar.xz new file mode 100644 index 0000000..612a523 --- /dev/null +++ b/qtwebengine-everywhere-src-5.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd581e390a30e0f74d41b0e3334b3cf612dd4af23de36a3bf5931d5b4453687c +size 252044400