1 |
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" |
diff -up qt-everywhere-opensource-src-4.8.7/configure.gcc6 qt-everywhere-opensource-src-4.8.7/configure |
2 |
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
--- qt-everywhere-opensource-src-4.8.7/configure.gcc6 2016-04-15 07:04:19.430268222 -0500 |
3 |
<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'> |
+++ qt-everywhere-opensource-src-4.8.7/configure 2016-04-15 07:05:22.157568689 -0500 |
4 |
<head> |
@@ -7744,7 +7744,7 @@ case "$XPLATFORM" in |
|
<title>svntogit/packages.git - Git clone of the 'packages' repository |
|
|
</title> |
|
|
<meta name='generator' content='cgit v0.12'/> |
|
|
<meta name='robots' content='index, nofollow'/> |
|
|
<link rel='stylesheet' type='text/css' href='/cgit.css'/> |
|
|
<link rel='shortcut icon' href='/favicon.ico'/> |
|
|
<link rel='alternate' title='Atom feed' href='https://git.archlinux.org/svntogit/packages.git/atom/trunk/qt4-gcc6.patch?h=packages/qt4' type='application/atom+xml'/> |
|
|
<link rel='vcs-git' href='https://git.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/> |
|
|
<link rel='vcs-git' href='git://git.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/> |
|
|
<link rel='vcs-git' href='ssh://git.archlinux.org/srv/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/> |
|
|
</head> |
|
|
<body> |
|
|
<div id="archnavbar"><!-- Arch Linux global navigation bar --> |
|
|
<div id="archnavbarlogo"> |
|
|
<p><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more"></a></p> |
|
|
</div> |
|
|
<div id="archnavbarmenu"> |
|
|
<ul id="archnavbarlist"> |
|
|
<li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li> |
|
|
<li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li> |
|
|
<li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li> |
|
|
<li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li> |
|
|
<li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and follow bugs">Bugs</a></li> |
|
|
<li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li> |
|
|
<li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li> |
|
|
</ul> |
|
|
</div> |
|
|
</div><!-- #archnavbar --> |
|
|
<div id='cgit'><table id='header'> |
|
|
<tr> |
|
|
<td class='main'><a href='/'>index</a> : <a title='svntogit/packages.git' href='/svntogit/packages.git/'>svntogit/packages.git</a></td></tr> |
|
|
<tr><td class='sub'>Git clone of the 'packages' repository |
|
|
</td><td class='sub right'></td></tr></table> |
|
|
<table class='tabs'><tr><td> |
|
|
<a href='/svntogit/packages.git/?h=packages/qt4'>summary</a><a href='/svntogit/packages.git/refs/?h=packages/qt4'>refs</a><a href='/svntogit/packages.git/log/trunk/qt4-gcc6.patch?h=packages/qt4'>log</a><a class='active' href='/svntogit/packages.git/tree/trunk/qt4-gcc6.patch?h=packages/qt4'>tree</a><a href='/svntogit/packages.git/commit/trunk/qt4-gcc6.patch?h=packages/qt4'>commit</a><a href='/svntogit/packages.git/diff/trunk/qt4-gcc6.patch?h=packages/qt4'>diff</a><a href='/svntogit/packages.git/stats/trunk/qt4-gcc6.patch?h=packages/qt4'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/packages.git/log/trunk/qt4-gcc6.patch'> |
|
|
<input type='hidden' name='h' value='packages/qt4'/><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='/svntogit/packages.git/tree/?h=packages/qt4'>root</a>/<a href='/svntogit/packages.git/tree/trunk?h=packages/qt4'>trunk</a>/<a href='/svntogit/packages.git/tree/trunk/qt4-gcc6.patch?h=packages/qt4'>qt4-gcc6.patch</a></div><div class='content'>blob: d65cd2463c0ccc4f045404c2a953204728b68198 (<a href='/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4'>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> |
|
|
<a id='n19' href='#n19'>19</a> |
|
|
<a id='n20' href='#n20'>20</a> |
|
|
<a id='n21' href='#n21'>21</a> |
|
|
<a id='n22' href='#n22'>22</a> |
|
|
<a id='n23' href='#n23'>23</a> |
|
|
<a id='n24' href='#n24'>24</a> |
|
|
<a id='n25' href='#n25'>25</a> |
|
|
<a id='n26' href='#n26'>26</a> |
|
|
<a id='n27' href='#n27'>27</a> |
|
|
<a id='n28' href='#n28'>28</a> |
|
|
<a id='n29' href='#n29'>29</a> |
|
|
<a id='n30' href='#n30'>30</a> |
|
|
<a id='n31' href='#n31'>31</a> |
|
|
<a id='n32' href='#n32'>32</a> |
|
|
<a id='n33' href='#n33'>33</a> |
|
|
<a id='n34' href='#n34'>34</a> |
|
|
<a id='n35' href='#n35'>35</a> |
|
|
<a id='n36' href='#n36'>36</a> |
|
|
</pre></td> |
|
|
<td class='lines'><pre><code>diff -up qt-everywhere-opensource-src-4.8.7/configure.gcc6 qt-everywhere-opensource-src-4.8.7/configure |
|
|
<span class="hl kwb">--- qt-everywhere-opensource-src-4.8.7/configure.gcc6 2016-04-15 07:04:19.430268222 -0500</span> |
|
|
<span class="hl kwa">+++ qt-everywhere-opensource-src-4.8.7/configure 2016-04-15 07:05:22.157568689 -0500</span> |
|
|
@@ -7744,7 +7744,7 @@ case "$XPLATFORM" in |
|
5 |
*-g++*) |
*-g++*) |
6 |
# Check gcc's version |
# Check gcc's version |
7 |
case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in |
case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in |
8 |
<span class="hl kwb">- 5*|4*|3.4*)</span> |
- 5*|4*|3.4*) |
9 |
<span class="hl kwa">+ 8*|7*|6*|5*|4*|3.4*)</span> |
+ 8*|7*|6*|5*|4*|3.4*) |
10 |
;; |
;; |
11 |
3.3*) |
3.3*) |
12 |
canBuildWebKit="no" |
canBuildWebKit="no" |
13 |
@@ -8060,7 +8060,7 @@ g++*) |
@@ -8060,7 +8060,7 @@ g++*) |
14 |
3.*) |
3.*) |
15 |
COMPILER_VERSION="3.*" |
COMPILER_VERSION="3.*" |
16 |
;; |
;; |
17 |
<span class="hl kwb">- 5*|4.*)</span> |
- 5*|4.*) |
18 |
<span class="hl kwa">+ 8*|7*|6*|5*|4.*)</span> |
+ 8*|7*|6*|5*|4.*) |
19 |
COMPILER_VERSION="4" |
COMPILER_VERSION="4" |
20 |
;; |
;; |
21 |
*) |
*) |
22 |
diff -up qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6 |
diff -up qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6 |
23 |
qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h |
qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h |
24 |
<span class="hl kwb">--- qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6 2015-05-07 09:14:48.000000000 -0500</span> |
--- qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6 2015-05-07 09:14:48.000000000 -0500 |
25 |
<span class="hl kwa">+++ qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h 2016-04-15 07:04:19.431268227 -0500</span> |
+++ qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h 2016-04-15 07:04:19.431268227 -0500 |
26 |
@@ -70,8 +70,8 @@ namespace QPatternist |
@@ -70,8 +70,8 @@ namespace QPatternist |
27 |
ForegroundShift = 10, |
ForegroundShift = 10, |
28 |
BackgroundShift = 20, |
BackgroundShift = 20, |
29 |
SpecialShift = 20, |
SpecialShift = 20, |
30 |
<span class="hl kwb">- ForegroundMask = ((1 << ForegroundShift) - 1) << ForegroundShift,</span> |
- ForegroundMask = ((1 << ForegroundShift) - 1) << ForegroundShift, |
31 |
<span class="hl kwb">- BackgroundMask = ((1 << BackgroundShift) - 1) << BackgroundShift</span> |
- BackgroundMask = ((1 << BackgroundShift) - 1) << BackgroundShift |
32 |
<span class="hl kwa">+ ForegroundMask = 0x1f << ForegroundShift,</span> |
+ ForegroundMask = 0x1f << ForegroundShift, |
33 |
<span class="hl kwa">+ BackgroundMask = 0x7 << BackgroundShift</span> |
+ BackgroundMask = 0x7 << BackgroundShift |
34 |
}; |
}; |
35 |
|
|
36 |
public: |
public: |
|
</code></pre></td></tr></table> |
|
|
</div> <!-- class=content --> |
|
|
<div class="foot" style="padding-left:1em;padding-right:1em;"> |
|
|
<p>Copyright © 2002-2016 <a href="mailto:jvinet@zeroflux.org" |
|
|
title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org" |
|
|
title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo |
|
|
are recognized trademarks. Some rights reserved. The registered trademark |
|
|
Linux® is used pursuant to a sublicense from LMI, the exclusive licensee |
|
|
of Linus Torvalds, owner of the mark on a world-wide basis.</p> |
|
|
</div> |
|
|
</div> <!-- id=cgit --> |
|
|
</body> |
|
|
</html> |
|