Magellan Linux

Contents of /trunk/qt4/patches/qt-4.8.7-glib-honor-excludenocketnotifiers-flag.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: 10105 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/glib-honor-ExcludeSocketNotifiers-flag.diff?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/glib-honor-ExcludeSocketNotifiers-flag.diff?h=packages/qt4'>log</a><a class='active' href='/svntogit/packages.git/tree/trunk/glib-honor-ExcludeSocketNotifiers-flag.diff?h=packages/qt4'>tree</a><a href='/svntogit/packages.git/commit/trunk/glib-honor-ExcludeSocketNotifiers-flag.diff?h=packages/qt4'>commit</a><a href='/svntogit/packages.git/diff/trunk/glib-honor-ExcludeSocketNotifiers-flag.diff?h=packages/qt4'>diff</a><a href='/svntogit/packages.git/stats/trunk/glib-honor-ExcludeSocketNotifiers-flag.diff?h=packages/qt4'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/packages.git/log/trunk/glib-honor-ExcludeSocketNotifiers-flag.diff'>
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/glib-honor-ExcludeSocketNotifiers-flag.diff?h=packages/qt4'>glib-honor-ExcludeSocketNotifiers-flag.diff</a></div><div class='content'>blob: 6949bbfef31a28d641006d3d2046a12606d1e932 (<a href='/svntogit/packages.git/plain/trunk/glib-honor-ExcludeSocketNotifiers-flag.diff?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 </pre></td>
116 <td class='lines'><pre><code>Author: Jan-Marek Glogowski &lt;glogow&#64;fbihome.de&gt;
117 Date: Thu Mar 06 18:44:43 2014 +0100
118
119 Honor QEventLoop::ExcludeSocketNotifiers in glib event loop.
120
121 Implements QEventLoop::ExcludeSocketNotifiers in the same way
122 QEventLoop::X11ExcludeTimers is already implemented for the glib
123 event loop.
124
125 <span class="hl kwb">--- qt4-x11-4.8.1.orig/src/corelib/kernel/qeventdispatcher_glib.cpp</span>
126 <span class="hl kwa">+++ qt4-x11-4.8.1/src/corelib/kernel/qeventdispatcher_glib.cpp</span>
127 &#64;&#64; -65,6 +65,7 &#64;&#64; struct GPollFDWithQSocketNotifier
128 struct GSocketNotifierSource
129 {
130 GSource source;
131 <span class="hl kwa">+ QEventLoop::ProcessEventsFlags processEventsFlags;</span>
132 QList&lt;GPollFDWithQSocketNotifier *&gt; pollfds;
133 };
134
135 &#64;&#64; -80,6 +81,9 &#64;&#64; static gboolean socketNotifierSourceChec
136 GSocketNotifierSource *src = reinterpret_cast&lt;GSocketNotifierSource *&gt;(source);
137
138 bool pending = false;
139 <span class="hl kwa">+ if (src-&gt;processEventsFlags &amp; QEventLoop::ExcludeSocketNotifiers)</span>
140 <span class="hl kwa">+ return pending;</span>
141 <span class="hl kwa">+</span>
142 for (int i = 0; !pending &amp;&amp; i &lt; src-&gt;pollfds.count(); ++i) {
143 GPollFDWithQSocketNotifier *p = src-&gt;pollfds.at(i);
144
145 &#64;&#64; -103,6 +107,9 &#64;&#64; static gboolean socketNotifierSourceDisp
146 QEvent event(QEvent::SockAct);
147
148 GSocketNotifierSource *src = reinterpret_cast&lt;GSocketNotifierSource *&gt;(source);
149 <span class="hl kwa">+ if (src-&gt;processEventsFlags &amp; QEventLoop::ExcludeSocketNotifiers)</span>
150 <span class="hl kwa">+ return true;</span>
151 <span class="hl kwa">+</span>
152 for (int i = 0; i &lt; src-&gt;pollfds.count(); ++i) {
153 GPollFDWithQSocketNotifier *p = src-&gt;pollfds.at(i);
154
155 &#64;&#64; -330,6 +337,7 &#64;&#64; QEventDispatcherGlibPrivate::QEventDispa
156 reinterpret_cast&lt;GSocketNotifierSource *&gt;(g_source_new(&amp;socketNotifierSourceFuncs,
157 sizeof(GSocketNotifierSource)));
158 (void) new (&amp;socketNotifierSource-&gt;pollfds) QList&lt;GPollFDWithQSocketNotifier *&gt;();
159 <span class="hl kwa">+ socketNotifierSource-&gt;processEventsFlags = QEventLoop::AllEvents;</span>
160 g_source_set_can_recurse(&amp;socketNotifierSource-&gt;source, true);
161 g_source_attach(&amp;socketNotifierSource-&gt;source, mainContext);
162
163 &#64;&#64; -415,6 +423,7 &#64;&#64; bool QEventDispatcherGlib::processEvents
164 // tell postEventSourcePrepare() and timerSource about any new flags
165 QEventLoop::ProcessEventsFlags savedFlags = d-&gt;timerSource-&gt;processEventsFlags;
166 d-&gt;timerSource-&gt;processEventsFlags = flags;
167 <span class="hl kwa">+ d-&gt;socketNotifierSource-&gt;processEventsFlags = flags;</span>
168
169 if (!(flags &amp; QEventLoop::EventLoopExec)) {
170 // force timers to be sent at normal priority
171 &#64;&#64; -426,6 +435,7 &#64;&#64; bool QEventDispatcherGlib::processEvents
172 result = g_main_context_iteration(d-&gt;mainContext, canWait);
173
174 d-&gt;timerSource-&gt;processEventsFlags = savedFlags;
175 <span class="hl kwa">+ d-&gt;socketNotifierSource-&gt;processEventsFlags = savedFlags;</span>
176
177 if (canWait)
178 emit awake();
179 </code></pre></td></tr></table>
180 </div> <!-- class=content -->
181 <div class="foot" style="padding-left:1em;padding-right:1em;">
182 <p>Copyright &copy; 2002-2016 <a href="mailto:jvinet@zeroflux.org"
183 title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org"
184 title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo
185 are recognized trademarks. Some rights reserved. The registered trademark
186 Linux&reg; is used pursuant to a sublicense from LMI, the exclusive licensee
187 of Linus Torvalds, owner of the mark on a world-wide basis.</p>
188 </div>
189 </div> <!-- id=cgit -->
190 </body>
191 </html>