Annotation of /trunk/qt4/patches/qt-4.8.7-gcc6.patch
Parent Directory | Revision Log
Revision 2911 -
(hide annotations)
(download)
Thu Apr 27 14:32:10 2017 UTC (7 years, 5 months ago) by niro
File size: 7663 byte(s)
Thu Apr 27 14:32:10 2017 UTC (7 years, 5 months ago) by niro
File size: 7663 byte(s)
-fix sveral ftbfs
1 | niro | 2911 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" |
2 | "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | ||
3 | <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'> | ||
4 | <head> | ||
5 | <title>svntogit/packages.git - Git clone of the 'packages' repository | ||
6 | </title> | ||
7 | <meta name='generator' content='cgit v0.12'/> | ||
8 | <meta name='robots' content='index, nofollow'/> | ||
9 | <link rel='stylesheet' type='text/css' href='/cgit.css'/> | ||
10 | <link rel='shortcut icon' href='/favicon.ico'/> | ||
11 | <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'/> | ||
12 | <link rel='vcs-git' href='https://git.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/> | ||
13 | <link rel='vcs-git' href='git://git.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/> | ||
14 | <link rel='vcs-git' href='ssh://git.archlinux.org/srv/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/> | ||
15 | </head> | ||
16 | <body> | ||
17 | <div id="archnavbar"><!-- Arch Linux global navigation bar --> | ||
18 | <div id="archnavbarlogo"> | ||
19 | <p><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more"></a></p> | ||
20 | </div> | ||
21 | <div id="archnavbarmenu"> | ||
22 | <ul id="archnavbarlist"> | ||
23 | <li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li> | ||
24 | <li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li> | ||
25 | <li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li> | ||
26 | <li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li> | ||
27 | <li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and follow bugs">Bugs</a></li> | ||
28 | <li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li> | ||
29 | <li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li> | ||
30 | </ul> | ||
31 | </div> | ||
32 | </div><!-- #archnavbar --> | ||
33 | <div id='cgit'><table id='header'> | ||
34 | <tr> | ||
35 | <td class='main'><a href='/'>index</a> : <a title='svntogit/packages.git' href='/svntogit/packages.git/'>svntogit/packages.git</a></td></tr> | ||
36 | <tr><td class='sub'>Git clone of the 'packages' repository | ||
37 | </td><td class='sub right'></td></tr></table> | ||
38 | <table class='tabs'><tr><td> | ||
39 | <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'> | ||
40 | <input type='hidden' name='h' value='packages/qt4'/><select name='qt'> | ||
41 | <option value='grep'>log msg</option> | ||
42 | <option value='author'>author</option> | ||
43 | <option value='committer'>committer</option> | ||
44 | <option value='range'>range</option> | ||
45 | </select> | ||
46 | <input class='txt' type='text' size='10' name='q' value=''/> | ||
47 | <input type='submit' value='search'/> | ||
48 | </form> | ||
49 | </td></tr></table> | ||
50 | <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>) | ||
51 | <table summary='blob content' class='blob'> | ||
52 | <tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a> | ||
53 | <a id='n2' href='#n2'>2</a> | ||
54 | <a id='n3' href='#n3'>3</a> | ||
55 | <a id='n4' href='#n4'>4</a> | ||
56 | <a id='n5' href='#n5'>5</a> | ||
57 | <a id='n6' href='#n6'>6</a> | ||
58 | <a id='n7' href='#n7'>7</a> | ||
59 | <a id='n8' href='#n8'>8</a> | ||
60 | <a id='n9' href='#n9'>9</a> | ||
61 | <a id='n10' href='#n10'>10</a> | ||
62 | <a id='n11' href='#n11'>11</a> | ||
63 | <a id='n12' href='#n12'>12</a> | ||
64 | <a id='n13' href='#n13'>13</a> | ||
65 | <a id='n14' href='#n14'>14</a> | ||
66 | <a id='n15' href='#n15'>15</a> | ||
67 | <a id='n16' href='#n16'>16</a> | ||
68 | <a id='n17' href='#n17'>17</a> | ||
69 | <a id='n18' href='#n18'>18</a> | ||
70 | <a id='n19' href='#n19'>19</a> | ||
71 | <a id='n20' href='#n20'>20</a> | ||
72 | <a id='n21' href='#n21'>21</a> | ||
73 | <a id='n22' href='#n22'>22</a> | ||
74 | <a id='n23' href='#n23'>23</a> | ||
75 | <a id='n24' href='#n24'>24</a> | ||
76 | <a id='n25' href='#n25'>25</a> | ||
77 | <a id='n26' href='#n26'>26</a> | ||
78 | <a id='n27' href='#n27'>27</a> | ||
79 | <a id='n28' href='#n28'>28</a> | ||
80 | <a id='n29' href='#n29'>29</a> | ||
81 | <a id='n30' href='#n30'>30</a> | ||
82 | <a id='n31' href='#n31'>31</a> | ||
83 | <a id='n32' href='#n32'>32</a> | ||
84 | <a id='n33' href='#n33'>33</a> | ||
85 | <a id='n34' href='#n34'>34</a> | ||
86 | <a id='n35' href='#n35'>35</a> | ||
87 | <a id='n36' href='#n36'>36</a> | ||
88 | </pre></td> | ||
89 | <td class='lines'><pre><code>diff -up qt-everywhere-opensource-src-4.8.7/configure.gcc6 qt-everywhere-opensource-src-4.8.7/configure | ||
90 | <span class="hl kwb">--- qt-everywhere-opensource-src-4.8.7/configure.gcc6 2016-04-15 07:04:19.430268222 -0500</span> | ||
91 | <span class="hl kwa">+++ qt-everywhere-opensource-src-4.8.7/configure 2016-04-15 07:05:22.157568689 -0500</span> | ||
92 | @@ -7744,7 +7744,7 @@ case "$XPLATFORM" in | ||
93 | *-g++*) | ||
94 | # Check gcc's version | ||
95 | case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in | ||
96 | <span class="hl kwb">- 5*|4*|3.4*)</span> | ||
97 | <span class="hl kwa">+ 8*|7*|6*|5*|4*|3.4*)</span> | ||
98 | ;; | ||
99 | 3.3*) | ||
100 | canBuildWebKit="no" | ||
101 | @@ -8060,7 +8060,7 @@ g++*) | ||
102 | 3.*) | ||
103 | COMPILER_VERSION="3.*" | ||
104 | ;; | ||
105 | <span class="hl kwb">- 5*|4.*)</span> | ||
106 | <span class="hl kwa">+ 8*|7*|6*|5*|4.*)</span> | ||
107 | COMPILER_VERSION="4" | ||
108 | ;; | ||
109 | *) | ||
110 | diff -up qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6 | ||
111 | qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h | ||
112 | <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> | ||
113 | <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> | ||
114 | @@ -70,8 +70,8 @@ namespace QPatternist | ||
115 | ForegroundShift = 10, | ||
116 | BackgroundShift = 20, | ||
117 | SpecialShift = 20, | ||
118 | <span class="hl kwb">- ForegroundMask = ((1 << ForegroundShift) - 1) << ForegroundShift,</span> | ||
119 | <span class="hl kwb">- BackgroundMask = ((1 << BackgroundShift) - 1) << BackgroundShift</span> | ||
120 | <span class="hl kwa">+ ForegroundMask = 0x1f << ForegroundShift,</span> | ||
121 | <span class="hl kwa">+ BackgroundMask = 0x7 << BackgroundShift</span> | ||
122 | }; | ||
123 | |||
124 | public: | ||
125 | </code></pre></td></tr></table> | ||
126 | </div> <!-- class=content --> | ||
127 | <div class="foot" style="padding-left:1em;padding-right:1em;"> | ||
128 | <p>Copyright © 2002-2016 <a href="mailto:jvinet@zeroflux.org" | ||
129 | title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org" | ||
130 | title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo | ||
131 | are recognized trademarks. Some rights reserved. The registered trademark | ||
132 | Linux® is used pursuant to a sublicense from LMI, the exclusive licensee | ||
133 | of Linus Torvalds, owner of the mark on a world-wide basis.</p> | ||
134 | </div> | ||
135 | </div> <!-- id=cgit --> | ||
136 | </body> | ||
137 | </html> |