Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/qt4/patches/qt-4.8.7-glibc225.patch

    Diff of /trunk/qt4/patches/qt-4.8.7-glibc225.patch

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

    revision 2916 by niro, Thu Apr 27 14:32:10 2017 UTC revision 2917 by niro, Wed May 17 09:04:25 2017 UTC
    # Line 1  Line 1 
    1  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"  diff -up qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h.majmin
       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">  
     <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.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-glibc-2.25.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-glibc-2.25.patch?h=packages/qt4'>log</a><a class='active' href='/svntogit/packages.git/tree/trunk/qt4-glibc-2.25.patch?h=packages/qt4'>tree</a><a href='/svntogit/packages.git/commit/trunk/qt4-glibc-2.25.patch?h=packages/qt4'>commit</a><a href='/svntogit/packages.git/diff/trunk/qt4-glibc-2.25.patch?h=packages/qt4'>diff</a><a href='/svntogit/packages.git/stats/trunk/qt4-glibc-2.25.patch?h=packages/qt4'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/packages.git/log/trunk/qt4-glibc-2.25.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-glibc-2.25.patch?h=packages/qt4'>qt4-glibc-2.25.patch</a></div><div class='content'>blob: ca7b98bd57f33504c1d382d97077c572c9f4b9ab (<a href='/svntogit/packages.git/plain/trunk/qt4-glibc-2.25.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>  
     </pre></td>  
     <td class='lines'><pre><code>diff -up qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h.majmin  
    2  qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h  qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h
    3  <span class="hl kwb">--- qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h.majmin 2015-05-07 09:14:48.000000000 -0500</span>  --- qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h.majmin 2015-05-07 09:14:48.000000000 -0500
    4  <span class="hl kwa">+++ qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h 2016-12-08 12:10:29.677359701 -0600</span>  +++ qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h 2016-12-08 12:10:29.677359701 -0600
    5  <span class="hl kwd">&#64;&#64; -52,7 +52,7 &#64;&#64;</span>  @@ -52,7 +52,7 @@
    6   /*   /*
    7      can be used like #if (QT_VERSION &gt;= QT_VERSION_CHECK(4, 4, 0))      can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
    8   */   */
    9  <span class="hl kwb">-#define QT_VERSION_CHECK(major, minor, patch) ((major&lt;&lt;16)|(minor&lt;&lt;8)|(patch))</span>  -#define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
    10  <span class="hl kwa">+#define QT_VERSION_CHECK(qt_version_check_major, qt_version_check_minor, qt_version_check_patch) ((qt_version_check_major&lt;&lt;16)|(qt_version_check_minor&lt;&lt;8)|(qt_version_check_patch))</span>  +#define QT_VERSION_CHECK(qt_version_check_major, qt_version_check_minor, qt_version_check_patch) ((qt_version_check_major<<16)|(qt_version_check_minor<<8)|(qt_version_check_patch))
    11    
    12   #define QT_PACKAGEDATE_STR &quot;2015-05-07&quot;   #define QT_PACKAGEDATE_STR "2015-05-07"
    13    
    14  diff -up qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp  diff -up qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp
    15  <span class="hl kwb">--- qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 2015-05-07 09:14:44.000000000 -0500</span>  --- qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 2015-05-07 09:14:44.000000000 -0500
    16  <span class="hl kwa">+++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp 2016-12-08 12:32:46.638962448 -0600</span>  +++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp 2016-12-08 12:32:46.638962448 -0600
    17  &#64;&#64; -188,10 +188,12 &#64;&#64; int runMoc(int _argc, char **_argv)  @@ -188,10 +188,12 @@ int runMoc(int _argc, char **_argv)
    18       pp.macros[&quot;Q_MOC_RUN&quot;];       pp.macros["Q_MOC_RUN"];
    19       pp.macros[&quot;__cplusplus&quot;];       pp.macros["__cplusplus"];
    20    
    21  <span class="hl kwb">-    // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829</span>  -    // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
    22  <span class="hl kwa">+    // Workaround a bugs while parsing some boost headers. See QTBUG-22829 </span>  +    // Workaround a bugs while parsing some boost headers. See QTBUG-22829
    23       pp.macros[&quot;BOOST_TT_HAS_OPERATOR_HPP_INCLUDED&quot;];       pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
    24       pp.macros[&quot;BOOST_LEXICAL_CAST_INCLUDED&quot;];       pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
    25       pp.macros[&quot;BOOST_NEXT_PRIOR_HPP_INCLUDED&quot;];       pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
    26  <span class="hl kwa">+    pp.macros[&quot;BOOST_TYPE_TRAITS_HPP&quot;];</span>  +    pp.macros["BOOST_TYPE_TRAITS_HPP"];
    27  <span class="hl kwa">+    pp.macros[&quot;_SYS_SYSMACROS_H_OUTER&quot;];</span>  +    pp.macros["_SYS_SYSMACROS_H_OUTER"];
    28    
    29       QByteArray filename;       QByteArray filename;
    30       QByteArray output;       QByteArray output;
     </code></pre></td></tr></table>  
     </div> <!-- class=content -->  
     <div class="foot" style="padding-left:1em;padding-right:1em;">  
     <p>Copyright &copy; 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&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.2916  
    changed lines
      Added in v.2917