commit 1b8fd16fe6463480da6657476bd55ac353076a7f
Author: Jan Palus <[email protected]>
Date: Fri Mar 1 01:52:58 2019 +0100
up to 5.12.1
chromium-66.0.3359.170-gcc8-alignof.patch | 18 ------------------
qt5-qtwebengine.spec | 11 ++++-------
2 files changed, 4 insertions(+), 25 deletions(-)
---
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index e7e3d4a..8434135 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -10,15 +10,14 @@
Summary: The Qt5 WebEngine library
Summary(pl.UTF-8): Biblioteka Qt5 WebEngine
Name: qt5-%{orgname}
-Version: 5.11.1
+Version: 5.12.1
Release: 1
License: LGPL v3 or GPL v2+ or commercial
Group: X11/Libraries
Source0:
http://download.qt.io/official_releases/qt/5.11/%{version}/submodules/%{orgname}-everywhere-src-%{version}.tar.xz
-# Source0-md5: 75d2ff31addba4ec41981b0f459cc587
+# Source0-md5: 516c70f4f5ef8f4d0462425735f4ff47
Patch0: remove-compiler-check.patch
-Patch1: chromium-66.0.3359.170-gcc8-alignof.patch
-Patch2: x32.patch
+Patch1: x32.patch
URL: http://www.qt.io/
BuildRequires: Qt5Core-devel >= %{qtbase_ver}
BuildRequires: Qt5Gui-devel >= %{qtbase_ver}
@@ -134,10 +133,9 @@ Przykłady do biblioteki Qt5 WebEngine.
%setup -q -n %{orgname}-everywhere-src-%{version}
%patch0 -p1
%ifarch x32
-%patch2 -p1
+%patch1 -p1
%endif
cd ./src/3rdparty/chromium
-%patch1 -p1
%build
%ifarch x32
@@ -209,7 +207,6 @@ rm -rf $RPM_BUILD_ROOT
%{qt5dir}/qml/QtWebEngine/Controls2Delegates
%attr(755,root,root) %{qt5dir}/qml/QtWebEngine/libqtwebengineplugin.so
%dir %{_datadir}/qt5/resources
-%{_datadir}/qt5/resources/icudtl.dat
%{_datadir}/qt5/resources/qtwebengine*.pak
%attr(755,root,root) %{_libdir}/qt5/bin/qwebengine_convert_dict
%attr(755,root,root) %{_libdir}/qt5/libexec/QtWebEngineProcess
diff --git a/chromium-66.0.3359.170-gcc8-alignof.patch
b/chromium-66.0.3359.170-gcc8-alignof.patch
deleted file mode 100644
index 0c2b356..0000000
--- a/chromium-66.0.3359.170-gcc8-alignof.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up chromium-66.0.3359.170/mojo/public/c/system/macros.h.gcc8-alignof
chromium-66.0.3359.170/mojo/public/c/system/macros.h
---- chromium-66.0.3359.170/mojo/public/c/system/macros.h.gcc8-alignof
2018-05-15 14:58:46.448912634 -0400
-+++ chromium-66.0.3359.170/mojo/public/c/system/macros.h 2018-05-15
14:58:52.041784613 -0400
-@@ -18,7 +18,13 @@
- #endif
-
- // Like the C++11 |alignof| operator.
--#if __cplusplus >= 201103L
-+#if defined(__GNUC__) && __GNUC__ >= 8
-+// GCC 8 has changed the alignof operator to return the minimal alignment
-+// required by the target ABI, instead of the preferred alignment.
-+// This means that on 32-bit x86, it will return 4 instead of 8.
-+// Use __alignof__ instead to avoid this.
-+#define MOJO_ALIGNOF(type) __alignof__(type)
-+#elif __cplusplus >= 201103L
- #define MOJO_ALIGNOF(type) alignof(type)
- #elif defined(__GNUC__)
- #define MOJO_ALIGNOF(type) __alignof__(type)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebengine.git/commitdiff/1b8fd16fe6463480da6657476bd55ac353076a7f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
