1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182 | diff -Nru qtwebengine-opensource-src-5.7.1+dfsg/debian/changelog qtwebengine-opensource-src-5.7.1+dfsg/debian/changelog
--- qtwebengine-opensource-src-5.7.1+dfsg/debian/changelog 2017-06-05 14:16:54.000000000 +0100
+++ qtwebengine-opensource-src-5.7.1+dfsg/debian/changelog 2017-08-08 10:38:21.000000000 +0100
@@ -1,3 +1,37 @@
+qtwebengine-opensource-src (5.7.1+dfsg-6.1ubuntu4) artful; urgency=medium
+
+ * debian/patches: use fix-chromium-gcc7.patch from Qt commit 64fdd317d412
+ as applied by Opensuse against 5.7.1
+
+ -- Rik Mills <rikmills@kubuntu.org> Tue, 08 Aug 2017 10:38:21 +0100
+
+qtwebengine-opensource-src (5.7.1+dfsg-6.1ubuntu3) artful; urgency=medium
+
+ * debian/patches/chromium-update.patch: pull in the complete chromium update
+ from qtwebengine-opensource-src 5.9.0 instead of trying to piecemeal
+ backport with limited success.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 08 Aug 2017 04:46:51 +0000
+
+qtwebengine-opensource-src (5.7.1+dfsg-6.1ubuntu2) artful; urgency=medium
+
+ * debian/patches/chromium-mojo-gcc7-compat.patch: further gcc-7 fixes.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 07 Aug 2017 16:58:14 +0000
+
+qtwebengine-opensource-src (5.7.1+dfsg-6.1ubuntu1) artful; urgency=medium
+
+ * debian/patches/chromium-mojo-gcc7-compat.patch: cherry pick fix for
+ chromium mojo compatibility with gcc-7.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 07 Aug 2017 00:35:07 -0700
+
+qtwebengine-opensource-src (5.7.1+dfsg-6.1build1) artful; urgency=medium
+
+ * No-change rebuild against libevent-2.1-6.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 06 Aug 2017 20:41:49 -0700
+
qtwebengine-opensource-src (5.7.1+dfsg-6.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru qtwebengine-opensource-src-5.7.1+dfsg/debian/control qtwebengine-opensource-src-5.7.1+dfsg/debian/control
--- qtwebengine-opensource-src-5.7.1+dfsg/debian/control 2017-01-17 17:38:30.000000000 +0000
+++ qtwebengine-opensource-src-5.7.1+dfsg/debian/control 2017-08-07 08:22:37.000000000 +0100
@@ -1,5 +1,6 @@
Source: qtwebengine-opensource-src
-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Scarlett Clark <sgclark@kubuntu.org>,
Sandro Knauß <hefee@debian.org>,
Simon Quigley <tsimonq2@ubuntu.com>
diff -Nru qtwebengine-opensource-src-5.7.1+dfsg/debian/patches/fix-chromium-gcc7.patch qtwebengine-opensource-src-5.7.1+dfsg/debian/patches/fix-chromium-gcc7.patch
--- qtwebengine-opensource-src-5.7.1+dfsg/debian/patches/fix-chromium-gcc7.patch 1970-01-01 01:00:00.000000000 +0100
+++ qtwebengine-opensource-src-5.7.1+dfsg/debian/patches/fix-chromium-gcc7.patch 2017-08-08 08:14:41.000000000 +0100
@@ -0,0 +1,119 @@
+From 64fdd317d4127142ad9e967197a2df6ac81ef55f Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Date: Wed, 29 Mar 2017 17:42:18 +0200
+Subject: [PATCH] Fix build with GCC 7.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes some ambiguities and outright wrong code GCC 7 doesn't accept but
+earlier compilers did.
+
+Task-number:QTBUG-59776
+Change-Id: I012f121842ac6cde49db0d571efc62aabe2115e3
+Reviewed-by: Michael Brüning <michael.bruning@qt.io>
+---
+ src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h | 2 +-
+ src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h | 2 ++
+ src/3rdparty/chromium/v8/src/objects-body-descriptors.h | 2 +-
+ src/3rdparty/chromium/v8/src/objects-inl.h | 19 +++++++++++++++++++
+ src/3rdparty/chromium/v8/src/objects.h | 16 ++--------------
+ 5 files changed, 25 insertions(+), 16 deletions(-)
+
+diff --git a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h
+index 5bd29d5..c94a5ac 100644
+--- a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h
++++ b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h
+@@ -34,7 +34,7 @@ class InterfacePtrInfo {
+
+ InterfacePtrInfo& operator=(InterfacePtrInfo&& other) {
+ if (this != &other) {
+- handle_ = other.handle_.Pass();
++ handle_ = std::move(other.handle_);
+ version_ = other.version_;
+ other.version_ = 0u;
+ }
+diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h
+index 58d97fb..839c7df 100644
+--- a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h
++++ b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h
+@@ -495,6 +495,8 @@ inline LinkedHashSet<T, U, V, W>& LinkedHashSet<T, U, V, W>::operator=(const Lin
+ return *this;
+ }
+
++inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b);
++
+ template<typename T, typename U, typename V, typename W>
+ inline void LinkedHashSet<T, U, V, W>::swap(LinkedHashSet& other)
+ {
+diff --git a/src/3rdparty/chromium/v8/src/objects-body-descriptors.h b/src/3rdparty/chromium/v8/src/objects-body-descriptors.h
+index 91cb888..a1c3634 100644
+--- a/src/3rdparty/chromium/v8/src/objects-body-descriptors.h
++++ b/src/3rdparty/chromium/v8/src/objects-body-descriptors.h
+@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public BodyDescriptorBase {
+
+ template <typename StaticVisitor>
+ static inline void IterateBody(HeapObject* obj, int object_size) {
+- IterateBody(obj);
++ IterateBody<StaticVisitor>(obj);
+ }
+ };
+
+diff --git a/src/3rdparty/chromium/v8/src/objects-inl.h b/src/3rdparty/chromium/v8/src/objects-inl.h
+index 177c029..baca18d 100644
+--- a/src/3rdparty/chromium/v8/src/objects-inl.h
++++ b/src/3rdparty/chromium/v8/src/objects-inl.h
+@@ -3122,6 +3122,25 @@ void HashTableBase::SetNumberOfDeletedElements(int nod) {
+
+
+ template <typename Derived, typename Shape, typename Key>
++inline uint32_t HashTable<Derived, Shape, Key>::Hash(Key key) {
++ if (Shape::UsesSeed) {
++ return Shape::SeededHash(key, GetHeap()->HashSeed());
++ } else {
++ return Shape::Hash(key);
++ }
++}
++
++template <typename Derived, typename Shape, typename Key>
++inline uint32_t HashTable<Derived, Shape, Key>::HashForObject(Key key, Object* object) {
++ if (Shape::UsesSeed) {
++ return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
++ } else {
++ return Shape::HashForObject(key, object);
++ }
++}
++
++
++template <typename Derived, typename Shape, typename Key>
+ int HashTable<Derived, Shape, Key>::FindEntry(Key key) {
+ return FindEntry(GetIsolate(), key);
+ }
+diff --git a/src/3rdparty/chromium/v8/src/objects.h b/src/3rdparty/chromium/v8/src/objects.h
+index 0111c71..d737a18 100644
+--- a/src/3rdparty/chromium/v8/src/objects.h
++++ b/src/3rdparty/chromium/v8/src/objects.h
+@@ -3157,21 +3157,9 @@ template <typename Derived, typename Shape, typename Key>
+ class HashTable : public HashTableBase {
+ public:
+ // Wrapper methods
+- inline uint32_t Hash(Key key) {
+- if (Shape::UsesSeed) {
+- return Shape::SeededHash(key, GetHeap()->HashSeed());
+- } else {
+- return Shape::Hash(key);
+- }
+- }
++ inline uint32_t Hash(Key key);
+
+- inline uint32_t HashForObject(Key key, Object* object) {
+- if (Shape::UsesSeed) {
+- return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
+- } else {
+- return Shape::HashForObject(key, object);
+- }
+- }
++ inline uint32_t HashForObject(Key key, Object* object);
+
+ // Returns a new HashTable object.
+ MUST_USE_RESULT static Handle<Derived> New(
diff -Nru qtwebengine-opensource-src-5.7.1+dfsg/debian/patches/series qtwebengine-opensource-src-5.7.1+dfsg/debian/patches/series
--- qtwebengine-opensource-src-5.7.1+dfsg/debian/patches/series 2017-01-18 11:53:32.000000000 +0000
+++ qtwebengine-opensource-src-5.7.1+dfsg/debian/patches/series 2017-08-08 08:15:09.000000000 +0100
@@ -1,2 +1,3 @@
use_system_re2.patch
add_mips_support.patch
+fix-chromium-gcc7.patch
|