117895 2013-06-21 14:44:26 -0700 [v2.1.2] GTK2 build fails for undefined GDK_IS_X11_DISPLAY 2013-07-22 14:32:27 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 118980 0 dimstar webkit-unassigned berto cgarcia commit-queue eflews.bot gyuyoung.kim kalevlember mrobinson zan oldest_to_newest 902682 0 dimstar 2013-06-21 14:44:26 -0700 Trying to build webkitgtk 2.1.2 for GTK2 fails with [ 1578s] Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp: In function 'WTF::OwnPtr<WebCore::WidgetBackingStore> WebKit::createBackingStore(GtkWidget*, const WebCore::IntSize&)': [ 1578s] Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:111:35: error: 'GDK_IS_X11_DISPLAY' was not declared in this scope [ 1580s] make[1]: *** [Source/WebKit/gtk/WebCoreSupport/libwebkitgtk_1_0_la-ChromeClientGtk.lo] Error 1 [ 1580s] make[1]: Leaving directory `/home/abuild/rpmbuild/BUILD/webkitgtk-2.1.2' [ 1580s] make: *** [all] Error 2 [ 1580s] error: Bad exit status from /var/tmp/rpm-tmp.MOddiR (%build) (A full build log can be found at https://build.opensuse.org/package/live_build_log?arch=x86_64&package=webkitgtk&project=home%3Adimstar%3Abranches%3AGNOME%3AFactory&repository=openSUSE_Factory ) GDK_IS_X11_DISPLAY is not defined in GTK+ 2.x. 903015 1 205313 dimstar 2013-06-24 11:24:57 -0700 Created attachment 205313 Patch 903016 2 commit-queue 2013-06-24 11:26:09 -0700 Attachment 205313 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/gtk/ChangeLog', u'Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp']" exit_code: 1 Source/WebKit/gtk/ChangeLog:4: Line contains tab character. [whitespace/tab] [5] Source/WebKit/gtk/ChangeLog:5: Line contains tab character. [whitespace/tab] [5] Source/WebKit/gtk/ChangeLog:6: Line contains tab character. [whitespace/tab] [5] Total errors found: 3 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 903037 3 205319 dimstar 2013-06-24 13:13:37 -0700 Created attachment 205319 Reformatted patch (replaced tabs with spaces) 905061 4 berto 2013-07-01 09:22:26 -0700 Thanks for the patch! Can you please rework a bit the ChangeLog entry? I should be something like this: Bug Title Bug URL Reviewed by NOBODY (OOPS!). Long description. * WebCoreSupport/ChromeClientGtk.cpp: About the change itself, I think it's fine. As a minor thing, you can also put everything in one line, e.g. #if defined(GDK_WINDOWING_X11) && !defined(GDK_IS_X11_DISPLAY) ... I think it would be a good idea to have all the compatibility code together in the same file, but we don't have that at the moment. 907159 5 206333 dimstar 2013-07-09 10:04:58 -0700 Created attachment 206333 New version of patch - Reworked ChangeLog - added inclusion of autotoolsconfig.h (some defines moved there) 907165 6 206333 mrobinson 2013-07-09 10:11:25 -0700 Comment on attachment 206333 New version of patch - Reworked ChangeLog - added inclusion of autotoolsconfig.h (some defines moved there) View in context: https://bugs.webkit.org/attachment.cgi?id=206333&action=review > Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:106 > +// GTK 2.0 compatibility > +#ifdef GDK_WINDOWING_X11 && !defined(GDK_IS_X11_DISPLAY) > +#define GDK_IS_X11_DISPLAY(dpy) 1 > +#endif This should probably go into GtkVersioning.h. 907166 7 berto 2013-07-09 10:14:54 -0700 Why do you need to include autotoolsconfig.h ? You shouldn't include it directly anyway, use config.h instead. 907168 8 berto 2013-07-09 10:16:10 -0700 (In reply to comment #6) > This should probably go into GtkVersioning.h. You're right, I overlooked that file. 907177 9 dimstar 2013-07-09 10:28:24 -0700 Thanks for your comments guys... anyway, version 2.1.3 (recently released) has now even more issues... so this patch has been rendered useless already :) I'll try to fix up the build of 2.1.3... then we can try to fixup 'formatting' for inclusion into the svn tree. I'll work based on your comments. 907211 10 206349 dimstar 2013-07-09 13:32:20 -0700 Created attachment 206349 New version, hopefully translated all comments into the right snippets. Patch build-tested with webkitgtk 2.1.3 / gtk2 2.24.19 Build failures addressed in new patch: 1) Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:749:58: error: 'gtk_widget_get_preferred_size' was not declared in this scope gtk_widget_get_preferred_size(widget, &requisition, 0); 2) Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp: In function 'WTF::PassOwnPtr<WebCore::WidgetBackingStore> WebKit::createBackingStore(GtkWidget*, const WebCore::IntSize&)': Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:111:35: error: 'GDK_IS_X11_DISPLAY' was not declared in this scope if (GDK_IS_X11_DISPLAY(display)) 3) In file included from Source/WebCore/plugins/gtk/gtk2xtbin.c:47:0: Source/WebCore/plugins/gtk/gtk2xtbin.h:45:22: fatal error: gtk/gtkx.h: No such file or directory #include <gtk/gtkx.h> ^ 907212 11 commit-queue 2013-07-09 13:33:16 -0700 Attachment 206349 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.h', u'Source/WebCore/plugins/gtk/gtk2xtbin.h']" exit_code: 1 Source/WebCore/platform/gtk/GtkVersioning.h:44: Missing space after , [whitespace/comma] [3] Source/WebCore/platform/gtk/GtkVersioning.h:46: Tab found; better to use spaces [whitespace/tab] [1] Source/WebCore/platform/gtk/GtkVersioning.h:46: Extra space before ( in function call [whitespace/parens] [4] Source/WebCore/plugins/gtk/gtk2xtbin.h:43: Header file should not contain WebCore config.h. Should be: alphabetically sorted. [build/include_order] [4] Total errors found: 4 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 907214 12 dimstar 2013-07-09 13:37:20 -0700 (In reply to comment #11) > Attachment 206349 [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.h', u'Source/WebCore/plugins/gtk/gtk2xtbin.h']" exit_code: 1 > Source/WebCore/platform/gtk/GtkVersioning.h:44: Missing space after , [whitespace/comma] [3] > Source/WebCore/platform/gtk/GtkVersioning.h:46: Tab found; better to use spaces [whitespace/tab] [1] > Source/WebCore/platform/gtk/GtkVersioning.h:46: Extra space before ( in function call [whitespace/parens] [4] Ok, those three I can easily address > Source/WebCore/plugins/gtk/gtk2xtbin.h:43: Header file should not contain WebCore config.h. Should be: alphabetically sorted. [build/include_order] [4] > Total errors found: 4 in 3 files ??? That contradicts what was said earlier 907215 13 206350 dimstar 2013-07-09 13:44:29 -0700 Created attachment 206350 Updated patch - addresses the style issues reported Sorry for the many iterations. 907216 14 206350 eflews.bot 2013-07-09 13:48:39 -0700 Comment on attachment 206350 Updated patch - addresses the style issues reported Attachment 206350 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/984271 907387 15 206394 dimstar 2013-07-10 09:34:15 -0700 Created attachment 206394 Another round - taking mrobinson's comment into account, that code comment should be sentences... Let's see what else we can fix :) 907393 16 206394 mrobinson 2013-07-10 10:11:28 -0700 Comment on attachment 206394 Another round - taking mrobinson's comment into account, that code comment should be sentences... View in context: https://bugs.webkit.org/attachment.cgi?id=206394&action=review > Source/WebCore/platform/gtk/GtkVersioning.h:53 > +#if defined(GDK_WINDOWING_X11) && !defined(GDK_IS_X11_DISPLAY) > +#define GDK_IS_X11_DISPLAY(dpy) 1 > +#endif > + Perhaps this should be #if defined(GDK_WINDOWING_X11) && !defined(GDK_IS_X11_DISPLAY) #define GDK_IS_X11_DISPLAY(display) 1 #else #define GDK_IS_X11_DISPLAY(display) 0 #endif for Windows and Mac? 907438 17 dimstar 2013-07-10 12:45:49 -0700 (In reply to comment #16) > (From update of attachment 206394 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=206394&action=review > > > Source/WebCore/platform/gtk/GtkVersioning.h:53 > > +#if defined(GDK_WINDOWING_X11) && !defined(GDK_IS_X11_DISPLAY) > > +#define GDK_IS_X11_DISPLAY(dpy) 1 > > +#endif > > + > > Perhaps this should be > #if defined(GDK_WINDOWING_X11) && !defined(GDK_IS_X11_DISPLAY) > #define GDK_IS_X11_DISPLAY(display) 1 > #else > #define GDK_IS_X11_DISPLAY(display) 0 > #endif > > for Windows and Mac? Maybe... I honestly would not know if that's the right behavior or what the consequences are in this case :( Question would probably be: are there webkit2/gtk2 windows/mac builds (I guess yes.. but then, seeing on how long and how often Gtk2 builds fail, I'm not sure) 907439 18 mrobinson 2013-07-10 12:51:21 -0700 (In reply to comment #17) > Question would probably be: are there webkit2/gtk2 windows/mac builds (I guess yes.. but then, seeing on how long and how often Gtk2 builds fail, I'm not sure) Well for sure there's no WebKit2 support for GTK+ 2 at all. WebKit1 works on both Windows and Mac (at various points in time). There is a small group of people who actively fix problems with Windows. I've pointed them here. 907457 19 kalevlember 2013-07-10 13:58:42 -0700 (In reply to comment #17) > (In reply to comment #16) > > Perhaps this should be > > #if defined(GDK_WINDOWING_X11) && !defined(GDK_IS_X11_DISPLAY) > > #define GDK_IS_X11_DISPLAY(display) 1 > > #else > > #define GDK_IS_X11_DISPLAY(display) 0 > > #endif > > > > for Windows and Mac? > > Maybe... I honestly would not know if that's the right behavior or what the consequences are in this case :( It should be fine to leave it undefined for other platforms. In all the places that use it [1], GDK_IS_X11_DISPLAY() calls are always guarded with #ifdef GDK_WINDOWING_X11. As GTK+ 2 doesn't support multiple GDK backends, we can be sure that when GDK_WINDOWING_X11 is defined, it's an X11 build. [1] ChromeClientGtk.cpp and BackingStoreCairo.cpp 907460 20 kalevlember 2013-07-10 14:06:44 -0700 Perhaps it would make sense to surround the GTK+ 2 workarounds with #ifdef GTK_API_VERSION_2 ... #endif to make sure it's easy to find them when GTK+ 2 support gets removed in the future? 907461 21 206413 dimstar 2013-07-10 14:08:24 -0700 Created attachment 206413 Next iteration of patch after review by mrobinson... 907475 22 206413 commit-queue 2013-07-10 15:39:59 -0700 Comment on attachment 206413 Next iteration of patch after review by mrobinson... Clearing flags on attachment: 206413 Committed r152552: <http://trac.webkit.org/changeset/152552> 907476 23 commit-queue 2013-07-10 15:40:02 -0700 All reviewed patches have been landed. Closing bug. 908452 24 206413 cgarcia 2013-07-15 10:18:07 -0700 Comment on attachment 206413 Next iteration of patch after review by mrobinson... View in context: https://bugs.webkit.org/attachment.cgi?id=206413&action=review > Source/WebCore/platform/gtk/GtkVersioning.h:56 > +// Define GDK_IS_X11_DISPLAY dummy for GTK+ 2.0 compatibility. > +#ifndef GDK_IS_X11_DISPLAY > + #ifdef GDK_WINDOWING_X11 > + #define GDK_IS_X11_DISPLAY(display) 1 > + #else > + #define GDK_IS_X11_DISPLAY(display) 0 > + #endif > +#endif I don't think this is the right fix, this depends on whether GDK_IS_X11_DISPLAY is defined at this point. GDK_IS_X11_DISPLAY is defined in gdk/gdkx.h in GTK+3 and that header is included in GtkVersioning.cpp. I think we should either check for a explicit version here or use GTK_API_VERSION_2 macro. This is causing compile warnings, see: In file included from /home/cgarcia/src/git/WebKit/WebKitBuild/Dependencies/Root/include/gtk-3.0/gdk/gdkx.h:43:0, from ../../Source/WebCore/platform/gtk/GtkVersioning.c:28: /home/cgarcia/src/git/WebKit/WebKitBuild/Dependencies/Root/include/gtk-3.0/gdk/x11/gdkx11display.h:49:0: warning: "GDK_IS_X11_DISPLAY" redefined [enabled by default] In file included from ../../Source/WebCore/platform/gtk/GtkVersioning.c:22:0: ../../Source/WebCore/platform/gtk/GtkVersioning.h:52:0: note: this is the location of the previous definition 910787 25 zan 2013-07-22 13:27:22 -0700 (In reply to comment #24) > (From update of attachment 206413 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=206413&action=review > > > Source/WebCore/platform/gtk/GtkVersioning.h:56 > > +// Define GDK_IS_X11_DISPLAY dummy for GTK+ 2.0 compatibility. > > +#ifndef GDK_IS_X11_DISPLAY > > + #ifdef GDK_WINDOWING_X11 > > + #define GDK_IS_X11_DISPLAY(display) 1 > > + #else > > + #define GDK_IS_X11_DISPLAY(display) 0 > > + #endif > > +#endif > > I don't think this is the right fix, this depends on whether GDK_IS_X11_DISPLAY is defined at this point. GDK_IS_X11_DISPLAY is defined in gdk/gdkx.h in GTK+3 and that header is included in GtkVersioning.cpp. I think we should either check for a explicit version here or use GTK_API_VERSION_2 macro. This is causing compile warnings, see: > > In file included from /home/cgarcia/src/git/WebKit/WebKitBuild/Dependencies/Root/include/gtk-3.0/gdk/gdkx.h:43:0, > from ../../Source/WebCore/platform/gtk/GtkVersioning.c:28: > /home/cgarcia/src/git/WebKit/WebKitBuild/Dependencies/Root/include/gtk-3.0/gdk/x11/gdkx11display.h:49:0: warning: "GDK_IS_X11_DISPLAY" redefined [enabled by default] > In file included from ../../Source/WebCore/platform/gtk/GtkVersioning.c:22:0: > ../../Source/WebCore/platform/gtk/GtkVersioning.h:52:0: note: this is the location of the previous definition Bug #118980. 205313 2013-06-24 11:24:57 -0700 2013-06-24 13:13:37 -0700 Patch bug-117895-20130624202302.patch text/plain 1360 dimstar SW5kZXg6IFNvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MTkxOCkKKysrIFNvdXJjZS9XZWJLaXQv Z3RrL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEzLTA2LTI0 ICBEb21pbmlxdWUgTGV1ZW5iZXJnZXIgIDxkaW1zdGFyQG9wZW5zdXNlLm9yZz4KKworICAgICAg ICBbdjIuMS4yXSBHVEsyIGJ1aWxkIGZhaWxzIGZvciB1bmRlZmluZWQgR0RLX0lTX1gxMV9ESVNQ TEFZCisJR1RLIDIuMCBkb2VzIGRlZmluZSBHREtfV0lORE9XSU5HX1gxMSwgYnV0IEdES19JU19Y MTFfRElTUExBWSBpcyBub3QKKwlwcmVzZW50IGluIEdUSysgMi4wLiBBIGR1bW15IGRlZmluZXMg aXMgc3VmZmljaWVudCwgYXMgR1RLIDIuMCBpcyBub3QKKwl0aGF0IG11bHRpcGxlIGJhY2tlbmQg YXdhcmUgYW55d2F5Li4uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMTc4OTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHA6CisKIDIwMTMtMDYt MjEgIENocmlzdG9waGUgRHVtZXogIDxjaC5kdW1lekBzaXNhLnNhbXN1bmcuY29tPgogCiAgICAg ICAgIFJFR1JFU1NJT04gKHIxNTA2NjMpOiBVc2luZyB3ZWJraXRBdWRpb0NvbnRleHQgaW4gSW5z cGVjdG9yIG1ha2VzIGl0IHVuZGVmaW5lZCBldmVyeXdoZXJlCkluZGV4OiBTb3VyY2UvV2ViS2l0 L2d0ay9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHAJKHJldmlz aW9uIDE1MTkxNikKKysrIFNvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNs aWVudEd0ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwMCw2ICsxMDAsMTMgQEAKICNlbmRpZgog I2luY2x1ZGUgIldpZGdldEJhY2tpbmdTdG9yZUNhaXJvLmgiCiAKKy8vIEdUSyAyLjAgY29tcGF0 aWJpbGl0eQorI2lmZGVmIEdES19XSU5ET1dJTkdfWDExCisjaWZuZGVmIEdES19JU19YMTFfRElT UExBWQorI2RlZmluZSBHREtfSVNfWDExX0RJU1BMQVkoZHB5KSAxCisjZW5kaWYKKyNlbmRpZgor CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7Cg== 205319 2013-06-24 13:13:37 -0700 2013-07-09 10:04:58 -0700 Reformatted patch (replaced tabs with spaces) webkit-117895.patch text/plain 1382 dimstar SW5kZXg6IFNvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MTkxOCkKKysrIFNvdXJjZS9XZWJLaXQv Z3RrL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEzLTA2LTI0 ICBEb21pbmlxdWUgTGV1ZW5iZXJnZXIgIDxkaW1zdGFyQG9wZW5zdXNlLm9yZz4KKworICAgICAg ICBbdjIuMS4yXSBHVEsyIGJ1aWxkIGZhaWxzIGZvciB1bmRlZmluZWQgR0RLX0lTX1gxMV9ESVNQ TEFZCisgICAgICAgIEdUSyAyLjAgZG9lcyBkZWZpbmUgR0RLX1dJTkRPV0lOR19YMTEsIGJ1dCBH REtfSVNfWDExX0RJU1BMQVkgaXMgbm90CisgICAgICAgIHByZXNlbnQgaW4gR1RLKyAyLjAuIEEg ZHVtbXkgZGVmaW5lcyBpcyBzdWZmaWNpZW50LCBhcyBHVEsgMi4wIGlzIG5vdAorICAgICAgICB0 aGF0IG11bHRpcGxlIGJhY2tlbmQgYXdhcmUgYW55d2F5Li4uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTc4OTUKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVu dEd0ay5jcHA6CisKIDIwMTMtMDYtMjEgIENocmlzdG9waGUgRHVtZXogIDxjaC5kdW1lekBzaXNh LnNhbXN1bmcuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIxNTA2NjMpOiBVc2luZyB3ZWJr aXRBdWRpb0NvbnRleHQgaW4gSW5zcGVjdG9yIG1ha2VzIGl0IHVuZGVmaW5lZCBldmVyeXdoZXJl CkluZGV4OiBTb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9t ZUNsaWVudEd0ay5jcHAJKHJldmlzaW9uIDE1MTkxNikKKysrIFNvdXJjZS9XZWJLaXQvZ3RrL1dl YkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwMCw2 ICsxMDAsMTMgQEAKICNlbmRpZgogI2luY2x1ZGUgIldpZGdldEJhY2tpbmdTdG9yZUNhaXJvLmgi CiAKKy8vIEdUSyAyLjAgY29tcGF0aWJpbGl0eQorI2lmZGVmIEdES19XSU5ET1dJTkdfWDExCisj aWZuZGVmIEdES19JU19YMTFfRElTUExBWQorI2RlZmluZSBHREtfSVNfWDExX0RJU1BMQVkoZHB5 KSAxCisjZW5kaWYKKyNlbmRpZgorCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNw YWNlIFdlYktpdCB7Cgo= 206333 2013-07-09 10:04:58 -0700 2013-07-09 13:32:20 -0700 New version of patch - Reworked ChangeLog - added inclusion of autotoolsconfig.h (some defines moved there) webkit2-gtk2-buildfix.patch text/plain 2264 dimstar SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MjQ5NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEwIEBACisyMDEzLTA3LTA5IERvbWluaXF1 ZSBMZXVlbmJlcmdlciAgPGRpbXN0YXJAb3BlbnN1c2Uub3JnPgorCisgICAgICAgIEZpeCBidWls ZCBhZ2FpbnN0IEdUSysgMi4wCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMTc4OTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KwogMjAxMy0wNy0wOSAgcGVhdm9Ab3V0bG9vay5jb20gIDxwZWF2b0BvdXRsb29rLmNvbT4KIAog ICAgICAgICBbV2luZG93c10gQ29tcGlsZSBmaXguCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbHVn aW5zL2d0ay9ndGsyeHRiaW4uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbHVnaW5z L2d0ay9ndGsyeHRiaW4uaAkocmV2aXNpb24gMTUyNDk1KQorKysgU291cmNlL1dlYkNvcmUvcGx1 Z2lucy9ndGsvZ3RrMnh0YmluLmgJKHdvcmtpbmcgY29weSkKQEAgLTQwLDYgKzQwLDcgQEAKICNp Zm5kZWYgX19HVEtfWFRCSU5fSF9fCiAjZGVmaW5lIF9fR1RLX1hUQklOX0hfXwogCisjaW5jbHVk ZSAiYXV0b3Rvb2xzY29uZmlnLmgiCiAjaW5jbHVkZSA8Z3RrL2d0ay5oPgogI2lmbmRlZiBHVEtf QVBJX1ZFUlNJT05fMgogI2luY2x1ZGUgPGd0ay9ndGt4Lmg+CkluZGV4OiBTb3VyY2UvV2ViS2l0 L2d0ay9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNTI0OTUpCisrKyBTb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cJKHdvcmtp bmcgY29weSkKQEAgLTEsMyArMSwxNyBAQAorMjAxMy0wNy0wOSAgRG9taW5pcXVlIExldWVuYmVy Z2VyICA8ZGltc3RhckBvcGVuc3VzZS5vcmc+CisKKyAgICAgICAgRml4IGJ1aWxkIGFnYWluc3Qg R1RLKyAyLjAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTExNzg5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEdUSzIgYnVpbGQgZmFpbHMgZm9yIHVuZGVmaW5lZCBHREtfSVNfWDExX0RJU1BMQVkKKyAgICAg ICAgR1RLIDIuMCBkb2VzIGRlZmluZSBHREtfV0lORE9XSU5HX1gxMSwgYnV0IEdES19JU19YMTFf RElTUExBWSBpcyBub3QKKyAgICAgICAgcHJlc2VudCBpbiBHVEsrIDIuMC4gQSBkdW1teSBkZWZp bmVzIGlzIHN1ZmZpY2llbnQsIGFzIEdUSyAyLjAgaXMgbm90CisgICAgICAgIHRoYXQgbXVsdGlw bGUgYmFja2VuZCBhd2FyZSBhbnl3YXkuLi4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0No cm9tZUNsaWVudEd0ay5jcHA6CisKIDIwMTMtMDctMDkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8 Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIFVwZGF0ZSBORVdTIGFu ZCBWZXJzaW9ucy5tNCBmb3IgMi4xLjMgcmVsZWFzZS4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvZ3Rr L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmNwcAkocmV2aXNpb24g MTUyNDk1KQorKysgU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50 R3RrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAwLDYgKzEwMCwxMSBAQAogI2VuZGlmCiAjaW5j bHVkZSAiV2lkZ2V0QmFja2luZ1N0b3JlQ2Fpcm8uaCIKIAorLy8gR1RLIDIuMCBjb21wYXRpYmls aXR5CisjaWZkZWYgR0RLX1dJTkRPV0lOR19YMTEgJiYgIWRlZmluZWQoR0RLX0lTX1gxMV9ESVNQ TEFZKQorI2RlZmluZSBHREtfSVNfWDExX0RJU1BMQVkoZHB5KSAxCisjZW5kaWYKKwogdXNpbmcg bmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewo= 206349 2013-07-09 13:32:20 -0700 2013-07-09 13:44:29 -0700 New version, hopefully translated all comments into the right snippets. Patch build-tested with webkitgtk 2.1.3 / gtk2 2.24.19 webkitgtk-gtk2-buildfix.patch text/plain 2117 dimstar SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MjQ5NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEzLTA3LTA5ICBEb21pbmlx dWUgTGV1ZW5iZXJnZXIgIDxkaW1zdGFyQG9wZW5zdXNlLm9yZz4KKworICAgICAgICBGaXggYnVp bGQgYWdhaW5zdCBHVEsrIDIuMAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTE3ODk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgR1RLMiBidWlsZCBmYWlscyBmb3IgdW5kZWZpbmVkIEdES19JU19YMTFfRElT UExBWQorICAgICAgICBHVEsgMi4wIGRvZXMgZGVmaW5lIEdES19XSU5ET1dJTkdfWDExLGJ1dCBH REtfSVNfWDExX0RJU1BMQVkgaXMgbm90CisgICAgICAgIHByZXNlbnQgaW4gR1RLKyAyLjAuIEEg ZHVtbXkgZGVmaW5lcyBpcyBzdWZmaWNpZW50LCBhcyBHVEsgMi4wIGlzIG5vdAorICAgICAgICB0 aGF0IG11bHRpcGxlIGJhY2tlbmQgYXdhcmUgYW55d2F5Li4uCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ndGsvR3RrVmVyc2lvbmluZy5oOiBEZWZpbmUgR0RLX0lTX1gxMV9ESVNQTEFZIGZvciBHVEsr IDIuMAorICAgICAgICAgIGFuZCBjb21wYXRpYmlsaXR5IGZvciBndGtfd2lkZ2V0X2dldF9wcmVm ZXJyZWRfc2l6ZSgpCisgICAgICAgICogcGx1Z2lucy9ndGsvZ3RrMnh0YmluLmg6IEluY2x1ZGUg Y29uZmlnLmgKKwogMjAxMy0wNy0wOSAgcGVhdm9Ab3V0bG9vay5jb20gIDxwZWF2b0BvdXRsb29r LmNvbT4KIAogICAgICAgICBbV2luZG93c10gQ29tcGlsZSBmaXguCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmgJKHJldmlzaW9uIDE1MjQ5NSkKKysr IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmgJKHdvcmtpbmcgY29w eSkKQEAgLTQwLDYgKzQwLDE4IEBACiAKIEdka0RldmljZSogZ2V0RGVmYXVsdEdES1BvaW50ZXJE ZXZpY2UoR2RrV2luZG93KiB3aW5kb3cpOwogCisvLyBndGtfd2lkZ2V0X2dldF9wcmVmZXJyZWRf c2l6ZSgpIGFwcGVhcmVkIG9ubHkgaW4gR1RLIDMuMAorI2lmICFHVEtfQ0hFQ0tfVkVSU0lPTiAo Miw5MSwwKSAgLyogYXBwcm94aW1hdGVseSAgKi8KKyNkZWZpbmUgZ3RrX3dpZGdldF9nZXRfcHJl ZmVycmVkX3NpemUod2lkZ2V0LCBtaW5pbXVtX3NpemUsIG5hdHVyYWxfc2l6ZSkgXAorCShndGtf d2lkZ2V0X3NpemVfcmVxdWVzdCAoKHdpZGdldCksICgobWluaW11bV9zaXplKSkpKQorI2VuZGlm CisKKy8vIEdUSyAyLjAgY29tcGF0aWJpbGl0eQorI2lmIGRlZmluZWQoR0RLX1dJTkRPV0lOR19Y MTEpICYmICFkZWZpbmVkKEdES19JU19YMTFfRElTUExBWSkKKyNkZWZpbmUgR0RLX0lTX1gxMV9E SVNQTEFZKGRweSkgMQorI2VuZGlmCisKKwogR19FTkRfREVDTFMKIAogI2VuZGlmIC8vIEd0a1Zl cnNpb25pbmdfaApJbmRleDogU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ndGsvZ3RrMnh0YmluLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ndGsvZ3RrMnh0YmluLmgJKHJl dmlzaW9uIDE1MjQ5NSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvZ3RrL2d0azJ4dGJpbi5o CSh3b3JraW5nIGNvcHkpCkBAIC00MCw2ICs0MCw3IEBACiAjaWZuZGVmIF9fR1RLX1hUQklOX0hf XwogI2RlZmluZSBfX0dUS19YVEJJTl9IX18KIAorI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1 ZGUgPGd0ay9ndGsuaD4KICNpZm5kZWYgR1RLX0FQSV9WRVJTSU9OXzIKICNpbmNsdWRlIDxndGsv Z3RreC5oPgo= 206350 2013-07-09 13:44:29 -0700 2013-07-10 09:34:15 -0700 Updated patch - addresses the style issues reported webkitgtk-gtk2-buildfix.patch text/plain 2113 dimstar SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MjQ5NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEzLTA3LTA5ICBEb21pbmlx dWUgTGV1ZW5iZXJnZXIgIDxkaW1zdGFyQG9wZW5zdXNlLm9yZz4KKworICAgICAgICBGaXggYnVp bGQgYWdhaW5zdCBHVEsrIDIuMAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTE3ODk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgR1RLMiBidWlsZCBmYWlscyBmb3IgdW5kZWZpbmVkIEdES19JU19YMTFfRElT UExBWQorICAgICAgICBHVEsgMi4wIGRvZXMgZGVmaW5lIEdES19XSU5ET1dJTkdfWDExLGJ1dCBH REtfSVNfWDExX0RJU1BMQVkgaXMgbm90CisgICAgICAgIHByZXNlbnQgaW4gR1RLKyAyLjAuIEEg ZHVtbXkgZGVmaW5lcyBpcyBzdWZmaWNpZW50LCBhcyBHVEsgMi4wIGlzIG5vdAorICAgICAgICB0 aGF0IG11bHRpcGxlIGJhY2tlbmQgYXdhcmUgYW55d2F5Li4uCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ndGsvR3RrVmVyc2lvbmluZy5oOiBEZWZpbmUgR0RLX0lTX1gxMV9ESVNQTEFZIGZvciBHVEsr IDIuMAorICAgICAgICAgIGFuZCBjb21wYXRpYmlsaXR5IGZvciBndGtfd2lkZ2V0X2dldF9wcmVm ZXJyZWRfc2l6ZSgpCisgICAgICAgICogcGx1Z2lucy9ndGsvZ3RrMnh0YmluLmM6IEluY2x1ZGUg Y29uZmlnLmgKKwogMjAxMy0wNy0wOSAgcGVhdm9Ab3V0bG9vay5jb20gIDxwZWF2b0BvdXRsb29r LmNvbT4KIAogICAgICAgICBbV2luZG93c10gQ29tcGlsZSBmaXguCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmgJKHJldmlzaW9uIDE1MjQ5NSkKKysr IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmgJKHdvcmtpbmcgY29w eSkKQEAgLTQwLDYgKzQwLDE4IEBACiAKIEdka0RldmljZSogZ2V0RGVmYXVsdEdES1BvaW50ZXJE ZXZpY2UoR2RrV2luZG93KiB3aW5kb3cpOwogCisvLyBndGtfd2lkZ2V0X2dldF9wcmVmZXJyZWRf c2l6ZSgpIGFwcGVhcmVkIG9ubHkgaW4gR1RLIDMuMAorI2lmICFHVEtfQ0hFQ0tfVkVSU0lPTiAo MiwgOTEsIDApICAvKiBhcHByb3hpbWF0ZWx5ICAqLworI2RlZmluZSBndGtfd2lkZ2V0X2dldF9w cmVmZXJyZWRfc2l6ZSh3aWRnZXQsIG1pbmltdW1fc2l6ZSwgbmF0dXJhbF9zaXplKSBcCisgICAg ICAgIChndGtfd2lkZ2V0X3NpemVfcmVxdWVzdCgod2lkZ2V0KSwgKChtaW5pbXVtX3NpemUpKSkp CisjZW5kaWYKKworLy8gR1RLIDIuMCBjb21wYXRpYmlsaXR5CisjaWYgZGVmaW5lZChHREtfV0lO RE9XSU5HX1gxMSkgJiYgIWRlZmluZWQoR0RLX0lTX1gxMV9ESVNQTEFZKQorI2RlZmluZSBHREtf SVNfWDExX0RJU1BMQVkoZHB5KSAxCisjZW5kaWYKKworCiBHX0VORF9ERUNMUwogCiAjZW5kaWYg Ly8gR3RrVmVyc2lvbmluZ19oCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL2d0ay9ndGsy eHRiaW4uYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL2d0ay9ndGsyeHRi aW4uYwkocmV2aXNpb24gMTUyNDk1KQorKysgU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ndGsvZ3Rr Mnh0YmluLmMJKHdvcmtpbmcgY29weSkKQEAgLTQyLDYgKzQyLDcgQEAKICAqIGluc2lkZSBhIEdU SyBhcHBsaWNhdGlvbi4gIAogICovCiAKKyNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJH dGtWZXJzaW9uaW5nLmgiCiAjaW5jbHVkZSAieGVtYmVkLmgiCiAjaW5jbHVkZSAiZ3RrMnh0Ymlu LmgiCg== 206394 2013-07-10 09:34:15 -0700 2013-07-10 14:08:24 -0700 Another round - taking mrobinson's comment into account, that code comment should be sentences... webkitgtk-gtk2-buildfix.patch text/plain 2149 dimstar SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MjQ5NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEzLTA3LTA5ICBEb21pbmlx dWUgTGV1ZW5iZXJnZXIgIDxkaW1zdGFyQG9wZW5zdXNlLm9yZz4KKworICAgICAgICBGaXggYnVp bGQgYWdhaW5zdCBHVEsrIDIuMAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTE3ODk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgR1RLMiBidWlsZCBmYWlscyBmb3IgdW5kZWZpbmVkIEdES19JU19YMTFfRElT UExBWQorICAgICAgICBHVEsgMi4wIGRvZXMgZGVmaW5lIEdES19XSU5ET1dJTkdfWDExLGJ1dCBH REtfSVNfWDExX0RJU1BMQVkgaXMgbm90CisgICAgICAgIHByZXNlbnQgaW4gR1RLKyAyLjAuIEEg ZHVtbXkgZGVmaW5lcyBpcyBzdWZmaWNpZW50LCBhcyBHVEsgMi4wIGlzIG5vdAorICAgICAgICB0 aGF0IG11bHRpcGxlIGJhY2tlbmQgYXdhcmUgYW55d2F5Li4uCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ndGsvR3RrVmVyc2lvbmluZy5oOiBEZWZpbmUgR0RLX0lTX1gxMV9ESVNQTEFZIGZvciBHVEsr IDIuMAorICAgICAgICAgIGFuZCBjb21wYXRpYmlsaXR5IGZvciBndGtfd2lkZ2V0X2dldF9wcmVm ZXJyZWRfc2l6ZSgpCisgICAgICAgICogcGx1Z2lucy9ndGsvZ3RrMnh0YmluLmM6IEluY2x1ZGUg Y29uZmlnLmgKKwogMjAxMy0wNy0wOSAgcGVhdm9Ab3V0bG9vay5jb20gIDxwZWF2b0BvdXRsb29r LmNvbT4KIAogICAgICAgICBbV2luZG93c10gQ29tcGlsZSBmaXguCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmgJKHJldmlzaW9uIDE1MjQ5NSkKKysr IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmgJKHdvcmtpbmcgY29w eSkKQEAgLTQwLDYgKzQwLDE4IEBACiAKIEdka0RldmljZSogZ2V0RGVmYXVsdEdES1BvaW50ZXJE ZXZpY2UoR2RrV2luZG93KiB3aW5kb3cpOwogCisvLyBndGtfd2lkZ2V0X2dldF9wcmVmZXJyZWRf c2l6ZSgpIGFwcGVhcmVkIG9ubHkgaW4gR1RLIDMuMAorI2lmICFHVEtfQ0hFQ0tfVkVSU0lPTiAo MiwgOTEsIDApICAvKiBhcHByb3hpbWF0ZWx5ICovCisjZGVmaW5lIGd0a193aWRnZXRfZ2V0X3By ZWZlcnJlZF9zaXplKHdpZGdldCwgbWluaW11bV9zaXplLCBuYXR1cmFsX3NpemUpIFwKKyAgICAg ICAgKGd0a193aWRnZXRfc2l6ZV9yZXF1ZXN0KCh3aWRnZXQpLCAoKG1pbmltdW1fc2l6ZSkpKSkK KyNlbmRpZgorCisvLyBEZWZpbmUgR0RLX0lTX1gxMV9ESVNQTEFZIGR1bW15IGZvciBHVEsrIDIu MCBjb21wYXRpYmlsaXR5CisjaWYgZGVmaW5lZChHREtfV0lORE9XSU5HX1gxMSkgJiYgIWRlZmlu ZWQoR0RLX0lTX1gxMV9ESVNQTEFZKQorI2RlZmluZSBHREtfSVNfWDExX0RJU1BMQVkoZHB5KSAx CisjZW5kaWYKKworCiBHX0VORF9ERUNMUwogCiAjZW5kaWYgLy8gR3RrVmVyc2lvbmluZ19oCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL2d0ay9ndGsyeHRiaW4uYwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL2d0ay9ndGsyeHRiaW4uYwkocmV2aXNpb24gMTUyNDk1 KQorKysgU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ndGsvZ3RrMnh0YmluLmMJKHdvcmtpbmcgY29w eSkKQEAgLTQyLDYgKzQyLDcgQEAKICAqIGluc2lkZSBhIEdUSyBhcHBsaWNhdGlvbi4gIAogICov CiAKKyNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJHdGtWZXJzaW9uaW5nLmgiCiAjaW5j bHVkZSAieGVtYmVkLmgiCiAjaW5jbHVkZSAiZ3RrMnh0YmluLmgiCg== 206413 2013-07-10 14:08:24 -0700 2013-07-15 10:18:07 -0700 Next iteration of patch after review by mrobinson... webkitgtk-gtk2-buildfix.patch text/plain 2242 dimstar SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MjQ5NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEzLTA3LTA5ICBEb21pbmlx dWUgTGV1ZW5iZXJnZXIgIDxkaW1zdGFyQG9wZW5zdXNlLm9yZz4KKworICAgICAgICBGaXggYnVp bGQgYWdhaW5zdCBHVEsrIDIuMAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTE3ODk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgR1RLMiBidWlsZCBmYWlscyBmb3IgdW5kZWZpbmVkIEdES19JU19YMTFfRElT UExBWQorICAgICAgICBHVEsgMi4wIGRvZXMgZGVmaW5lIEdES19XSU5ET1dJTkdfWDExLGJ1dCBH REtfSVNfWDExX0RJU1BMQVkgaXMgbm90CisgICAgICAgIHByZXNlbnQgaW4gR1RLKyAyLjAuIEEg ZHVtbXkgZGVmaW5lcyBpcyBzdWZmaWNpZW50LCBhcyBHVEsgMi4wIGlzIG5vdAorICAgICAgICB0 aGF0IG11bHRpcGxlIGJhY2tlbmQgYXdhcmUgYW55d2F5Li4uCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ndGsvR3RrVmVyc2lvbmluZy5oOiBEZWZpbmUgR0RLX0lTX1gxMV9ESVNQTEFZIGZvciBHVEsr IDIuMAorICAgICAgICAgIGFuZCBjb21wYXRpYmlsaXR5IGZvciBndGtfd2lkZ2V0X2dldF9wcmVm ZXJyZWRfc2l6ZSgpCisgICAgICAgICogcGx1Z2lucy9ndGsvZ3RrMnh0YmluLmM6IEluY2x1ZGUg Y29uZmlnLmgKKwogMjAxMy0wNy0wOSAgcGVhdm9Ab3V0bG9vay5jb20gIDxwZWF2b0BvdXRsb29r LmNvbT4KIAogICAgICAgICBbV2luZG93c10gQ29tcGlsZSBmaXguCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmgJKHJldmlzaW9uIDE1MjQ5NSkKKysr IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmgJKHdvcmtpbmcgY29w eSkKQEAgLTQwLDYgKzQwLDIxIEBACiAKIEdka0RldmljZSogZ2V0RGVmYXVsdEdES1BvaW50ZXJE ZXZpY2UoR2RrV2luZG93KiB3aW5kb3cpOwogCisvLyBndGtfd2lkZ2V0X2dldF9wcmVmZXJyZWRf c2l6ZSgpIGFwcGVhcmVkIG9ubHkgaW4gR1RLIDMuMC4KKyNpZiAhR1RLX0NIRUNLX1ZFUlNJT04g KDIsIDkxLCAwKSAgLy8gZ3RrX3dpZGdldF9nZXRfcHJlZmVycmVkX3NpemUgYXBwZWFyZWQgYWJv dXQgdGhlbi4KKyNkZWZpbmUgZ3RrX3dpZGdldF9nZXRfcHJlZmVycmVkX3NpemUod2lkZ2V0LCBt aW5pbXVtU2l6ZSwgbmF0dXJhbFNpemUpIFwKKyAgICAgICAgKGd0a193aWRnZXRfc2l6ZV9yZXF1 ZXN0KCh3aWRnZXQpLCAoKG1pbmltdW1TaXplKSkpKQorI2VuZGlmCisKKy8vIERlZmluZSBHREtf SVNfWDExX0RJU1BMQVkgZHVtbXkgZm9yIEdUSysgMi4wIGNvbXBhdGliaWxpdHkuCisjaWZuZGVm IEdES19JU19YMTFfRElTUExBWQorICAjaWZkZWYgR0RLX1dJTkRPV0lOR19YMTEKKyAgICAjZGVm aW5lIEdES19JU19YMTFfRElTUExBWShkaXNwbGF5KSAxCisgICNlbHNlCisgICAgI2RlZmluZSBH REtfSVNfWDExX0RJU1BMQVkoZGlzcGxheSkgMAorICAjZW5kaWYKKyNlbmRpZgorCiBHX0VORF9E RUNMUwogCiAjZW5kaWYgLy8gR3RrVmVyc2lvbmluZ19oCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9w bHVnaW5zL2d0ay9ndGsyeHRiaW4uYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbHVn aW5zL2d0ay9ndGsyeHRiaW4uYwkocmV2aXNpb24gMTUyNDk1KQorKysgU291cmNlL1dlYkNvcmUv cGx1Z2lucy9ndGsvZ3RrMnh0YmluLmMJKHdvcmtpbmcgY29weSkKQEAgLTQyLDYgKzQyLDcgQEAK ICAqIGluc2lkZSBhIEdUSyBhcHBsaWNhdGlvbi4gIAogICovCiAKKyNpbmNsdWRlICJjb25maWcu aCIKICNpbmNsdWRlICJHdGtWZXJzaW9uaW5nLmgiCiAjaW5jbHVkZSAieGVtYmVkLmgiCiAjaW5j bHVkZSAiZ3RrMnh0YmluLmgiCg==