<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>62749</bug_id>
          
          <creation_ts>2011-06-15 13:03:14 -0700</creation_ts>
          <short_desc>[GTK] Build WebKit2 unconditionally</short_desc>
          <delta_ts>2011-09-07 00:43:33 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebKitGTK</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>PC</rep_platform>
          <op_sys>Linux</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>Gtk</keywords>
          <priority>P3</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          <dependson>63047</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Martin Robinson">mrobinson</reporter>
          <assigned_to name="Martin Robinson">mrobinson</assigned_to>
          <cc>alex</cc>
    
    <cc>cgarcia</cc>
    
    <cc>gustavo.noronha</cc>
    
    <cc>gustavo</cc>
    
    <cc>xan.lopez</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>421524</commentid>
    <comment_count>0</comment_count>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2011-06-15 13:03:14 -0700</bug_when>
    <thetext>We should build WebKit2 unconditionally. This has a couple big benefits:

1. This is how other ports work and many of the tools expect our build to work this way.
2. The bots would start detecting WebKit2 build issues.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>421528</commentid>
    <comment_count>1</comment_count>
      <attachid>97350</attachid>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2011-06-15 13:08:16 -0700</bug_when>
    <thetext>Created attachment 97350
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>421697</commentid>
    <comment_count>2</comment_count>
    <who name="Xan Lopez">xan.lopez</who>
    <bug_when>2011-06-15 18:56:12 -0700</bug_when>
    <thetext>As commented on jabber, I&apos;d like to see numbers of the difference in build times. I don&apos;t think we should regress significantly here, we are already doing (quite) badly.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>421727</commentid>
    <comment_count>3</comment_count>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2011-06-15 20:27:37 -0700</bug_when>
    <thetext>Here are my build times before an after the application of this patch. 

Before:
===========================================================
 WebKit is now built (09m:13s). 
 To run GtkLauncher with this newly-built code, use the
 &quot;Tools/Scripts/run-launcher&quot; script.
===========================================================

After:

===========================================================
 WebKit is now built (10m:09s). 
 To run GtkLauncher with this newly-built code, use the
 &quot;Tools/Scripts/run-launcher&quot; script.
===========================================================</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>421739</commentid>
    <comment_count>4</comment_count>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2011-06-15 20:43:21 -0700</bug_when>
    <thetext>Perhaps a more illustrative example would be the difference in incremental build time after touching a single file in WebCore:

Before:

==========================================================
 WebKit is now built (00m:30s). 
 To run GtkLauncher with this newly-built code, use the
 &quot;Tools/Scripts/run-launcher&quot; script.
===========================================================

After:

===========================================================
 WebKit is now built (00m:32s). 
 To run GtkLauncher with this newly-built code, use the
 &quot;Tools/Scripts/run-launcher&quot; script.
===========================================================

So really the overhead is not something that should affect most builds.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>421805</commentid>
    <comment_count>5</comment_count>
      <attachid>97350</attachid>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2011-06-15 23:42:36 -0700</bug_when>
    <thetext>Comment on attachment 97350
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=97350&amp;action=review

