summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2019-02-17 09:41:54 +0100
committerAndreas Baumann <mail@andreasbaumann.cc>2019-02-17 09:41:54 +0100
commitbccde4757f795f7c9dc40444a941f0992b41e11d (patch)
treecda48d03e8f6df0b5ced07dddd2cc9f0b3633712
parentf2c86763b57fe958d7039c0d03be00b21a0f119d (diff)
downloadpackages-bccde4757f795f7c9dc40444a941f0992b41e11d.tar.xz
extra/qt5-webengine: updated chromium alignment patch
-rw-r--r--extra/qt5-webengine/PKGBUILD18
-rw-r--r--extra/qt5-webengine/chromium-69.0.3497.81-gcc8-alignof.patch102
-rw-r--r--extra/qt5-webengine/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch18
3 files changed, 111 insertions, 27 deletions
diff --git a/extra/qt5-webengine/PKGBUILD b/extra/qt5-webengine/PKGBUILD
index 26837912..c01280e8 100644
--- a/extra/qt5-webengine/PKGBUILD
+++ b/extra/qt5-webengine/PKGBUILD
@@ -16,16 +16,16 @@ eval "$(
'
)"
-# see https://src.fedoraproject.org/cgit/rpms/chromium.git/tree/chromium-66.0.3359.170-gcc8-alignof.patch
-source+=('qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch')
-sha256sums+=('f1d810bf237ea3ce85803eb4665273b2d2bfa8a2a19521d5fa05568cec5d8cba')
+# see https://src.fedoraproject.org/cgit/rpms/chromium.git/tree/chromium-69.0.3497.81-gcc8-alignof.patch
+source+=('chromium-69.0.3497.81-gcc8-alignof.patch')
+sha256sums+=('92e613d645f3e21d704e43a4000b796dac3fee772fb010844ab1435e45ec37d0')
-eval "$(
- declare -f prepare | \
- sed '
- $ i cd "$srcdir/${_pkgfqn}/src/3rdparty"; patch -Np0 -i "${srcdir}"/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch
- '
-)"
+#eval "$(
+# declare -f prepare | \
+# sed '
+# $ i cd "$srcdir/${_pkgfqn}/src/3rdparty"; patch -Np0 -i "${srcdir}"/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch
+# '
+#)"
# see FS32#44, installing qt4 seems to help against:
# fatal error: QtUiPlugin/QDesignerCustomWidgetInterface: No such file or directory
diff --git a/extra/qt5-webengine/chromium-69.0.3497.81-gcc8-alignof.patch b/extra/qt5-webengine/chromium-69.0.3497.81-gcc8-alignof.patch
new file mode 100644
index 00000000..eda047b0
--- /dev/null
+++ b/extra/qt5-webengine/chromium-69.0.3497.81-gcc8-alignof.patch
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+<title>chromium-69.0.3497.81-gcc8-alignof.patch - rpms/chromium.git - rpms/chromium</title>
+<meta name='generator' content='cgit v1.1'/>
+<meta name='robots' content='index, nofollow'/>
+<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/>
+<link rel='shortcut icon' href='/favicon.ico'/>
+<link rel='alternate' title='Atom feed' href='http://src.fedoraproject.org/cgit/rpms/chromium.git/atom/chromium-69.0.3497.81-gcc8-alignof.patch?h=master' type='application/atom+xml'/>
+<link rel='vcs-git' href='https://src.fedoraproject.org/git/rpms/chromium.git' title='rpms/chromium.git Git repository'/>
+</head>
+<body>
+<script src="https://apps.fedoraproject.org/fedmenu/js/jquery-1.11.2.min.js"></script>
+<script src="https://apps.fedoraproject.org/fedmenu/js/fedmenu.js"></script>
+
+<script>
+ var base = 'https://apps.fedoraproject.org/';
+ var tokens = window.location.href.split('/');
+ var repo = null;
+ if (tokens.length > 5 && tokens[4] == 'rpms' && tokens[5] != '') {
+ repo = tokens[5].split('.')[0];
+ }
+ fedmenu({
+ 'url': base + 'js/data.js',
+ 'mimeType': 'application/javascript',
+ 'position': 'bottom-right',
+ 'package': repo,
+ });
+</script>
+<div id='cgit'><table id='header'>
+<tr>
+<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td>
+<td class='main'><a href='/cgit/'>index</a> : <a title='rpms/chromium.git' href='/cgit/rpms/chromium.git/'>rpms/chromium.git</a></td><td class='form'><form method='get'>
+<select name='h' onchange='this.form.submit();'>
+<option value='epel7'>epel7</option>
+<option value='f23'>f23</option>
+<option value='f24'>f24</option>
+<option value='f25'>f25</option>
+<option value='f26'>f26</option>
+<option value='f27'>f27</option>
+<option value='f28'>f28</option>
+<option value='f29'>f29</option>
+<option value='master' selected='selected'>master</option>
+</select> <input type='submit' value='switch'/></form></td></tr>
+<tr><td class='sub'>rpms/chromium</td><td class='sub right'>root</td></tr></table>
+<table class='tabs'><tr><td>
+<a href='/cgit/rpms/chromium.git/'>summary</a><a href='/cgit/rpms/chromium.git/refs/'>refs</a><a href='/cgit/rpms/chromium.git/log/chromium-69.0.3497.81-gcc8-alignof.patch'>log</a><a class='active' href='/cgit/rpms/chromium.git/tree/chromium-69.0.3497.81-gcc8-alignof.patch'>tree</a><a href='/cgit/rpms/chromium.git/commit/chromium-69.0.3497.81-gcc8-alignof.patch'>commit</a><a href='/cgit/rpms/chromium.git/diff/chromium-69.0.3497.81-gcc8-alignof.patch'>diff</a><a href='/cgit/rpms/chromium.git/stats/chromium-69.0.3497.81-gcc8-alignof.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/rpms/chromium.git/log/chromium-69.0.3497.81-gcc8-alignof.patch'>
+<select name='qt'>
+<option value='grep'>log msg</option>
+<option value='author'>author</option>
+<option value='committer'>committer</option>
+<option value='range'>range</option>
+</select>
+<input class='txt' type='text' size='10' name='q' value=''/>
+<input type='submit' value='search'/>
+</form>
+</td></tr></table>
+<div class='path'>path: <a href='/cgit/rpms/chromium.git/tree/'>root</a>/<a href='/cgit/rpms/chromium.git/tree/chromium-69.0.3497.81-gcc8-alignof.patch'>chromium-69.0.3497.81-gcc8-alignof.patch</a></div><div class='content'>blob: 234b391824871e0a309b0beaf5c858ae36f8dddc (<a href='/cgit/rpms/chromium.git/plain/chromium-69.0.3497.81-gcc8-alignof.patch'>plain</a>)
+<table summary='blob content' class='blob'>
+<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
+<a id='n2' href='#n2'>2</a>
+<a id='n3' href='#n3'>3</a>
+<a id='n4' href='#n4'>4</a>
+<a id='n5' href='#n5'>5</a>
+<a id='n6' href='#n6'>6</a>
+<a id='n7' href='#n7'>7</a>
+<a id='n8' href='#n8'>8</a>
+<a id='n9' href='#n9'>9</a>
+<a id='n10' href='#n10'>10</a>
+<a id='n11' href='#n11'>11</a>
+<a id='n12' href='#n12'>12</a>
+<a id='n13' href='#n13'>13</a>
+<a id='n14' href='#n14'>14</a>
+<a id='n15' href='#n15'>15</a>
+<a id='n16' href='#n16'>16</a>
+<a id='n17' href='#n17'>17</a>
+<a id='n18' href='#n18'>18</a>
+</pre></td>
+<td class='lines'><pre><code>diff -up chromium-69.0.3497.81/mojo/public/c/system/macros.h.gcc8-alignof chromium-69.0.3497.81/mojo/public/c/system/macros.h
+<span class="hl kwb">--- chromium-69.0.3497.81/mojo/public/c/system/macros.h.gcc8-alignof 2018-09-06 10:11:54.336432699 -0400</span>
+<span class="hl kwa">+++ chromium-69.0.3497.81/mojo/public/c/system/macros.h 2018-09-06 10:13:56.555727572 -0400</span>
+<span class="hl kwd">&#64;&#64; -27,7 +27,13 &#64;&#64;</span>
+ (sizeof(void*) == 4 ? 32 : 0)
+
+ // Like the C++11 |alignof| operator.
+<span class="hl kwb">-#if __cplusplus &gt;= 201103L</span>
+<span class="hl kwa">+#if defined(__GNUC__) &amp;&amp; __GNUC__ &gt;= 8</span>
+<span class="hl kwa">+// GCC 8 has changed the alignof operator to return the minimal alignment</span>
+<span class="hl kwa">+// required by the target ABI, instead of the preferred alignment.</span>
+<span class="hl kwa">+// This means that on 32-bit x86, it will return 4 instead of 8.</span>
+<span class="hl kwa">+// Use __alignof__ instead to avoid this.</span>
+<span class="hl kwa">+#define MOJO_ALIGNOF(type) __alignof__(type)</span>
+<span class="hl kwa">+#elif __cplusplus &gt;= 201103L</span>
+ #define MOJO_ALIGNOF(type) alignof(type)
+ #elif defined(__GNUC__)
+ #define MOJO_ALIGNOF(type) __alignof__(type)
+</code></pre></td></tr></table>
+</div> <!-- class=content -->
+<div class='footer'>generated by <a href='https://git.zx2c4.com/cgit/about/'>cgit v1.1</a> at 2019-02-17 08:32:15 +0000</div>
+</div> <!-- id=cgit -->
+</body>
+</html>
diff --git a/extra/qt5-webengine/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch b/extra/qt5-webengine/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch
deleted file mode 100644
index 6027d29f..00000000
--- a/extra/qt5-webengine/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -rauN chromium/mojo/public/c/system/macros.h chromium/mojo/public/c/system/macros.h
---- chromium/mojo/public/c/system/macros.h 2018-06-03 09:46:38.408293369 +0200
-+++ chromium/mojo/public/c/system/macros.h 2018-06-03 09:46:54.734960038 +0200
-@@ -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)