Magellan Linux

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

    Contents of /trunk/qt4/patches/qt-4.8.7-l-qclipboard_fix_recursive.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2913 - (show annotations) (download)
    Thu Apr 27 14:33:08 2017 UTC (7 years ago) by niro
    File size: 12971 byte(s) 
    -fix libreoffice issues
    1 <!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/l-qclipboard_fix_recursive.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/l-qclipboard_fix_recursive.patch?h=packages/qt4'>log</a><a class='active' href='/svntogit/packages.git/tree/trunk/l-qclipboard_fix_recursive.patch?h=packages/qt4'>tree</a><a href='/svntogit/packages.git/commit/trunk/l-qclipboard_fix_recursive.patch?h=packages/qt4'>commit</a><a href='/svntogit/packages.git/diff/trunk/l-qclipboard_fix_recursive.patch?h=packages/qt4'>diff</a><a href='/svntogit/packages.git/stats/trunk/l-qclipboard_fix_recursive.patch?h=packages/qt4'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/packages.git/log/trunk/l-qclipboard_fix_recursive.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/l-qclipboard_fix_recursive.patch?h=packages/qt4'>l-qclipboard_fix_recursive.patch</a></div><div class='content'>blob: 6d3bf2f2cde25d8de2aca560bcdfd23d1e01817f (<a href='/svntogit/packages.git/plain/trunk/l-qclipboard_fix_recursive.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 <a id='n37' href='#n37'>37</a>
    89 <a id='n38' href='#n38'>38</a>
    90 <a id='n39' href='#n39'>39</a>
    91 <a id='n40' href='#n40'>40</a>
    92 <a id='n41' href='#n41'>41</a>
    93 <a id='n42' href='#n42'>42</a>
    94 <a id='n43' href='#n43'>43</a>
    95 <a id='n44' href='#n44'>44</a>
    96 <a id='n45' href='#n45'>45</a>
    97 <a id='n46' href='#n46'>46</a>
    98 <a id='n47' href='#n47'>47</a>
    99 <a id='n48' href='#n48'>48</a>
    100 <a id='n49' href='#n49'>49</a>
    101 <a id='n50' href='#n50'>50</a>
    102 <a id='n51' href='#n51'>51</a>
    103 <a id='n52' href='#n52'>52</a>
    104 <a id='n53' href='#n53'>53</a>
    105 <a id='n54' href='#n54'>54</a>
    106 <a id='n55' href='#n55'>55</a>
    107 <a id='n56' href='#n56'>56</a>
    108 <a id='n57' href='#n57'>57</a>
    109 <a id='n58' href='#n58'>58</a>
    110 <a id='n59' href='#n59'>59</a>
    111 <a id='n60' href='#n60'>60</a>
    112 <a id='n61' href='#n61'>61</a>
    113 <a id='n62' href='#n62'>62</a>
    114 <a id='n63' href='#n63'>63</a>
    115 <a id='n64' href='#n64'>64</a>
    116 <a id='n65' href='#n65'>65</a>
    117 <a id='n66' href='#n66'>66</a>
    118 <a id='n67' href='#n67'>67</a>
    119 <a id='n68' href='#n68'>68</a>
    120 <a id='n69' href='#n69'>69</a>
    121 <a id='n70' href='#n70'>70</a>
    122 <a id='n71' href='#n71'>71</a>
    123 <a id='n72' href='#n72'>72</a>
    124 <a id='n73' href='#n73'>73</a>
    125 <a id='n74' href='#n74'>74</a>
    126 <a id='n75' href='#n75'>75</a>
    127 <a id='n76' href='#n76'>76</a>
    128 <a id='n77' href='#n77'>77</a>
    129 <a id='n78' href='#n78'>78</a>
    130 <a id='n79' href='#n79'>79</a>
    131 <a id='n80' href='#n80'>80</a>
    132 <a id='n81' href='#n81'>81</a>
    133 <a id='n82' href='#n82'>82</a>
    134 <a id='n83' href='#n83'>83</a>
    135 <a id='n84' href='#n84'>84</a>
    136 <a id='n85' href='#n85'>85</a>
    137 <a id='n86' href='#n86'>86</a>
    138 <a id='n87' href='#n87'>87</a>
    139 <a id='n88' href='#n88'>88</a>
    140 <a id='n89' href='#n89'>89</a>
    141 <a id='n90' href='#n90'>90</a>
    142 <a id='n91' href='#n91'>91</a>
    143 <a id='n92' href='#n92'>92</a>
    144 <a id='n93' href='#n93'>93</a>
    145 <a id='n94' href='#n94'>94</a>
    146 </pre></td>
    147 <td class='lines'><pre><code><span class="hl kwb">--- src/corelib/kernel/qeventdispatcher_glib.cpp.sav 2014-03-28 15:26:37.000000000 +0100</span>
    148 <span class="hl kwa">+++ src/corelib/kernel/qeventdispatcher_glib.cpp 2014-04-24 09:44:09.358659204 +0200</span>
    149 &#64;&#64; -255,22 +255,30 &#64;&#64; struct GPostEventSource
    150 GSource source;
    151 QAtomicInt serialNumber;
    152 int lastSerialNumber;
    153 <span class="hl kwa">+ QEventLoop::ProcessEventsFlags processEventsFlags;</span>
    154 QEventDispatcherGlibPrivate *d;
    155 };
    156
    157 static gboolean postEventSourcePrepare(GSource *s, gint *timeout)
    158 {
    159 <span class="hl kwa">+ GPostEventSource *source = reinterpret_cast&lt;GPostEventSource *&gt;(s);</span>
    160 QThreadData *data = QThreadData::current();
    161 if (!data)
    162 return false;
    163
    164 <span class="hl kwa">+ QEventLoop::ProcessEventsFlags excludeAllFlags</span>
    165 <span class="hl kwa">+ = QEventLoop::ExcludeUserInputEvents</span>
    166 <span class="hl kwa">+ | QEventLoop::ExcludeSocketNotifiers</span>
    167 <span class="hl kwa">+ | QEventLoop::X11ExcludeTimers;</span>
    168 <span class="hl kwa">+ if ((source-&gt;processEventsFlags &amp; excludeAllFlags) == excludeAllFlags)</span>
    169 <span class="hl kwa">+ return false;</span>
    170 <span class="hl kwa">+</span>
    171 gint dummy;
    172 if (!timeout)
    173 timeout = &amp;dummy;
    174 const bool canWait = data-&gt;canWaitLocked();
    175 *timeout = canWait ? -1 : 0;
    176
    177 <span class="hl kwb">- GPostEventSource *source = reinterpret_cast&lt;GPostEventSource *&gt;(s);</span>
    178 return (!canWait
    179 || (source-&gt;serialNumber != source-&gt;lastSerialNumber));
    180 }
    181 &#64;&#64; -284,8 +292,14 &#64;&#64; static gboolean postEventSourceDispatch(
    182 {
    183 GPostEventSource *source = reinterpret_cast&lt;GPostEventSource *&gt;(s);
    184 source-&gt;lastSerialNumber = source-&gt;serialNumber;
    185 <span class="hl kwb">- QCoreApplication::sendPostedEvents();</span>
    186 <span class="hl kwb">- source-&gt;d-&gt;runTimersOnceWithNormalPriority();</span>
    187 <span class="hl kwa">+ QEventLoop::ProcessEventsFlags excludeAllFlags</span>
    188 <span class="hl kwa">+ = QEventLoop::ExcludeUserInputEvents</span>
    189 <span class="hl kwa">+ | QEventLoop::ExcludeSocketNotifiers</span>
    190 <span class="hl kwa">+ | QEventLoop::X11ExcludeTimers;</span>
    191 <span class="hl kwa">+ if ((source-&gt;processEventsFlags &amp; excludeAllFlags) != excludeAllFlags) {</span>
    192 <span class="hl kwa">+ QCoreApplication::sendPostedEvents();</span>
    193 <span class="hl kwa">+ source-&gt;d-&gt;runTimersOnceWithNormalPriority();</span>
    194 <span class="hl kwa">+ }</span>
    195 return true; // i dunno, george...
    196 }
    197
    198 &#64;&#64; -329,6 +343,7 &#64;&#64; QEventDispatcherGlibPrivate::QEventDispa
    199 postEventSource = reinterpret_cast&lt;GPostEventSource *&gt;(g_source_new(&amp;postEventSourceFuncs,
    200 sizeof(GPostEventSource)));
    201 postEventSource-&gt;serialNumber = 1;
    202 <span class="hl kwa">+ postEventSource-&gt;processEventsFlags = QEventLoop::AllEvents;</span>
    203 postEventSource-&gt;d = this;
    204 g_source_set_can_recurse(&amp;postEventSource-&gt;source, true);
    205 g_source_attach(&amp;postEventSource-&gt;source, mainContext);
    206 &#64;&#64; -423,6 +438,7 &#64;&#64; bool QEventDispatcherGlib::processEvents
    207
    208 // tell postEventSourcePrepare() and timerSource about any new flags
    209 QEventLoop::ProcessEventsFlags savedFlags = d-&gt;timerSource-&gt;processEventsFlags;
    210 <span class="hl kwa">+ d-&gt;postEventSource-&gt;processEventsFlags = flags;</span>
    211 d-&gt;timerSource-&gt;processEventsFlags = flags;
    212 d-&gt;socketNotifierSource-&gt;processEventsFlags = flags;
    213
    214 &#64;&#64; -435,6 +451,7 &#64;&#64; bool QEventDispatcherGlib::processEvents
    215 while (!result &amp;&amp; canWait)
    216 result = g_main_context_iteration(d-&gt;mainContext, canWait);
    217
    218 <span class="hl kwa">+ d-&gt;postEventSource-&gt;processEventsFlags = savedFlags;</span>
    219 d-&gt;timerSource-&gt;processEventsFlags = savedFlags;
    220 d-&gt;socketNotifierSource-&gt;processEventsFlags = savedFlags;
    221
    222 <span class="hl kwb">--- src/corelib/kernel/qeventdispatcher_unix.cpp.sav 2013-06-07 07:16:52.000000000 +0200</span>
    223 <span class="hl kwa">+++ src/corelib/kernel/qeventdispatcher_unix.cpp 2014-04-24 09:43:06.927589535 +0200</span>
    224 &#64;&#64; -905,7 +905,15 &#64;&#64; bool QEventDispatcherUNIX::processEvents
    225
    226 // we are awake, broadcast it
    227 emit awake();
    228 <span class="hl kwb">- QCoreApplicationPrivate::sendPostedEvents(0, 0, d-&gt;threadData);</span>
    229 <span class="hl kwa">+</span>
    230 <span class="hl kwa">+ QEventLoop::ProcessEventsFlags excludeAllFlags</span>
    231 <span class="hl kwa">+ = QEventLoop::ExcludeUserInputEvents</span>
    232 <span class="hl kwa">+ | QEventLoop::ExcludeSocketNotifiers</span>
    233 <span class="hl kwa">+ | QEventLoop::X11ExcludeTimers;</span>
    234 <span class="hl kwa">+ if ((flags &amp; excludeAllFlags) == excludeAllFlags)</span>
    235 <span class="hl kwa">+ return false;</span>
    236 <span class="hl kwa">+ if(( flags &amp; excludeAllFlags ) != excludeAllFlags )</span>
    237 <span class="hl kwa">+ QCoreApplicationPrivate::sendPostedEvents(0, 0, d-&gt;threadData);</span>
    238
    239 int nevents = 0;
    240 const bool canWait = (d-&gt;threadData-&gt;canWaitLocked()
    241 </code></pre></td></tr></table>
    242 </div> <!-- class=content -->
    243 <div class="foot" style="padding-left:1em;padding-right:1em;">
    244 <p>Copyright &copy; 2002-2016 <a href="mailto:jvinet@zeroflux.org"
    245 title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org"
    246 title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo
    247 are recognized trademarks. Some rights reserved. The registered trademark
    248 Linux&reg; is used pursuant to a sublicense from LMI, the exclusive licensee
    249 of Linus Torvalds, owner of the mark on a world-wide basis.</p>
    250 </div>
    251 </div> <!-- id=cgit -->
    252 </body>
    253 </html>