Bug 110702 - [GTK] GTK+ 2 build broken since GTK_API_VERSION_2 moved to autoconfig.h
Summary: [GTK] GTK+ 2 build broken since GTK_API_VERSION_2 moved to autoconfig.h
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Gustavo Noronha (kov)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-02-23 18:30 PST by Gustavo Noronha (kov)
Modified: 2013-02-24 10:10 PST (History)
6 users (show)

See Also:


Attachments
Patch (1.22 KB, patch)
2013-02-23 18:32 PST, Gustavo Noronha (kov)
no flags Details | Formatted Diff | Diff
Patch (1.23 KB, patch)
2013-02-23 18:42 PST, Gustavo Noronha (kov)
no flags Details | Formatted Diff | Diff
Patch (17.03 KB, patch)
2013-02-24 07:59 PST, Gustavo Noronha (kov)
mrobinson: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Gustavo Noronha (kov) 2013-02-23 18:30:26 PST
[GTK] GTK+ 2 build broken since GTK_API_VERSION_2 moved to autoconfig.h
Comment 1 Gustavo Noronha (kov) 2013-02-23 18:32:27 PST
Created attachment 189948 [details]
Patch
Comment 2 WebKit Review Bot 2013-02-23 18:34:46 PST
Attachment 189948 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/platform/gtk/GtkVersioning.c']" exit_code: 1
Source/WebCore/platform/gtk/GtkVersioning.c:21:  Found other header before WebCore config.h. Should be: config.h, primary header, blank line, and then alphabetically sorted.  [build/include_order] [4]
Total errors found: 1 in 2 files


If any of these errors are false positives, please file a bug against check-webkit-style.
Comment 3 Gustavo Noronha (kov) 2013-02-23 18:42:25 PST
Created attachment 189949 [details]
Patch
Comment 4 Gustavo Noronha (kov) 2013-02-24 07:59:43 PST
Created attachment 189977 [details]
Patch
Comment 5 Martin Robinson 2013-02-24 09:17:36 PST
Comment on attachment 189977 [details]
Patch

Thanks for the fix. Minor nit is that usually there is no blank line after the first include.
Comment 6 Gustavo Noronha (kov) 2013-02-24 09:49:54 PST
Committed r143869: <http://trac.webkit.org/changeset/143869>
Comment 7 Gustavo Noronha (kov) 2013-02-24 10:10:50 PST
Nice sed trick I used to fix the nit:

sed -i 'N;N;s/#include "autotoolsconfig.h"\n\n/#include "autotoolsconfig.h"\n/' *.c