You should also remove the AC_ARG_ENABLE(webkit2, But instead of removing it, I would simply change the default option to enable it by default, so that people can still disable it if they want to save build time or simply don&apos;t need wk2. Changing the AC_ARG_ENABLE macro to be something like this would be enough:

AC_ARG_ENABLE(webkit2,
            AC_HELP_STRING([--enable-webkit2],
                [build webkit2 [default=yes]]),
                [], [enable_webkit2=&quot;yes&quot;])

&gt; Source/WebKit2/GNUmakefile.am:-835
&gt; -pkgconfig_DATA += Source/WebKit2/gtk/@WEBKITGTK_PC_NAME@2-@WEBKITGTK_API_VERSION@.pc
&gt; -

why removing the pc file?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>423845</commentid>
    <comment_count>6</comment_count>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2011-06-20 12:17:35 -0700</bug_when>
    <thetext>(In reply to comment #5)
&gt; (From update of attachment 97350 [details])
&gt; View in context: https://bugs.webkit.org/attachment.cgi?id=97350&amp;action=review
&gt; 
&gt; You should also remove the AC_ARG_ENABLE(webkit2, But instead of removing it, I would simply change the default option to enable it by default, so that people can still disable it if they want to save build time or simply don&apos;t need wk2. Changing the AC_ARG_ENABLE macro to be something like this would be enough:

Okay. I&apos;ve done this. This made the patch quite a bit smaller.

&gt; why removing the pc file?

Since it&apos;s on by default now, we shouldn&apos;t ship the PC file until we are ready to ship WebKit2 officially.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>423849</commentid>
    <comment_count>7</comment_count>
      <attachid>97837</attachid>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2011-06-20 12:18:44 -0700</bug_when>
    <thetext>Created attachment 97837
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>424002</commentid>
    <comment_count>8</comment_count>
      <attachid>97837</attachid>
    <who name="Collabora GTK+ EWS bot">gustavo.noronha</who>
    <bug_when>2011-06-20 15:40:43 -0700</bug_when>
    <thetext>Comment on attachment 97837
Patch

Attachment 97837 did not pass gtk-ews (gtk):
Output: http://queues.webkit.org/results/8907732</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>424026</commentid>
    <comment_count>9</comment_count>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2011-06-20 16:01:18 -0700</bug_when>
    <thetext>Looks like we should make GTK+ 3.x the default on the bots before landing this patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>424305</commentid>
    <comment_count>10</comment_count>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2011-06-20 23:55:30 -0700</bug_when>
    <thetext>(In reply to comment #9)
&gt; Looks like we should make GTK+ 3.x the default on the bots before landing this patch.

https://bugs.webkit.org/show_bug.cgi?id=63047</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>458243</commentid>
    <comment_count>11</comment_count>
      <attachid>97837</attachid>
    <who name="Xan Lopez">xan.lopez</who>
    <bug_when>2011-08-29 09:21:21 -0700</bug_when>
    <thetext>Comment on attachment 97837
Patch

OK.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>458351</commentid>
    <comment_count>12</comment_count>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2011-08-29 12:19:15 -0700</bug_when>
    <thetext>Committed r94000: &lt;http://trac.webkit.org/changeset/94000&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>458728</commentid>
    <comment_count>13</comment_count>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2011-08-29 23:27:45 -0700</bug_when>
    <thetext>(In reply to comment #12)
&gt; Committed r94000: &lt;http://trac.webkit.org/changeset/94000&gt;

This patch removes the rules to create the pkg-config file from configure and makefiles. That was already reworked in http://trac.webkit.org/changeset/92263, and it was part of the preparation for the gtk api. Would it be possible to add it again, please?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>462587</commentid>
    <comment_count>14</comment_count>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2011-09-06 09:25:26 -0700</bug_when>
    <thetext>(In reply to comment #13)
&gt; (In reply to comment #12)
&gt; &gt; Committed r94000: &lt;http://trac.webkit.org/changeset/94000&gt;
&gt; 
&gt; This patch removes the rules to create the pkg-config file from configure and makefiles. That was already reworked in http://trac.webkit.org/changeset/92263, and it was part of the preparation for the gtk api. Would it be possible to add it again, please?

I think it&apos;s important to disable installing pkgconfig files until we officially ship WebKit2. Would it be acceptable to re-enable it behind a configure flag? Another option would be to only enable WebKit2 when running build-webkit. What do you think?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>463211</commentid>
    <comment_count>15</comment_count>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2011-09-07 00:43:33 -0700</bug_when>
    <thetext>(In reply to comment #14)
&gt; (In reply to comment #13)
&gt; &gt; (In reply to comment #12)
&gt; &gt; &gt; Committed r94000: &lt;http://trac.webkit.org/changeset/94000&gt;
&gt; &gt; 
&gt; &gt; This patch removes the rules to create the pkg-config file from configure and makefiles. That was already reworked in http://trac.webkit.org/changeset/92263, and it was part of the preparation for the gtk api. Would it be possible to add it again, please?
&gt; 
&gt; I think it&apos;s important to disable installing pkgconfig files until we officially ship WebKit2. Would it be acceptable to re-enable it behind a configure flag? Another option would be to only enable WebKit2 when running build-webkit. What do you think?

I don&apos;t see why, we are currently installing the headers and the .so when webkit is compiled with webkit2, why not install the pc file too? or why don&apos;t we disable the installation of the headers and .so then? I don&apos;t use build-webkit, if someone doesn&apos;t want webkit2 it can still be disabled with --disable-webkit2.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>97350</attachid>
            <date>2011-06-15 13:08:16 -0700</date>
            <delta_ts>2011-06-20 12:18:42 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-62749-20110615130816.patch</filename>
            <type>text/plain</type>
            <size>6057</size>
            <attacher name="Martin Robinson">mrobinson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogODg5NDkKZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5n
ZUxvZwppbmRleCA3YWVjMjlkNjA3ODRkNzQ3ZDI5YWExMmFmMjdkMzdiODg2YTEwODk1Li43NjY2
MDhiNjAxMmQ0ZjAwYzJlOTg1MzQ3N2Q3ZDc5NTQ3NzdmNmJmIDEwMDY0NAotLS0gYS9DaGFuZ2VM
b2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDYtMTUgIE1hcnRpbiBS
b2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIEJ1aWxkIFdlYktpdDIgdW5jb25kaXRpb25h
bGx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02Mjc0
OQorCisgICAgICAgICogR05VbWFrZWZpbGUuYW06IERvIG5vdCBpbmNsdWRlIFdlYktpdDIgYXV0
b21ha2UgZmlsZXMgY29uZGl0aW9uYWxseS4KKyAgICAgICAgKiBjb25maWd1cmUuYWM6IFJlbW92
ZSAiLS1lbmFibGUtd2Via2l0MiIgb3B0aW9uLgorCiAyMDExLTA2LTE0ICBSeXVhbiBDaG9pICA8
cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRl
bC4KZGlmZiAtLWdpdCBhL0dOVW1ha2VmaWxlLmFtIGIvR05VbWFrZWZpbGUuYW0KaW5kZXggOWM4
OGMxOWM3YmU5ZTk4ZGQzOGZlNmE1MGJiN2JhYjk3NDgyODFmNC4uYmZmZTg2YzZlZjhhMzI0YzBh
MmZlNDQ4MjM2NDY4MTQ3YTg0OTJjMSAxMDA2NDQKLS0tIGEvR05VbWFrZWZpbGUuYW0KKysrIGIv
R05VbWFrZWZpbGUuYW0KQEAgLTE5NSwxNSArMTk1LDExIEBAIGluY2x1ZGUgU291cmNlL0phdmFT
Y3JpcHRDb3JlL0dOVW1ha2VmaWxlLmFtCiBpbmNsdWRlIFNvdXJjZS9XZWJDb3JlL0dOVW1ha2Vm
aWxlLmFtCiBpbmNsdWRlIFNvdXJjZS9XZWJLaXQvZ3RrL0dOVW1ha2VmaWxlLmFtCiBpbmNsdWRl
IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2dvYmplY3QvR05VbWFrZWZpbGUuYW0KLWluY2x1ZGUg
VG9vbHMvR05VbWFrZWZpbGUuYW0KIGluY2x1ZGUgU291cmNlL1dlYktpdC9ndGsvcG8vR05VbWFr
ZWZpbGUuYW0KLWlmIEVOQUJMRV9XRUJLSVQyCiBpbmNsdWRlIFNvdXJjZS9XZWJLaXQyL0dOVW1h
a2VmaWxlLmFtCitpbmNsdWRlIFRvb2xzL0dOVW1ha2VmaWxlLmFtCiBpbmNsdWRlIFRvb2xzL01p
bmlCcm93c2VyL2d0ay9HTlVtYWtlZmlsZS5hbQogaW5jbHVkZSBUb29scy9XZWJLaXRUZXN0UnVu
bmVyL0dOVW1ha2VmaWxlLmFtCi0jIFtHVEtdIFJlZmFjdG9yIHRoZSB0cmFuc2xhdGlvbnMgbm93
IHRoYXQgd2UgaGF2ZSB3ZWJraXQyCi0jIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD01NTE1MwotZW5kaWYKIAogIyBBdXRvZ2VuZXJhdGVkIHNvdXJjZXMKIEJVSUxUX1NP
VVJDRVMgKz0gXApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNl
L1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDllMDcyYmM5MjI4MzllNjAxZDRlZWQ0ZmNlN2RlMWY4
M2Q5MWI3MGYuLmRlOGMyYmUyM2M4YWY0YTc1ZDAzN2M1NDIxMjcwM2Y4MTVjN2U1MjYgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFu
Z2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMS0wNi0xNSAgTWFydGluIFJvYmluc29uICA8bXJv
Ymluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgW0dUS10gQnVpbGQgV2ViS2l0MiB1bmNvbmRpdGlvbmFsbHkKKyAgICAgICAg
aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyNzQ5CisKKyAgICAgICAg
KiBHTlVtYWtlZmlsZS5hbTogUmVtb3ZlIFdlYktpdDIgUEMgZmlsZS4gV2UgY2FuIHJldmlzaXQg
Y3JlYXRpbmcgdGhpcworICAgICAgICBmaWxlIHdoZW4gd2UgZGVjaWRlIHRvIHNoaXAgV2ViS2l0
MiBvZmZpY2lhbGx5LgorCiAyMDExLTA2LTE1ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcu
Ym90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByODg5MDcu
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9HTlVtYWtlZmlsZS5hbSBiL1NvdXJjZS9XZWJL
aXQyL0dOVW1ha2VmaWxlLmFtCmluZGV4IDQ5ZWNhNGYyNDY1MjBkYWUxMzcxODUxOGVkOTdjNDIw
N2NmYzg3ZGUuLjU5ZWJhMWU3Zjk2ZTg0NzYwMGQ3MjJhM2ZlZTM5MmMzOGQ1NjY4NTAgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmFtCisrKyBiL1NvdXJjZS9XZWJLaXQy
L0dOVW1ha2VmaWxlLmFtCkBAIC04MzEsOCArODMxLDYgQEAgbGlid2Via2l0Mmd0a19AV0VCS0lU
R1RLX0FQSV9NQUpPUl9WRVJTSU9OQF9AV0VCS0lUR1RLX0FQSV9NSU5PUl9WRVJTSU9OQF9sYV9M
SUIKIAkkKFVOSUNPREVfTElCUykgXAogCSQoWFRfTElCUykKIAotcGtnY29uZmlnX0RBVEEgKz0g
U291cmNlL1dlYktpdDIvZ3RrL0BXRUJLSVRHVEtfUENfTkFNRUAyLUBXRUJLSVRHVEtfQVBJX1ZF
UlNJT05ALnBjCi0KICMgV2ViS2l0MiBzcGVjaWZpYyB2YXJpYWJsZXMKIHdlYmtpdDJfYnVpbHRf
c291cmNlcyArPSBcCiAJRGVyaXZlZFNvdXJjZXMvV2ViS2l0Mi9BdXRoZW50aWNhdGlvbk1hbmFn
ZXJNZXNzYWdlUmVjZWl2ZXIuY3BwIFwKQEAgLTk1Myw3ICs5NTEsNiBAQCBEZXJpdmVkU291cmNl
cy9XZWJLaXQyLyVNZXNzYWdlcy5oOiAlLm1lc3NhZ2VzLmluICQobWVzc2FnZV9nZW5fc2NyaXB0
cykKIAogQ0xFQU5GSUxFUyArPSBcCiAJJChCVUlMVF9TT1VSQ0VTKSBcCi0JJCh0b3BfYnVpbGRk
aXIpL1dlYktpdDIvZ3RrL0BXRUJLSVRHVEtfUENfTkFNRUAtQFdFQktJVEdUS19BUElfVkVSU0lP
TkAucGMgXAogCSQodG9wX2J1aWxkZGlyKS9Qcm9ncmFtcy9XZWJLaXRXZWJQcm9jZXNzCiAKICMg
V2ViS2l0V2ViUHJvY2VzcwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hh
bmdlTG9nCmluZGV4IGVlZTNmN2EzYWZmYzExOTkwNDU0NDBjZDdkM2JhYzhmZmUyNWUxZDYuLmZl
ZjQzYTAxYWQ4OTgzODNhMDRjYjU0ODFjMzU1OGEwNGUwN2I4NWQgMTAwNjQ0Ci0tLSBhL1Rvb2xz
L0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxMS0w
Ni0xNSAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gQnVpbGQgV2ViS2l0
MiB1bmNvbmRpdGlvbmFsbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i
dWcuY2dpP2lkPTYyNzQ5CisKKyAgICAgICAgKiBHTlVtYWtlZmlsZS5hbTogUmVtb3ZlIEVOQUJM
RV9XRUJLSVQyIGd1YXJkcy4KKwogMjAxMS0wNi0xNSAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnpp
bW1lcm1hbm5AcmltLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBIeWF0dC4KZGlm
ZiAtLWdpdCBhL1Rvb2xzL0dOVW1ha2VmaWxlLmFtIGIvVG9vbHMvR05VbWFrZWZpbGUuYW0KaW5k
ZXggYjMwM2QwNjhjOTZmYzI4MzExNGVmNWYyNTg1NmE0YzY4NGJmZmExYi4uMmExYjQxZDA1MGNm
YzlkMzI1M2MzZGEyMjJmOThiYmFkM2UxZGJhYSAxMDA2NDQKLS0tIGEvVG9vbHMvR05VbWFrZWZp
bGUuYW0KKysrIGIvVG9vbHMvR05VbWFrZWZpbGUuYW0KQEAgLTMsMTAgKzMsOCBAQCBub2luc3Rf
UFJPR1JBTVMgKz0gXAogCVByb2dyYW1zL0d0a0xhdW5jaGVyIFwKIAlQcm9ncmFtcy9JbWFnZURp
ZmYKIAotaWYgRU5BQkxFX1dFQktJVDIKIG5vaW5zdF9QUk9HUkFNUyArPSBcCiAJUHJvZ3JhbXMv
R3RrTGF1bmNoZXIyCi1lbmRpZgogCiAjIEd0a0xhdW5jaGVyCiBndGtsYXVuY2hlcl9zb3VyY2Vz
ID0gXApAQCAtNTEsNyArNDksNiBAQCBQcm9ncmFtc19HdGtMYXVuY2hlcl9MREFERCA9IFwKIFBy
b2dyYW1zX0d0a0xhdW5jaGVyX0xERkxBR1MgPSBcCiAJJChndGtsYXVuY2hlcl9sZGZsYWdzKQog
Ci1pZiBFTkFCTEVfV0VCS0lUMgogUHJvZ3JhbXNfR3RrTGF1bmNoZXIyX0NQUEZMQUdTID0gXAog
CS1JJChzcmNkaXIpL1NvdXJjZSBcCiAJLUkkKHRvcF9idWlsZGRpcikvRGVyaXZlZFNvdXJjZXMv
V2ViS2l0Mi9pbmNsdWRlIFwKQEAgLTc3LDggKzc0LDYgQEAgUHJvZ3JhbXNfR3RrTGF1bmNoZXIy
X0xEQUREID0gXAogUHJvZ3JhbXNfR3RrTGF1bmNoZXIyX0xERkxBR1MgPSBcCiAJJChndGtsYXVu
Y2hlcl9sZGZsYWdzKQogCi1lbmRpZgotCiAjIGxpYldlYkNvcmVJbnRlcm5hbHMKICMgV2UgbXVz
dCBzcGxpdCBvZmYgdGhlIHdpbmRvdy5pbnRlcm5hbHMgaW1wbGVtZW50YXRpb24gaW50byBhIHNl
cGFyYXRlCiAjIGNvbnZlbmllbmNlIGxpYnJhcnkgYmVjYXVzZSBpdCByZXF1aXJlcyBhIGRpZmZl
cmVudCBpbmNsdWRlIHBhdGggb3JkZXIKQEAgLTIzMywxMyArMjI4LDkgQEAgUHJvZ3JhbXNfSW1h
Z2VEaWZmX0xERkxBR1MgPSBcCiBDTEVBTkZJTEVTICs9IFwKIAlQcm9ncmFtcy9EdW1wUmVuZGVy
VHJlZSBcCiAJUHJvZ3JhbXMvR3RrTGF1bmNoZXIgXAorCVByb2dyYW1zL0d0a0xhdW5jaGVyMiBc
CiAJUHJvZ3JhbXMvSW1hZ2VEaWZmCiAKLWlmIEVOQUJMRV9XRUJLSVQyCi1DTEVBTkZJTEVTICs9
IFwKLQlQcm9ncmFtcy9HdGtMYXVuY2hlcjIKLWVuZGlmCi0KIGlmIFRBUkdFVF9YMTEKIAogIyBC
dWlsZCBUZXN0TmV0c2NhcGVQbHVnaW4gb25seSBmb3IgWDExCmRpZmYgLS1naXQgYS9jb25maWd1
cmUuYWMgYi9jb25maWd1cmUuYWMKaW5kZXggNDcyNTBhZDkxYTA4YmI1ZmIxMTA2MDE1NTMwZDJi
ZmEwMWExY2UxOS4uNzIwMDA4NDRjNmMwODhiMGI4ZTQ1M2IzNTM3ZjI4MDE1MzhiNTZkMyAxMDA2
NDQKLS0tIGEvY29uZmlndXJlLmFjCisrKyBiL2NvbmZpZ3VyZS5hYwpAQCAtMTE1Nyw3ICsxMTU3
LDYgQEAgQU1fQ09ORElUSU9OQUwoW0VOQUJMRV9XRUJfU09DS0VUU10sW3Rlc3QgIiRlbmFibGVf
d2ViX3NvY2tldHMiID0gInllcyJdKQogQU1fQ09ORElUSU9OQUwoW0VOQUJMRV9XRUJfQVVESU9d
LFt0ZXN0ICIkZW5hYmxlX3dlYl9hdWRpbyIgPSAieWVzIl0pCiBBTV9DT05ESVRJT05BTChbRU5B
QkxFX1dFQl9USU1JTkddLFt0ZXN0ICIkZW5hYmxlX3dlYl90aW1pbmciID0gInllcyJdKQogQU1f
Q09ORElUSU9OQUwoW0VOQUJMRV9PUENPREVfU1RBVFNdLFt0ZXN0ICIkZW5hYmxlX29wY29kZV9z
dGF0cyIgPSAieWVzIl0pCi1BTV9DT05ESVRJT05BTChbRU5BQkxFX1dFQktJVDJdLFt0ZXN0ICIk
ZW5hYmxlX3dlYmtpdDIiID0gInllcyJdKQogQU1fQ09ORElUSU9OQUwoW0VOQUJMRV9QTFVHSU5f
UFJPQ0VTU10sW3Rlc3QgIiRlbmFibGVfcGx1Z2luX3Byb2Nlc3MiID0gInllcyJdKQogQU1fQ09O
RElUSU9OQUwoW0VOQUJMRV9TUEVMTENIRUNLXSxbdGVzdCAiJGVuYWJsZV9zcGVsbGNoZWNrIiA9
ICJ5ZXMiXSkKIEFNX0NPTkRJVElPTkFMKFtFTkFCTEVfQU5JTUFUSU9OX0FQSV0sW3Rlc3QgIiRl
bmFibGVfYW5pbWF0aW9uX2FwaSIgPSAieWVzIl0pCkBAIC0xMTg3LDE0ICsxMTg2LDYgQEAgU291
cmNlL1dlYktpdC9ndGsvamF2YXNjcmlwdGNvcmVndGstJHtXRUJLSVRHVEtfQVBJX1ZFUlNJT059
LnBjOlNvdXJjZS9XZWJLaXQvZ3QKICxbV0VCS0lUR1RLX0FQSV9WRVJTSU9OPSRXRUJLSVRHVEtf
QVBJX1ZFUlNJT04sV0VCS0lUR1RLX1BDX05BTUU9JFdFQktJVEdUS19QQ19OQU1FXQogKQogCi1p
ZiB0ZXN0ICIkZW5hYmxlX3dlYmtpdDIiID0gInllcyI7IHRoZW4KLSAgICBBQ19DT05GSUdfRklM
RVMoWwotICAgIFNvdXJjZS9XZWJLaXQyL2d0ay8ke1dFQktJVEdUS19QQ19OQU1FfTItJHtXRUJL
SVRHVEtfQVBJX1ZFUlNJT059LnBjOlNvdXJjZS9XZWJLaXQyL2d0ay93ZWJraXQyLnBjLmluCi0g
ICAgXQotICAgICxbV0VCS0lUR1RLX0FQSV9WRVJTSU9OPSRXRUJLSVRHVEtfQVBJX1ZFUlNJT04s
V0VCS0lUR1RLX1BDX05BTUU9JFdFQktJVEdUS19QQ19OQU1FXQotICAgICkKLWZpCi0KIEFDX09V
VFBVVAogCiBlY2hvICIK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>97837</attachid>
            <date>2011-06-20 12:18:44 -0700</date>
            <delta_ts>2011-08-29 09:21:21 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-62749-20110620121844.patch</filename>
            <type>text/plain</type>
            <size>3889</size>
            <attacher name="Martin Robinson">mrobinson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogODg5OTQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA3NzI4MzcyYWJmODA2ODU2
NzkxOWMwYjA3MDE0Njc3MmEwYTFiODBkLi4wZmFmOTZmM2EwYzY5OGU4NGM3MzgzOGZlZTg2Y2Zl
ZmFiMmMzZjFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291
cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDYtMjAgIE1hcnRp
biBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5
IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIEJ1aWxkIFdlYktpdDIgdW5jb25kaXRp
b25hbGx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02
Mjc0OQorCisgICAgICAgIEJ1aWxkIFdlYktpdDIgYnkgZGVmYXVsdC4gVGhpcyB3aWxsIG1ha2Ug
dGhlIGJvdHMgYnVpbGQgaXQgYW5kIGNhdGNoCisgICAgICAgIGJ1aWxkIGVycm9ycyB3aGVuIHRo
ZXkgb2NjdXIuCisKKyAgICAgICAgKiBHTlVtYWtlZmlsZS5hbTogRW5hYmxlIFdlYktpdDIgYnkg
ZGVmYXVsdCwgYnV0IHJlbW92ZSByZWZlcmVuY2VzIHRvIHRoZSBXZWJLaXQyCisgICAgICAgIFBD
IGZpbGUsIHdoaWNoIHNob3VsZCBub3QgYmUgc2hpcHBlZCB1bnRpbCBXZWJLaXQyIGlzIGFjdHVh
bGx5IHNoaXBwZWQgb2ZmaWNpYWxseS4KKwogMjAxMS0wNi0xNSAgUnl1YW4gQ2hvaSAgPHJ5dWFu
LmNob2lAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgUnViYmVyIHN0YW1wZWQgYnkgRXJpYyBTZWlk
ZWwuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9HTlVtYWtlZmlsZS5hbSBiL1NvdXJjZS9X
ZWJLaXQyL0dOVW1ha2VmaWxlLmFtCmluZGV4IGVlNWViODQ2YTdhNDhkNGQwZWZhZjYxNjljMzIx
YjYwNzhhNTA5OGYuLmY5ZGRhNzVhZTgxOTI1MDJmZTFjYTJmODBlYTRmOTcyMzhhNDkxYmMgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmFtCisrKyBiL1NvdXJjZS9XZWJL
aXQyL0dOVW1ha2VmaWxlLmFtCkBAIC04MzIsOCArODMyLDYgQEAgbGlid2Via2l0Mmd0a19AV0VC
S0lUR1RLX0FQSV9NQUpPUl9WRVJTSU9OQF9AV0VCS0lUR1RLX0FQSV9NSU5PUl9WRVJTSU9OQF9s
YV9MSUIKIAkkKFVOSUNPREVfTElCUykgXAogCSQoWFRfTElCUykKIAotcGtnY29uZmlnX0RBVEEg
Kz0gU291cmNlL1dlYktpdDIvZ3RrL0BXRUJLSVRHVEtfUENfTkFNRUAyLUBXRUJLSVRHVEtfQVBJ
X1ZFUlNJT05ALnBjCi0KICMgV2ViS2l0MiBzcGVjaWZpYyB2YXJpYWJsZXMKIHdlYmtpdDJfYnVp
bHRfc291cmNlcyArPSBcCiAJRGVyaXZlZFNvdXJjZXMvV2ViS2l0Mi9BdXRoZW50aWNhdGlvbk1h
bmFnZXJNZXNzYWdlUmVjZWl2ZXIuY3BwIFwKQEAgLTk1NCw3ICs5NTIsNiBAQCBEZXJpdmVkU291
cmNlcy9XZWJLaXQyLyVNZXNzYWdlcy5oOiAlLm1lc3NhZ2VzLmluICQobWVzc2FnZV9nZW5fc2Ny
aXB0cykKIAogQ0xFQU5GSUxFUyArPSBcCiAJJChCVUlMVF9TT1VSQ0VTKSBcCi0JJCh0b3BfYnVp
bGRkaXIpL1dlYktpdDIvZ3RrL0BXRUJLSVRHVEtfUENfTkFNRUAtQFdFQktJVEdUS19BUElfVkVS
U0lPTkAucGMgXAogCSQodG9wX2J1aWxkZGlyKS9Qcm9ncmFtcy9XZWJLaXRXZWJQcm9jZXNzCiAK
ICMgV2ViS2l0V2ViUHJvY2VzcwpkaWZmIC0tZ2l0IGEvY29uZmlndXJlLmFjIGIvY29uZmlndXJl
LmFjCmluZGV4IDQ3MjUwYWQ5MWEwOGJiNWZiMTEwNjAxNTUzMGQyYmZhMDFhMWNlMTkuLmFmZjZh
MGQxNTVlY2IxNTY0NWJjMGJiNGM5MTI1YjczYzg4MTJkN2UgMTAwNjQ0Ci0tLSBhL2NvbmZpZ3Vy
ZS5hYworKysgYi9jb25maWd1cmUuYWMKQEAgLTEwNTYsOSArMTA1Niw4IEBAIGZpCiAjIFdlYktp
dDIKIEFDX01TR19DSEVDS0lORyhbd2hldGhlciB0byBidWlsZCBXZWJraXQyXSkKIEFDX0FSR19F
TkFCTEUod2Via2l0MiwKLSAgICAgICAgICAgIEFDX0hFTFBfU1RSSU5HKFstLWVuYWJsZS13ZWJr
aXQyXSwKLSAgICAgICAgICAgICAgICBbYnVpbGQgd2Via2l0MiBbZGVmYXVsdD1ub11dKSwKLSAg
ICAgICAgICAgICAgICBbXSwgW2VuYWJsZV93ZWJraXQyPSJubyJdKQorICAgIEFDX0hFTFBfU1RS
SU5HKFstLWVuYWJsZS13ZWJraXQyXSwgW2J1aWxkIHdlYmtpdDIgW2RlZmF1bHQ9eWVzXV0pLAor
ICAgIFtdLCBbZW5hYmxlX3dlYmtpdDI9InllcyJdKQogQUNfTVNHX1JFU1VMVChbJGVuYWJsZV93
ZWJraXQyXSkKIAogIyBQbHVnaW4gUHJvY2VzcwpAQCAtMTE4NywxNCArMTE4Niw2IEBAIFNvdXJj
ZS9XZWJLaXQvZ3RrL2phdmFzY3JpcHRjb3JlZ3RrLSR7V0VCS0lUR1RLX0FQSV9WRVJTSU9OfS5w
YzpTb3VyY2UvV2ViS2l0L2d0CiAsW1dFQktJVEdUS19BUElfVkVSU0lPTj0kV0VCS0lUR1RLX0FQ
SV9WRVJTSU9OLFdFQktJVEdUS19QQ19OQU1FPSRXRUJLSVRHVEtfUENfTkFNRV0KICkKIAotaWYg
dGVzdCAiJGVuYWJsZV93ZWJraXQyIiA9ICJ5ZXMiOyB0aGVuCi0gICAgQUNfQ09ORklHX0ZJTEVT
KFsKLSAgICBTb3VyY2UvV2ViS2l0Mi9ndGsvJHtXRUJLSVRHVEtfUENfTkFNRX0yLSR7V0VCS0lU
R1RLX0FQSV9WRVJTSU9OfS5wYzpTb3VyY2UvV2ViS2l0Mi9ndGsvd2Via2l0Mi5wYy5pbgotICAg
IF0KLSAgICAsW1dFQktJVEdUS19BUElfVkVSU0lPTj0kV0VCS0lUR1RLX0FQSV9WRVJTSU9OLFdF
QktJVEdUS19QQ19OQU1FPSRXRUJLSVRHVEtfUENfTkFNRV0KLSAgICApCi1maQotCiBBQ19PVVRQ
VVQKIAogZWNobyAiCkBAIC0xMjYxLDE0ICsxMjUyLDE0IEBAIEZlYXR1cmVzOgogIEFuaW1hdGlv
biBBUEkgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDogJGVuYWJs
ZV9hbmltYXRpb25fYXBpCiAgVG91Y2ggSWNvbiBMb2FkaW5nIHN1cHBvcnQgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgOiAkZW5hYmxlX3RvdWNoX2ljb25fbG9hZGluZwogIFJlZ2lzdGVy
IFByb3RvY29sIEhhbmRsZXIgc3VwcG9ydCAgICAgICAgICAgICAgICAgICAgICAgIDogJGVuYWJs
ZV9yZWdpc3Rlcl9wcm90b2NvbF9oYW5kbGVyCisgV2ViS2l0MiBzdXBwb3J0ICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgOiAkZW5hYmxlX3dlYmtpdDIKKyBXZWJLaXQy
IHBsdWdpbiBwcm9jZXNzICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6ICRlbmFi
bGVfcGx1Z2luX3Byb2Nlc3MKIAogR1RLKyBjb25maWd1cmF0aW9uOgogIEdUSysgdmVyc2lvbiAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDogJHdpdGhfZ3RrCiAg
R0RLIHRhcmdldCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
OiAkd2l0aF90YXJnZXQKICBIaWxkb24gVUkgZXh0ZW5zaW9ucyAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICA6ICR3aXRoX2hpbGRvbgogIEludHJvc3BlY3Rpb24gc3VwcG9ydCAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDogJGVuYWJsZV9pbnRyb3NwZWN0aW9u
Ci0gV2ViS2l0MiBzdXBwb3J0ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgOiAkZW5hYmxlX3dlYmtpdDIKLSBXZWJLaXQyIHBsdWdpbiBwcm9jZXNzICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICA6ICRlbmFibGVfcGx1Z2luX3Byb2Nlc3MKICIKIGlmIHRl
c3QgIiR3aXRoX3VuaWNvZGVfYmFja2VuZCIgPSAiZ2xpYiI7IHRoZW4KICAgIGVjaG8gIiAgICAg
Pj4gV0FSTklORzogdGhlIGdsaWItYmFzZWQgdW5pY29kZSBiYWNrZW5kIGlzIHNsb3cgYW5kIGlu
Y29tcGxldGUgPDwiCg==
</data>
<flag name="review"
          id="91905"
          type_id="1"
          status="+"
          setter="xan.lopez"
    />
    <flag name="commit-queue"
          id="91954"
          type_id="3"
          status="-"
          setter="gustavo.noronha"
    />
          </attachment>
      

    </bug>

</bugzilla>