Magellan Linux

Diff of /trunk/qt4/patches/qt-4.8.1-qtwebkit-glib231.patch

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

revision 1773 by niro, Wed May 9 08:29:04 2012 UTC revision 1774 by niro, Wed May 9 08:46:07 2012 UTC
# Line 1  Line 1 
 <?xml version="1.0" encoding="utf-8"?>  
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">  
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">  
 <!-- git web interface version 1.7.0.2, (C) 2005-2006, Kay Sievers <kay.sievers@vrfy.org>, Christian Gierke -->  
 <!-- git core binaries version 1.7.2.1 -->  
 <head>  
 <meta http-equiv="content-type" content="text/html; charset=utf-8"/>  
 <meta name="generator" content="gitweb/1.7.0.2 git/1.7.2.1"/>  
 <meta name="robots" content="index, nofollow"/>  
 <title>Fedora Packages Git Repositories - qt.git/blob - qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch</title>  
 <link rel="stylesheet" type="text/css" href="/gitweb/gitweb.css"/>  
 <link rel="alternate" title="qt.git - history of qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch - RSS feed" href="/gitweb/?p=qt.git;a=rss;f=qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch" type="application/rss+xml" />  
 <link rel="alternate" title="qt.git - history of qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch - RSS feed (no merges)" href="/gitweb/?p=qt.git;a=rss;f=qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch;opt=--no-merges" type="application/rss+xml" />  
 <link rel="alternate" title="qt.git - history of qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch - Atom feed" href="/gitweb/?p=qt.git;a=atom;f=qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch;opt=--no-merges" type="application/atom+xml" />  
 <link rel="alternate" title="qt.git - history of qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch - Atom feed (no merges)" href="/gitweb/?p=qt.git;a=atom;f=qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch;opt=--no-merges" type="application/atom+xml" />  
 <link rel="shortcut icon" href="http://fedoraproject.org/static/images/favicon.ico" type="image/png" />  
 </head>  
 <body>  
 <div class="page_header">  
 <a title="Fedora" href="http://fedoraproject.org"><img src="http://fedoraproject.org/static/images/fedora-logo-27.png" width="72" height="27" alt="git" class="logo"/></a><a href="/gitweb/">git://pkgs.fedoraproject.org</a> / <a href="/gitweb/?p=qt.git;a=summary">qt.git</a> / blob  
 </div>  
 <form method="get" action="/gitweb/" enctype="application/x-www-form-urlencoded">  
 <div class="search">  
 <input name="p" type="hidden" value="qt.git" />  
 <input name="a" type="hidden" value="search" />  
 <input name="h" type="hidden" value="HEAD" />  
 <select name="st" >  
 <option selected="selected" value="commit">commit</option>  
 <option value="grep">grep</option>  
 <option value="author">author</option>  
 <option value="committer">committer</option>  
 <option value="pickaxe">pickaxe</option>  
 </select><sup><a href="/gitweb/?p=qt.git;a=search_help">?</a></sup> search:  
 <input type="text" name="s"  />  
 <span title="Extended regular expression"><label><input type="checkbox" name="sr" value="1" />re</label></span></div>  
 </form>  
 </div>  
 <div class="page_nav">  
 <a href="/gitweb/?p=qt.git;a=summary">summary</a> | <a href="/gitweb/?p=qt.git;a=shortlog">shortlog</a> | <a href="/gitweb/?p=qt.git;a=log">log</a> | <a href="/gitweb/?p=qt.git;a=commit;h=HEAD">commit</a> | <a href="/gitweb/?p=qt.git;a=commitdiff;h=HEAD">commitdiff</a> | <a href="/gitweb/?p=qt.git;a=tree;h=9624ce8b8a8960c57bab5f45b2fc46e86fe18858;hb=HEAD">tree</a><br/>  
 <a href="/gitweb/?p=qt.git;a=history;f=qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch;h=e24cb5cf0190e0dae3542d56f813b8459470d7d5;hb=HEAD">history</a> | <a href="/gitweb/?p=qt.git;a=blob_plain;f=qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch;h=e24cb5cf0190e0dae3542d56f813b8459470d7d5;hb=HEAD">raw</a> | <a href="/gitweb/?p=qt.git;a=blob;f=qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch;hb=HEAD">HEAD</a><br/>  
 </div>  
 <div class="header">  
 <a class="title" href="/gitweb/?p=qt.git;a=commit;h=HEAD">rebuild (libtiff)</a>  
 </div>  
 <div class="page_path"><a title="tree root" href="/gitweb/?p=qt.git;a=tree;hb=HEAD">[qt.git]</a> / <a title="qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch" href="/gitweb/?p=qt.git;a=blob_plain;f=qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch;hb=HEAD">qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch</a><br/></div>  
 <div class="page_body">  
 <div class="pre"><a id="l1" href="/gitweb/?p=qt.git;a=blob;f=qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch;h=e24cb5cf0190e0dae3542d56f813b8459470d7d5;hb=HEAD#l1" class="linenr">   1</a> diff&nbsp;-ur&nbsp;qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h&nbsp;qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h</div>  
 <div class="pre"><a id="l2" href="/gitweb/?p=qt.git;a=blob;f=qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch;h=e24cb5cf0190e0dae3542d56f813b8459470d7d5;hb=HEAD#l2" class="linenr">   2</a> ---&nbsp;qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2011-10-04&nbsp;05:44:31.000000000&nbsp;+0200</div>  
 <div class="pre"><a id="l3" href="/gitweb/?p=qt.git;a=blob;f=qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch;h=e24cb5cf0190e0dae3542d56f813b8459470d7d5;hb=HEAD#l3" class="linenr">   3</a> +++&nbsp;qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2011-10-28&nbsp;02:12:16.000000000&nbsp;+0200</div>  
 <div class="pre"><a id="l4" href="/gitweb/?p=qt.git;a=blob;f=qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch;h=e24cb5cf0190e0dae3542d56f813b8459470d7d5;hb=HEAD#l4" class="linenr">   4</a> @@&nbsp;-52,7&nbsp;+52,7&nbsp;@@</div>  
 <div class="pre"><a id="l5" href="/gitweb/?p=qt.git;a=blob;f=qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch;h=e24cb5cf0190e0dae3542d56f813b8459470d7d5;hb=HEAD#l5" class="linenr">   5</a> &nbsp;typedef&nbsp;struct&nbsp;_GHashTable&nbsp;GHashTable;</div>  
 <div class="pre"><a id="l6" href="/gitweb/?p=qt.git;a=blob;f=qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch;h=e24cb5cf0190e0dae3542d56f813b8459470d7d5;hb=HEAD#l6" class="linenr">   6</a> &nbsp;typedef&nbsp;struct&nbsp;_GInputStream&nbsp;GInputStream;</div>  
 <div class="pre"><a id="l7" href="/gitweb/?p=qt.git;a=blob;f=qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch;h=e24cb5cf0190e0dae3542d56f813b8459470d7d5;hb=HEAD#l7" class="linenr">   7</a> &nbsp;typedef&nbsp;struct&nbsp;_GList&nbsp;GList;</div>  
 <div class="pre"><a id="l8" href="/gitweb/?p=qt.git;a=blob;f=qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch;h=e24cb5cf0190e0dae3542d56f813b8459470d7d5;hb=HEAD#l8" class="linenr">   8</a> -typedef&nbsp;struct&nbsp;_GMutex&nbsp;GMutex;</div>  
 <div class="pre"><a id="l9" href="/gitweb/?p=qt.git;a=blob;f=qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch;h=e24cb5cf0190e0dae3542d56f813b8459470d7d5;hb=HEAD#l9" class="linenr">   9</a> +typedef&nbsp;union&nbsp;_GMutex&nbsp;GMutex;</div>  
 <div class="pre"><a id="l10" href="/gitweb/?p=qt.git;a=blob;f=qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch;h=e24cb5cf0190e0dae3542d56f813b8459470d7d5;hb=HEAD#l10" class="linenr">  10</a> &nbsp;typedef&nbsp;struct&nbsp;_GPatternSpec&nbsp;GPatternSpec;</div>  
 <div class="pre"><a id="l11" href="/gitweb/?p=qt.git;a=blob;f=qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch;h=e24cb5cf0190e0dae3542d56f813b8459470d7d5;hb=HEAD#l11" class="linenr">  11</a> &nbsp;typedef&nbsp;struct&nbsp;_GPollableOutputStream&nbsp;GPollableOutputStream;</div>  
 <div class="pre"><a id="l12" href="/gitweb/?p=qt.git;a=blob;f=qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch;h=e24cb5cf0190e0dae3542d56f813b8459470d7d5;hb=HEAD#l12" class="linenr">  12</a> &nbsp;typedef&nbsp;struct&nbsp;_GSocketClient&nbsp;GSocketClient;</div>  
 </div><div class="page_footer">  
 <div class="cachetime">Cache Last Updated: Wed May  9 08:18:18 2012 GMT</div>  
 <div class="page_footer_text">qt</div>  
 <a class="rss_logo" title="history of qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch RSS feed" href="/gitweb/?p=qt.git;a=rss;f=qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch">RSS</a>  
 <a class="rss_logo" title="history of qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch Atom feed" href="/gitweb/?p=qt.git;a=atom;f=qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch">Atom</a>  
 </div>  
 <script type="text/javascript" src="/gitweb/gitweb.js"></script>  
 </body>  
 </html>  
1    diff -ur qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
2    --- qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h 2011-10-04 05:44:31.000000000 +0200
3    +++ qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h 2011-10-28 02:12:16.000000000 +0200
4    @@ -52,7 +52,7 @@
5     typedef struct _GHashTable GHashTable;
6     typedef struct _GInputStream GInputStream;
7     typedef struct _GList GList;
8    -typedef struct _GMutex GMutex;
9    +typedef union _GMutex GMutex;
10     typedef struct _GPatternSpec GPatternSpec;
11     typedef struct _GPollableOutputStream GPollableOutputStream;
12     typedef struct _GSocketClient GSocketClient;

Legend:
Removed from v.1773  
changed lines
  Added in v.1774