Magellan Linux

Diff of /trunk/qt4/patches/qt-4.8.7-l-qclipboard_delay.patch

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

revision 2916 by niro, Thu Apr 27 14:33:08 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"  --- src/gui/kernel/qclipboard_x11.cpp.sav 2014-04-25 09:52:03.855693228 +0200
2    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">  +++ src/gui/kernel/qclipboard_x11.cpp 2014-04-25 09:51:58.038693777 +0200
3  <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>  @@ -548,7 +548,8 @@ bool QX11Data::clipboardWaitForEvent(Win
 <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/l-qclipboard_delay.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/l-qclipboard_delay.patch?h=packages/qt4'>log</a><a class='active' href='/svntogit/packages.git/tree/trunk/l-qclipboard_delay.patch?h=packages/qt4'>tree</a><a href='/svntogit/packages.git/commit/trunk/l-qclipboard_delay.patch?h=packages/qt4'>commit</a><a href='/svntogit/packages.git/diff/trunk/l-qclipboard_delay.patch?h=packages/qt4'>diff</a><a href='/svntogit/packages.git/stats/trunk/l-qclipboard_delay.patch?h=packages/qt4'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/packages.git/log/trunk/l-qclipboard_delay.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/l-qclipboard_delay.patch?h=packages/qt4'>l-qclipboard_delay.patch</a></div><div class='content'>blob: 22643e8d5a014bbbab553b3d0ccfd472f03015c8 (<a href='/svntogit/packages.git/plain/trunk/l-qclipboard_delay.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>  
 </pre></td>  
 <td class='lines'><pre><code><span class="hl kwb">--- src/gui/kernel/qclipboard_x11.cpp.sav 2014-04-25 09:52:03.855693228 +0200</span>  
 <span class="hl kwa">+++ src/gui/kernel/qclipboard_x11.cpp 2014-04-25 09:51:58.038693777 +0200</span>  
 &#64;&#64; -548,7 +548,8 &#64;&#64; bool QX11Data::clipboardWaitForEvent(Win  
4                   return false;                   return false;
5    
6               XSync(X11-&gt;display, false);               XSync(X11->display, false);
7  <span class="hl kwb">-            usleep(50000);</span>  -            usleep(50000);
8  <span class="hl kwa">+            if (!XPending(X11-&gt;display))</span>  +            if (!XPending(X11->display))
9  <span class="hl kwa">+                usleep(5000);</span>  +                usleep(5000);
10    
11               now.start();               now.start();
12    
 </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