85045 2012-04-27 03:17:23 -0700 Fix minimal build. 2012-04-27 13:18:06 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 allan.jensen allan.jensen vestbo webkit.review.bot oldest_to_newest 611353 0 allan.jensen 2012-04-27 03:17:23 -0700 Build with --minimal currently fails because it makes multiple conflicting definition of ENABLE_XSLT. 611356 1 139161 allan.jensen 2012-04-27 03:20:16 -0700 Created attachment 139161 Patch 611413 2 139161 vestbo 2012-04-27 05:55:18 -0700 Comment on attachment 139161 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=139161&action=review > Source/WebCore/Target.pri:2914 > +} else { > + HEADERS += xml/parser/XMLDocumentParserScope.h > + SOURCES += \ > + xml/parser/XMLDocumentParserLibxml2.cpp \ > + xml/parser/XMLDocumentParserScope.cpp Please reverse this,ie, contains(DEFINES, WTF_USE_LIBXML2=1) {} else {} 611437 3 139188 allan.jensen 2012-04-27 06:30:31 -0700 Created attachment 139188 Patch Patch for landing 611823 4 139188 webkit.review.bot 2012-04-27 13:18:01 -0700 Comment on attachment 139188 Patch Clearing flags on attachment: 139188 Committed r115482: <http://trac.webkit.org/changeset/115482> 611824 5 webkit.review.bot 2012-04-27 13:18:06 -0700 All reviewed patches have been landed. Closing bug. 139161 2012-04-27 03:20:16 -0700 2012-04-27 06:30:23 -0700 Patch bug-85045-20120427122022.patch text/plain 3269 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1MTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODg2MzU3MzZhZjJjNGFm NjhjYWJkMjk1NTk3Yzc3MDY0YmE1ZGRkZS4uMmEzYjViNTI3MzE0YzZkY2ViODc1YzdlOWYxYzE4 MWZlNGJlYjQzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA0LTI3ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIFtR dF0gRml4IG1pbmltYWwgYnVpbGQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04NTA0NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIENvbXBpbGUgTElCWE1MIFhNTCBwYXJzZXIgZXZlbiBpZiBFTkFCTEVfWFNM VCBpcyBub3Qgc2V0LgorCisgICAgICAgICogVGFyZ2V0LnByaToKKwogMjAxMi0wNC0yNiAgQWxs YW4gU2FuZGZlbGQgSmVuc2VuICA8YWxsYW4uamVuc2VuQG5va2lhLmNvbT4KIAogICAgICAgICBN b3ZlIFdlYktpdDEgc3BlY2lmaWMgY29udmVyc2lvbiBvZiB0b3VjaC1ldmVudHMgdG8gV2ViS2l0 MS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1RhcmdldC5wcmkgYi9Tb3VyY2UvV2ViQ29y ZS9UYXJnZXQucHJpCmluZGV4IDJjMDBmN2ZhZGMyNDhiMDg1OTAwYzg1OWM3YmQ4YzI3MDg4OWQ4 MTkuLjkxNzQ0ZDE0MmRhNDI3NDljZWRkZGQyOWQ3ODJjMTFkY2M1NDRlZGMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL1RhcmdldC5wcmkKKysrIGIvU291cmNlL1dlYkNvcmUvVGFyZ2V0LnBy aQpAQCAtMjkwNyw2ICsyOTA3LDExIEBAIFNPVVJDRVMgKz0gXAogCiAhY29udGFpbnMoREVGSU5F UywgV1RGX1VTRV9MSUJYTUwyPTEpIHsKICAgICBTT1VSQ0VTICs9IHhtbC9wYXJzZXIvWE1MRG9j dW1lbnRQYXJzZXJRdC5jcHAKK30gZWxzZSB7CisgICAgSEVBREVSUyArPSB4bWwvcGFyc2VyL1hN TERvY3VtZW50UGFyc2VyU2NvcGUuaAorICAgIFNPVVJDRVMgKz0gXAorICAgICAgICAgICAgeG1s L3BhcnNlci9YTUxEb2N1bWVudFBhcnNlckxpYnhtbDIuY3BwIFwKKyAgICAgICAgICAgIHhtbC9w YXJzZXIvWE1MRG9jdW1lbnRQYXJzZXJTY29wZS5jcHAKIH0KIAogY29udGFpbnMoREVGSU5FUywg RU5BQkxFX1NNT09USF9TQ1JPTExJTkc9MSkgewpAQCAtMzMzMCwxNiArMzMzNSwxMyBAQCBjb250 YWlucyhERUZJTkVTLCBFTkFCTEVfWFNMVD0xKSB7CiAgICAgICAgICAgICB4bWwvWFNMSW1wb3J0 UnVsZS5jcHAgXAogICAgICAgICAgICAgeG1sL1hTTFRFeHRlbnNpb25zLmNwcCBcCiAgICAgICAg ICAgICB4bWwvWFNMSW1wb3J0UnVsZS5jcHAgXAotICAgICAgICAgICAgeG1sL1hTTFRVbmljb2Rl U29ydC5jcHAgXAotICAgICAgICAgICAgeG1sL3BhcnNlci9YTUxEb2N1bWVudFBhcnNlckxpYnht bDIuY3BwIFwKLSAgICAgICAgICAgIHhtbC9wYXJzZXIvWE1MRG9jdW1lbnRQYXJzZXJTY29wZS5j cHAKKyAgICAgICAgICAgIHhtbC9YU0xUVW5pY29kZVNvcnQuY3BwCiAKICAgICAgICAgICAgIEhF QURFUlMgKz0gXAogICAgICAgICAgICAgICAgIHhtbC9YU0xJbXBvcnRSdWxlLmggXAogICAgICAg ICAgICAgICAgIHhtbC9YU0xURXh0ZW5zaW9ucy5oIFwKICAgICAgICAgICAgICAgICB4bWwvWFNM SW1wb3J0UnVsZS5oIFwKLSAgICAgICAgICAgICAgICB4bWwvWFNMVFVuaWNvZGVTb3J0LmggXAot ICAgICAgICAgICAgICAgIHhtbC9wYXJzZXIvWE1MRG9jdW1lbnRQYXJzZXJTY29wZS5oCisgICAg ICAgICAgICAgICAgeG1sL1hTTFRVbmljb2RlU29ydC5oCiAKICAgICB9IGVsc2UgewogICAgICAg ICBTT1VSQ0VTICs9IFwKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5n ZUxvZwppbmRleCA2MTdjMGM1MGI3YmUzMTExNzc1ODExZGRkZGJjNmM0ZGY0ZjQ5NGUzLi42OGYy ZjliMzIxYTg3ZGM5ZjgxZDY2NGRjZGI2NjY1ZDA2NjM0ZWMwIDEwMDY0NAotLS0gYS9Ub29scy9D aGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDQt MjcgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFsbGFuLmplbnNlbkBub2tpYS5jb20+CisKKyAg ICAgICAgW1F0XSBGaXggbWluaW1hbCBidWlsZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTg1MDQ1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRG8gbm90IHNldCBjb25mbGljdGluZyB2YWx1ZXMgb2YgRU5B QkxFX1hTTFQuCisKKyAgICAgICAgKiBxbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2ZlYXR1cmVzLnBy ZjoKKwogMjAxMi0wNC0yNSAgTWlraGFpbCBQb3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlha292 QGludGVsLmNvbT4KIAogICAgICAgICBbRUZMXVtEUlRdIFJlc2V0IERSVCBzZXR0aW5ncyB0byB0 aGVpciBkZWZhdWx0IHZhbHVlcyBhZnRlciBhIHRlc3RjYXNlIHdhcyBleGVjdXRlZC4KZGlmZiAt LWdpdCBhL1Rvb2xzL3FtYWtlL21rc3BlY3MvZmVhdHVyZXMvZmVhdHVyZXMucHJmIGIvVG9vbHMv cW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9mZWF0dXJlcy5wcmYKaW5kZXggOGY2MTc1ZWNlNDc5NTRk MTAwN2M4OGZhMjRkZTk1YzVkMGQ3MjNlYi4uMTg2OWJhNDQyZDU4MzRiNjJlY2NlMDIyYTlkNGMx OWI0YWRmMGU4ZCAxMDA2NDQKLS0tIGEvVG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9mZWF0 dXJlcy5wcmYKKysrIGIvVG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9mZWF0dXJlcy5wcmYK QEAgLTE4NSw4ICsxODUsMTAgQEAgY29udGFpbnMoUVRfQ09ORklHLCBvcGVuZ2wpOiF3aW4zMi0q IHsKIH0KIAogIyBUaGlzIGlzIGV4cGVyaW1lbnRhbCBhbmQgb25seSB3b3JrcyBvbiBMaW51eCBz byBmYXIuCi1jb250YWlucyhERUZJTkVTLCBXVEZfVVNFX0xJQlhNTDI9MSkgewotICAgIERFRklO RVMgKz0gRU5BQkxFX1hTTFQ9MQorIWNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9YU0xUPS4pIHsK KyAgICBjb250YWlucyhERUZJTkVTLCBXVEZfVVNFX0xJQlhNTDI9MSkgeworICAgICAgICBERUZJ TkVTICs9IEVOQUJMRV9YU0xUPTEKKyAgICB9CiB9CiAKICMgZ2VvbG9jYXRpb24gc3VwcG9ydCBp ZiBRdE1vYmlsaXR5IGV4aXN0cwo= 139188 2012-04-27 06:30:31 -0700 2012-04-27 13:18:01 -0700 Patch bug-85045-20120427153037.patch text/plain 3278 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1NDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWY0ZTg1N2RhOTRhZGNh Yzk5MTJiNDRmNGE4YzA3MjFhZjRmYTlhZS4uMzI5NWU2ZWQwYmRjMDM2ODI1Mzg0ZGRlYzdlNDA0 ZjAzNWVmMDY3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA0LTI3ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIFtR dF0gRml4IG1pbmltYWwgYnVpbGQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04NTA0NQorCisgICAgICAgIFJldmlld2VkIGJ5IFRvciBBcm5lIFZlc3Ri w7guCisKKyAgICAgICAgQ29tcGlsZSBMSUJYTUwgWE1MIHBhcnNlciBldmVuIGlmIEVOQUJMRV9Y U0xUIGlzIG5vdCBzZXQuCisKKyAgICAgICAgKiBUYXJnZXQucHJpOgorCiAyMDEyLTA0LTI2ICBB bGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIElu c3BlY3RvcjogSW1wbGVtZW50IHRoZSAiRGlzYWJsZSBKYXZhU2NyaXB0IiBvcHRpb24gaW4gdGhl IHNldHRpbmdzIGRpYWxvZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvVGFyZ2V0LnByaSBi L1NvdXJjZS9XZWJDb3JlL1RhcmdldC5wcmkKaW5kZXggZGE5MzZlMzQ3MjA1NjIzNGRjMGE1ZmQw NDlmYjIzOTU3ZGQwNzkwMi4uNjFjMjMwZjI2MzJmOWFiMjlkYjk5ZGIwODFmZjFlOWFiNTEwYzNi OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvVGFyZ2V0LnByaQorKysgYi9Tb3VyY2UvV2Vi Q29yZS9UYXJnZXQucHJpCkBAIC0yOTA0LDcgKzI5MDQsMTIgQEAgU09VUkNFUyArPSBcCiAgICAg cGxhdGZvcm0vdGV4dC9xdC9UZXh0Q29kZWNRdC5jcHAgXAogICAgIHBsYXRmb3JtL3F0L1dpZGdl dFF0LmNwcAogCi0hY29udGFpbnMoREVGSU5FUywgV1RGX1VTRV9MSUJYTUwyPTEpIHsKK2NvbnRh aW5zKERFRklORVMsIFdURl9VU0VfTElCWE1MMj0xKSB7CisgICAgSEVBREVSUyArPSB4bWwvcGFy c2VyL1hNTERvY3VtZW50UGFyc2VyU2NvcGUuaAorICAgIFNPVVJDRVMgKz0gXAorICAgICAgICAg ICAgeG1sL3BhcnNlci9YTUxEb2N1bWVudFBhcnNlckxpYnhtbDIuY3BwIFwKKyAgICAgICAgICAg IHhtbC9wYXJzZXIvWE1MRG9jdW1lbnRQYXJzZXJTY29wZS5jcHAKK30gZWxzZSB7CiAgICAgU09V UkNFUyArPSB4bWwvcGFyc2VyL1hNTERvY3VtZW50UGFyc2VyUXQuY3BwCiB9CiAKQEAgLTMzMjks MTYgKzMzMzQsMTMgQEAgY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1hTTFQ9MSkgewogICAgICAg ICAgICAgeG1sL1hTTEltcG9ydFJ1bGUuY3BwIFwKICAgICAgICAgICAgIHhtbC9YU0xURXh0ZW5z aW9ucy5jcHAgXAogICAgICAgICAgICAgeG1sL1hTTEltcG9ydFJ1bGUuY3BwIFwKLSAgICAgICAg ICAgIHhtbC9YU0xUVW5pY29kZVNvcnQuY3BwIFwKLSAgICAgICAgICAgIHhtbC9wYXJzZXIvWE1M RG9jdW1lbnRQYXJzZXJMaWJ4bWwyLmNwcCBcCi0gICAgICAgICAgICB4bWwvcGFyc2VyL1hNTERv Y3VtZW50UGFyc2VyU2NvcGUuY3BwCisgICAgICAgICAgICB4bWwvWFNMVFVuaWNvZGVTb3J0LmNw cAogCiAgICAgICAgICAgICBIRUFERVJTICs9IFwKICAgICAgICAgICAgICAgICB4bWwvWFNMSW1w b3J0UnVsZS5oIFwKICAgICAgICAgICAgICAgICB4bWwvWFNMVEV4dGVuc2lvbnMuaCBcCiAgICAg ICAgICAgICAgICAgeG1sL1hTTEltcG9ydFJ1bGUuaCBcCi0gICAgICAgICAgICAgICAgeG1sL1hT TFRVbmljb2RlU29ydC5oIFwKLSAgICAgICAgICAgICAgICB4bWwvcGFyc2VyL1hNTERvY3VtZW50 UGFyc2VyU2NvcGUuaAorICAgICAgICAgICAgICAgIHhtbC9YU0xUVW5pY29kZVNvcnQuaAogCiAg ICAgfSBlbHNlIHsKICAgICAgICAgU09VUkNFUyArPSBcCmRpZmYgLS1naXQgYS9Ub29scy9DaGFu Z2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggN2EzMzUzOTFiZmNmOTA5MDViNTYwMmU3NWNk YTNiZGQ3NjUzM2FlZi4uZjE0ZDVmODhmMWE3ZmU3NGE2ZTMwMDE5MTYyYzc3YjI5ZjA1M2Y4YyAx MDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE0IEBACisyMDEyLTA0LTI3ICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5z ZW5Abm9raWEuY29tPgorCisgICAgICAgIFtRdF0gRml4IG1pbmltYWwgYnVpbGQuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTA0NQorCisgICAgICAg IFJldmlld2VkIGJ5IFRvciBBcm5lIFZlc3Riw7guCisKKyAgICAgICAgRG8gbm90IHNldCBjb25m bGljdGluZyB2YWx1ZXMgb2YgRU5BQkxFX1hTTFQuCisKKyAgICAgICAgKiBxbWFrZS9ta3NwZWNz L2ZlYXR1cmVzL2ZlYXR1cmVzLnByZjoKKwogMjAxMi0wNC0yNyAgUGhpbGlwcGUgTm9ybWFuZCAg PHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgR1RLIGdhcmRlbmlu Zy4KZGlmZiAtLWdpdCBhL1Rvb2xzL3FtYWtlL21rc3BlY3MvZmVhdHVyZXMvZmVhdHVyZXMucHJm IGIvVG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9mZWF0dXJlcy5wcmYKaW5kZXggNGUxYWMz N2UwNzIzZTA3ZDY3Y2VjYzNiNGMwNDBhMzM3OWZlOTQ5Ny4uZTIwYzRjODZhMzQ4ZDBjY2VlYTc4 ZWU2NzEzN2UyNjkyMTc4Mzk4NiAxMDA2NDQKLS0tIGEvVG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0 dXJlcy9mZWF0dXJlcy5wcmYKKysrIGIvVG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9mZWF0 dXJlcy5wcmYKQEAgLTE4NSw4ICsxODUsMTAgQEAgY29udGFpbnMoUVRfQ09ORklHLCBvcGVuZ2wp OiF3aW4zMi0qIHsKIH0KIAogIyBUaGlzIGlzIGV4cGVyaW1lbnRhbCBhbmQgb25seSB3b3JrcyBv biBMaW51eCBzbyBmYXIuCi1jb250YWlucyhERUZJTkVTLCBXVEZfVVNFX0xJQlhNTDI9MSkgewot ICAgIERFRklORVMgKz0gRU5BQkxFX1hTTFQ9MQorIWNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9Y U0xUPS4pIHsKKyAgICBjb250YWlucyhERUZJTkVTLCBXVEZfVVNFX0xJQlhNTDI9MSkgeworICAg ICAgICBERUZJTkVTICs9IEVOQUJMRV9YU0xUPTEKKyAgICB9CiB9CiAKICMgZ2VvbG9jYXRpb24g c3VwcG9ydCBpZiBRdE1vYmlsaXR5IGV4aXN0cwo=