Hello community, here is the log from the commit of package libqt5-qtwebengine for openSUSE:Factory checked in at 2019-01-21 10:07:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebengine (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtwebengine.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebengine" Mon Jan 21 10:07:52 2019 rev:42 rq:664648 version:5.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtwebengine/libqt5-qtwebengine.changes 2018-12-14 20:55:47.696845126 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwebengine.new.28833/libqt5-qtwebengine.changes 2019-01-21 10:07:56.294825684 +0100 @@ -1,0 +2,6 @@ +Fri Dec 21 07:34:16 UTC 2018 - Guillaume GARDET <guillaume.gar...@opensuse.org> + +- Backport patch to fix %arm builds: + * gn-fix_arm.patch + +------------------------------------------------------------------- New: ---- gn-fix_arm.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwebengine.spec ++++++ --- /var/tmp/diff_new_pack.fB78mx/_old 2019-01-21 10:08:00.590821340 +0100 +++ /var/tmp/diff_new_pack.fB78mx/_new 2019-01-21 10:08:00.590821340 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtwebengine # -# Copyright © 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright © 2017 Kevin Kofler <ke...@tigcc.ticalc.org> # # All modifications and additions to the file contributed by third parties @@ -12,8 +12,8 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# -# Please submit bugfixes or comments via http://bugs.opensuse.org/ + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -55,7 +55,7 @@ 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 +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 @@ -70,6 +70,8 @@ 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 +# PATCH-FIX-UPSTREAM gn-fix_arm.patch -- https://bugreports.qt.io/browse/QTBUG-72393 +Patch6: gn-fix_arm.patch # PATCH-FIX-UPSTREAM Patch8: chromium-66.0.3359.170-gcc8-alignof.patch # PATCH-FIX-OPENSUSE (copied from the chromium package) @@ -84,9 +86,11 @@ BuildRequires: flex BuildRequires: gperf # It really wants a commit hash, even if it's not in a .git checkout... +BuildRequires: binutils-gold BuildRequires: git-core BuildRequires: krb5 BuildRequires: krb5-devel +BuildRequires: libQt5QuickControls2-devel BuildRequires: libcap-devel BuildRequires: libgcrypt-devel BuildRequires: libicu-devel @@ -94,11 +98,10 @@ BuildRequires: libpng-devel BuildRequires: libqt5-qtbase-private-headers-devel >= 5.9 BuildRequires: libqt5-qtdeclarative-private-headers-devel >= 5.9 -BuildRequires: libqt5-qttools-private-headers-devel >= 5.9 BuildRequires: libqt5-qtlocation-private-headers-devel >= 5.9 +BuildRequires: libqt5-qttools-private-headers-devel >= 5.9 BuildRequires: libqt5-qtwebchannel-private-headers-devel >= 5.9 BuildRequires: libqt5-qtxmlpatterns-private-headers-devel >= 5.9 -BuildRequires: libQt5QuickControls2-devel BuildRequires: pam-devel BuildRequires: pciutils-devel BuildRequires: perl-JSON @@ -106,8 +109,8 @@ BuildRequires: python BuildRequires: python-devel BuildRequires: python-xml -BuildRequires: re2c BuildRequires: re2-devel +BuildRequires: re2c BuildRequires: sed BuildRequires: snappy-devel BuildRequires: sqlite3-devel @@ -132,7 +135,6 @@ BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(jsoncpp) -BuildRequires: binutils-gold %if 0%{?suse_version} < 1330 # It does not build with the default compiler (GCC 4.8) on Leap 42.x BuildRequires: gcc7-c++ @@ -187,8 +189,8 @@ BuildRequires: pkgconfig(vpx) >= 1.4.0 %endif %if %{with system_ffmpeg} -BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) %endif %if %qt5_snapshot ++++++ gn-fix_arm.patch ++++++ >From bf9a9d0532d7749901082ffce976d182672c2d36 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen <allan.jen...@qt.io> Date: Mon, 10 Dec 2018 14:35:22 +0100 Subject: [PATCH 1/1] Fix building gn on arm Two arm header files were missing. Change-Id: I3d9cd03c682b9de6b38e75085bcda9deef81b5fa Fixes: QTBUG-72393 Reviewed-by: Michal Klocek <michal.klo...@qt.io> --- PATH updated by guilla...@opensuse.org to match qt path src/3rdparty/gn/base/numerics/safe_conversions_arm_impl.h | 51 +++++++++++ src/3rdparty/gn/base/numerics/safe_math_arm_impl.h | 122 +++++++++++++++++++++++++++ 2 files changed, 173 insertions(+) create mode 100644 src/3rdparty/gn/base/numerics/safe_conversions_arm_impl.h create mode 100644 src/3rdparty/gn/base/numerics/safe_math_arm_impl.h diff --git a/src/3rdparty/gn/base/numerics/safe_conversions_arm_impl.h b/src/3rdparty/gn/base/numerics/safe_conversions_arm_impl.h new file mode 100644 index 0000000000..da5813f65e --- /dev/null +++ b/src/3rdparty/gn/base/numerics/safe_conversions_arm_impl.h @@ -0,0 +1,51 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef BASE_NUMERICS_SAFE_CONVERSIONS_ARM_IMPL_H_ +#define BASE_NUMERICS_SAFE_CONVERSIONS_ARM_IMPL_H_ + +#include <cassert> +#include <limits> +#include <type_traits> + +#include "base/numerics/safe_conversions_impl.h" + +namespace base { +namespace internal { + +// Fast saturation to a destination type. +template <typename Dst, typename Src> +struct SaturateFastAsmOp { + static const bool is_supported = + std::is_signed<Src>::value && std::is_integral<Dst>::value && + std::is_integral<Src>::value && + IntegerBitsPlusSign<Src>::value <= IntegerBitsPlusSign<int32_t>::value && + IntegerBitsPlusSign<Dst>::value <= IntegerBitsPlusSign<int32_t>::value && + !IsTypeInRangeForNumericType<Dst, Src>::value; + + __attribute__((always_inline)) static Dst Do(Src value) { + int32_t src = value; + typename std::conditional<std::is_signed<Dst>::value, int32_t, + uint32_t>::type result; + if (std::is_signed<Dst>::value) { + asm("ssat %[dst], %[shift], %[src]" + : [dst] "=r"(result) + : [src] "r"(src), [shift] "n"(IntegerBitsPlusSign<Dst>::value <= 32 + ? IntegerBitsPlusSign<Dst>::value + : 32)); + } else { + asm("usat %[dst], %[shift], %[src]" + : [dst] "=r"(result) + : [src] "r"(src), [shift] "n"(IntegerBitsPlusSign<Dst>::value < 32 + ? IntegerBitsPlusSign<Dst>::value + : 31)); + } + return static_cast<Dst>(result); + } +}; + +} // namespace internal +} // namespace base + +#endif // BASE_NUMERICS_SAFE_CONVERSIONS_ARM_IMPL_H_ diff --git a/src/3rdparty/gn/base/numerics/safe_math_arm_impl.h b/src/3rdparty/gn/base/numerics/safe_math_arm_impl.h new file mode 100644 index 0000000000..a7cda1bb23 --- /dev/null +++ b/src/3rdparty/gn/base/numerics/safe_math_arm_impl.h @@ -0,0 +1,122 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef BASE_NUMERICS_SAFE_MATH_ARM_IMPL_H_ +#define BASE_NUMERICS_SAFE_MATH_ARM_IMPL_H_ + +#include <cassert> +#include <limits> +#include <type_traits> + +#include "base/numerics/safe_conversions.h" + +namespace base { +namespace internal { + +template <typename T, typename U> +struct CheckedMulFastAsmOp { + static const bool is_supported = + FastIntegerArithmeticPromotion<T, U>::is_contained; + + // The following is much more efficient than the Clang and GCC builtins for + // performing overflow-checked multiplication when a twice wider type is + // available. The below compiles down to 2-3 instructions, depending on the + // width of the types in use. + // As an example, an int32_t multiply compiles to: + // smull r0, r1, r0, r1 + // cmp r1, r1, asr #31 + // And an int16_t multiply compiles to: + // smulbb r1, r1, r0 + // asr r2, r1, #16 + // cmp r2, r1, asr #15 + template <typename V> + __attribute__((always_inline)) static bool Do(T x, U y, V* result) { + using Promotion = typename FastIntegerArithmeticPromotion<T, U>::type; + Promotion presult; + + presult = static_cast<Promotion>(x) * static_cast<Promotion>(y); + *result = static_cast<V>(presult); + return IsValueInRangeForNumericType<V>(presult); + } +}; + +template <typename T, typename U> +struct ClampedAddFastAsmOp { + static const bool is_supported = + BigEnoughPromotion<T, U>::is_contained && + IsTypeInRangeForNumericType< + int32_t, + typename BigEnoughPromotion<T, U>::type>::value; + + template <typename V> + __attribute__((always_inline)) static V Do(T x, U y) { + // This will get promoted to an int, so let the compiler do whatever is + // clever and rely on the saturated cast to bounds check. + if (IsIntegerArithmeticSafe<int, T, U>::value) + return saturated_cast<V>(x + y); + + int32_t result; + int32_t x_i32 = x; + int32_t y_i32 = y; + + asm("qadd %[result], %[first], %[second]" + : [result] "=r"(result) + : [first] "r"(x_i32), [second] "r"(y_i32)); + return saturated_cast<V>(result); + } +}; + +template <typename T, typename U> +struct ClampedSubFastAsmOp { + static const bool is_supported = + BigEnoughPromotion<T, U>::is_contained && + IsTypeInRangeForNumericType< + int32_t, + typename BigEnoughPromotion<T, U>::type>::value; + + template <typename V> + __attribute__((always_inline)) static V Do(T x, U y) { + // This will get promoted to an int, so let the compiler do whatever is + // clever and rely on the saturated cast to bounds check. + if (IsIntegerArithmeticSafe<int, T, U>::value) + return saturated_cast<V>(x - y); + + int32_t result; + int32_t x_i32 = x; + int32_t y_i32 = y; + + asm("qsub %[result], %[first], %[second]" + : [result] "=r"(result) + : [first] "r"(x_i32), [second] "r"(y_i32)); + return saturated_cast<V>(result); + } +}; + +template <typename T, typename U> +struct ClampedMulFastAsmOp { + static const bool is_supported = CheckedMulFastAsmOp<T, U>::is_supported; + + template <typename V> + __attribute__((always_inline)) static V Do(T x, U y) { + // Use the CheckedMulFastAsmOp for full-width 32-bit values, because + // it's fewer instructions than promoting and then saturating. + if (!IsIntegerArithmeticSafe<int32_t, T, U>::value && + !IsIntegerArithmeticSafe<uint32_t, T, U>::value) { + V result; + if (CheckedMulFastAsmOp<T, U>::Do(x, y, &result)) + return result; + return CommonMaxOrMin<V>(IsValueNegative(x) ^ IsValueNegative(y)); + } + + assert((FastIntegerArithmeticPromotion<T, U>::is_contained)); + using Promotion = typename FastIntegerArithmeticPromotion<T, U>::type; + return saturated_cast<V>(static_cast<Promotion>(x) * + static_cast<Promotion>(y)); + } +}; + +} // namespace internal +} // namespace base + +#endif // BASE_NUMERICS_SAFE_MATH_ARM_IMPL_H_ -- 2.16.3
