Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/xorg-server/patches/xorg-server-1.17.1-make-sdksyms-work-with-gcc5.patch

    Diff of /trunk/xorg-server/patches/xorg-server-1.17.1-make-sdksyms-work-with-gcc5.patch

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 2575 by niro, Mon Jun 15 12:22:48 2015 UTC revision 2576 by niro, Mon Jun 15 13:02:17 2015 UTC
    # Line 1  Line 1 
    1  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"  From 612eb45a2e7a0b35cc3790870e6d0cc42eb50c74 Mon Sep 17 00:00:00 2001
    2    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">  From: Hans de Goede <hdegoede@redhat.com>
     <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>  
     <head>  
     <title>svntogit/packages.git - Git clone of the 'packages' repository  
     </title>  
     <meta name='generator' content='cgit v0.10.2'/>  
     <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://projects.archlinux.org/svntogit/packages.git/atom/trunk/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch?h=packages/xorg-server' type='application/atom+xml'/>  
     <link rel='vcs-git' href='git://projects.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     <link rel='vcs-git' href='http://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     <link rel='vcs-git' href='https://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     <link rel='vcs-git' href='ssh://gerolde.archlinux.org/srv/projects/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/xorg-server'>summary</a><a href='/svntogit/packages.git/refs/?h=packages/xorg-server'>refs</a><a href='/svntogit/packages.git/log/trunk/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch?h=packages/xorg-server'>log</a><a class='active' href='/svntogit/packages.git/tree/trunk/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch?h=packages/xorg-server'>tree</a><a href='/svntogit/packages.git/commit/trunk/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch?h=packages/xorg-server'>commit</a><a href='/svntogit/packages.git/diff/trunk/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch?h=packages/xorg-server'>diff</a><a href='/svntogit/packages.git/stats/trunk/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch?h=packages/xorg-server'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/packages.git/log/trunk/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch'>  
     <input type='hidden' name='h' value='packages/xorg-server'/><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/xorg-server'>root</a>/<a href='/svntogit/packages.git/tree/trunk?h=packages/xorg-server'>trunk</a>/<a href='/svntogit/packages.git/tree/trunk/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch?h=packages/xorg-server'>0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch</a></div><div class='content'>blob: 0e0b20df6fc96bf2c15043d9093e36d5b5ca6071 (<a href='/svntogit/packages.git/plain/trunk/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch?h=packages/xorg-server'>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>  
     <a id='n37' href='#n37'>37</a>  
     <a id='n38' href='#n38'>38</a>  
     <a id='n39' href='#n39'>39</a>  
     <a id='n40' href='#n40'>40</a>  
     <a id='n41' href='#n41'>41</a>  
     <a id='n42' href='#n42'>42</a>  
     <a id='n43' href='#n43'>43</a>  
     <a id='n44' href='#n44'>44</a>  
     <a id='n45' href='#n45'>45</a>  
     <a id='n46' href='#n46'>46</a>  
     <a id='n47' href='#n47'>47</a>  
     <a id='n48' href='#n48'>48</a>  
     <a id='n49' href='#n49'>49</a>  
     <a id='n50' href='#n50'>50</a>  
     <a id='n51' href='#n51'>51</a>  
     </pre></td>  
     <td class='lines'><pre><code>From 612eb45a2e7a0b35cc3790870e6d0cc42eb50c74 Mon Sep 17 00:00:00 2001  
     From: Hans de Goede &lt;hdegoede&#64;redhat.com&gt;  
    3  Date: Wed, 11 Feb 2015 16:26:40 +0100  Date: Wed, 11 Feb 2015 16:26:40 +0100
    4  Subject: [PATCH] sdksyms.sh: Make sdksyms.sh work with gcc5.  Subject: [PATCH] sdksyms.sh: Make sdksyms.sh work with gcc5.
    5    
    6  gcc5's cpp inserts patterns like this:  gcc5's cpp inserts patterns like this:
    7    
    8  extern  extern
    9        __attribute__((visibility(&quot;default&quot;)))        __attribute__((visibility("default")))
    10                  int WaitForSomething(int *                  int WaitForSomething(int *
    11      );      );
    12    
    13  This patch make sdksyms.sh work with this. Note my awk skills are weak, so  This patch make sdksyms.sh work with this. Note my awk skills are weak, so
    14  there likely is a better way to deal with this.  there likely is a better way to deal with this.
    15    
    16  Signed-off-by: Hans de Goede &lt;hdegoede&#64;redhat.com&gt;  Signed-off-by: Hans de Goede <hdegoede@redhat.com>
    17  <span class="hl kwb">---</span>  ---
    18   hw/xfree86/sdksyms.sh | 17 +++++++++++++++++   hw/xfree86/sdksyms.sh | 17 +++++++++++++++++
    19   1 file changed, 17 insertions(+)   1 file changed, 17 insertions(+)
    20    
    21  diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh  diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
    22  index 2305073..99b0cae 100755  index 2305073..99b0cae 100755
    23  <span class="hl kwb">--- a/hw/xfree86/sdksyms.sh</span>  --- a/hw/xfree86/sdksyms.sh
    24  <span class="hl kwa">+++ b/hw/xfree86/sdksyms.sh</span>  +++ b/hw/xfree86/sdksyms.sh
    25  &#64;&#64; -350,6 +350,23 &#64;&#64; BEGIN {  @@ -350,6 +350,23 @@ BEGIN {
    26       if (sdk) {       if (sdk) {
    27   n = 3;   n = 3;
    28    
    29  <span class="hl kwa">+ # detect the following gcc5 cpp pattern and skip it:</span>  + # detect the following gcc5 cpp pattern and skip it:
    30  <span class="hl kwa">+ # extern</span>  + # extern
    31  <span class="hl kwa">+ # # 320 &quot;../../include/os.h&quot; 3 4</span>  + # # 320 "../../include/os.h" 3 4
    32  <span class="hl kwa">+ #     __attribute__((visibility(&quot;default&quot;)))</span>  + #     __attribute__((visibility("default")))
    33  <span class="hl kwa">+ # # 320 &quot;../../include/os.h&quot;</span>  + # # 320 "../../include/os.h"
    34  <span class="hl kwa">+ # Note in this case the &quot;extern &quot; or &quot;extern void &quot; always has</span>  + # Note in this case the "extern " or "extern void " always has
    35  <span class="hl kwa">+ # a trailing space</span>  + # a trailing space
    36  <span class="hl kwa">+ if ($0 ~ &quot;^extern.* $&quot;) {</span>  + if ($0 ~ "^extern.* $") {
    37  <span class="hl kwa">+    getline;</span>  +    getline;
    38  <span class="hl kwa">+    getline;</span>  +    getline;
    39  <span class="hl kwa">+    getline;</span>  +    getline;
    40  <span class="hl kwa">+    getline;</span>  +    getline;
    41  <span class="hl kwa">+    n = 1;</span>  +    n = 1;
    42  <span class="hl kwa">+    while ($n == &quot; &quot;)</span>  +    while ($n == " ")
    43  <span class="hl kwa">+ n++;</span>  + n++;
    44  <span class="hl kwa">+ }</span>  + }
    45  <span class="hl kwa">+</span>  +
    46   # skip attribute, if any   # skip attribute, if any
    47   while ($n ~ /^(__attribute__|__global)/ ||   while ($n ~ /^(__attribute__|__global)/ ||
    48      # skip modifiers, if any      # skip modifiers, if any
    49  <span class="hl kwb">-- </span>  --
    50  2.1.0  2.1.0
    51    
     </code></pre></td></tr></table>  
     </div> <!-- class=content -->  
     <div class="foot" style="padding-left:1em;padding-right:1em;">  
     <p>Copyright &copy; 2002-2014 <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&reg; 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>  
    Legend:
    Removed from v.2575  
    changed lines
      Added in v.2576