69737 2011-10-09 21:27:07 -0700 [Qt] GeolocationClient cleanups 2011-10-13 15:10:51 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All Linux RESOLVED FIXED P2 Normal --- 59199 0 savagobr webkit-unassigned kenneth maheshk webkit.review.bot oldest_to_newest 480816 0 savagobr 2011-10-09 21:27:07 -0700 Implementing the FIXMEs: remove of using namespaces in header file. 480820 1 110324 savagobr 2011-10-09 21:35:21 -0700 Created attachment 110324 The patch: removed using namespaces in the header file 480952 2 maheshk 2011-10-10 07:26:48 -0700 I'm not sure if we really need this bug for these changes. Because IMO 1) Qt5 is made mandatory for trunk code which means that we do not have to keep mobility hooked up in trunk anymore for location atleast. 2) https://bugs.webkit.org/show_bug.cgi?id=59199 was good enough place to hook these changes with incase if we trunk still needs to support older qt module with older mobility. 481838 3 110560 savagobr 2011-10-11 12:49:34 -0700 Created attachment 110560 Allowing it compile with both Qt 4.x and Qt 5 (plus cleanups) The idea is to allow this WK1 code to compile with both Qt 4 and 5 (and in future to drop the ifdefs). 481927 4 110324 kenneth 2011-10-11 14:44:43 -0700 Comment on attachment 110324 The patch: removed using namespaces in the header file View in context: https://bugs.webkit.org/attachment.cgi?id=110324&action=review Please fix changelog before landing > Source/WebKit/qt/ChangeLog:6 > + Fixmes: remove of using namespace in header file. What does this mean? The patch is imcomplete? or you fixed some fixme's? 481933 5 110560 kenneth 2011-10-11 14:47:53 -0700 Comment on attachment 110560 Allowing it compile with both Qt 4.x and Qt 5 (plus cleanups) View in context: https://bugs.webkit.org/attachment.cgi?id=110560&action=review > Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.cpp:23 > - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Unrelated change, but ok > Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.cpp:40 > +#if QT_VERSION < 0x050000 Wasn't there a nicer way of writing this like #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) > Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.h:83 > +#if QT_VERSION < 0x050000 > QtMobility::QGeoPositionInfoSource* m_location; > +#elif QT_VERSION >= 0x050000 > + QGeoPositionInfoSource* m_location; > +#endif Wouldnt a "using namespace" be better when using old Qt? 481934 6 kenneth 2011-10-11 14:48:37 -0700 The first patch changes just seem to make patch 2 worse 483271 7 110560 hausmann 2011-10-13 10:19:09 -0700 Comment on attachment 110560 Allowing it compile with both Qt 4.x and Qt 5 (plus cleanups) View in context: https://bugs.webkit.org/attachment.cgi?id=110560&action=review Urgh, this is one mess of #ifdefs ;(. An alternative would be to split out the code into two files *Qt4 and *Qt5. Adenilson, do you mind doing another round with Kenneth's suggested changes at least? (unless you prefer the suggested split) > Source/WebKit/qt/QtWebKit.pro:287 > +qt5: QT += location Please indent this line :) 483351 8 110883 savagobr 2011-10-13 11:47:28 -0700 Created attachment 110883 Compiles with both Qt4/5, more tolerable use of ifdefs, better approach to test for Qt version 483414 9 110883 kenneth 2011-10-13 12:57:24 -0700 Comment on attachment 110883 Compiles with both Qt4/5, more tolerable use of ifdefs, better approach to test for Qt version View in context: https://bugs.webkit.org/attachment.cgi?id=110883&action=review Almost there! Almost there! Stay on target rogue leader... > Source/WebKit/qt/ChangeLog:10 > + Reviewed by Kenneth Rohde Christiansen. Move this up! Just after teh bugzilla url > Source/WebKit/qt/QtWebKit.pro:287 > +qt5: QT += location indentation! > Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.h:50 > +// This class provides an implementation of a GeolocationService for qtWebkit. QtWebKit! 483435 10 110894 savagobr 2011-10-13 13:28:14 -0700 Created attachment 110894 Fixed pending issues. 483541 11 110894 webkit.review.bot 2011-10-13 15:10:46 -0700 Comment on attachment 110894 Fixed pending issues. Clearing flags on attachment: 110894 Committed r97409: <http://trac.webkit.org/changeset/97409> 483542 12 webkit.review.bot 2011-10-13 15:10:51 -0700 All reviewed patches have been landed. Closing bug. 110324 2011-10-09 21:35:21 -0700 2011-10-13 11:47:28 -0700 The patch: removed using namespaces in the header file geoclean.patch text/plain 3083 savagobr RnJvbSBmYmY4Zjc2YjY4OTJjNjdiOTY1MjU3NGI2MWQ2M2RhYzIxOGFlMTZlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBZGVuaWxzb24gQ2F2YWxjYW50aSA8YWRlbmlsc29uLnNpbHZh QG9wZW5ib3NzYS5vcmc+CkRhdGU6IE1vbiwgMTAgT2N0IDIwMTEgMDA6MzI6MzIgLTA0MDAKU3Vi amVjdDogW1BBVENIXSBSZW1vdmluZyB0aGUgdXNlIG9mIG5hbWVzcGFjZXMgaW4gaGVhZGVyIGZp bGUuCgpTaWduZWQtb2ZmLWJ5OiBBZGVuaWxzb24gQ2F2YWxjYW50aSA8YWRlbmlsc29uLnNpbHZh QG9wZW5ib3NzYS5vcmc+Ci0tLQogU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgIDEzICsrKysrKysrKysrKysKIC4uLi9xdC9XZWJDb3JlU3VwcG9y dC9HZW9sb2NhdGlvbkNsaWVudFF0LmNwcCAgICAgIHwgICAgMSArCiAuLi4vV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50UXQuaCB8ICAgMTUgKysrKysrKystLS0tLS0t CiAzIGZpbGVzIGNoYW5nZWQsIDIyIGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3F0L0No YW5nZUxvZwppbmRleCBlYWJkODJhLi5mM2FmYWE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L3F0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE2IEBACisyMDExLTEwLTA5ICBBZGVuaWxzb24gQ2F2YWxjYW50aSAgPGFkZW5pbHNvbi5zaWx2 YUBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIFtRdF0gR2VvbG9jYXRpb25DbGllbnQgY2xlYW51 cHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5NzM3 CisKKyAgICAgICAgRml4bWVzOiByZW1vdmUgb2YgdXNpbmcgbmFtZXNwYWNlIGluIGhlYWRlciBm aWxlLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog UXRXZWJLaXQucHJvOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50 UXQuY3BwOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50UXQuaDoK KwogMjAxMS0xMC0wMyAgUGllcnJlIFJvc3NpICA8cGllcnJlLnJvc3NpQGdtYWlsLmNvbT4KIAog ICAgICAgICBbUXRdIEJ1aWxkIGZpeDogUXQ6OmVzY2FwZSBpcyBkZXByZWNhdGVkIGluIFF0NQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9HZW9sb2NhdGlvbkNs aWVudFF0LmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRpb25D bGllbnRRdC5jcHAKaW5kZXggM2MzODJjZi4uYzJkYzhkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9xdC9XZWJDb3JlU3VwcG9ydC9HZW9sb2NhdGlvbkNsaWVudFF0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50UXQuY3BwCkBAIC0z Nyw2ICszNyw3IEBACiAjaW5jbHVkZSAicXdlYnBhZ2UuaCIKICNpbmNsdWRlICJxd2VicGFnZV9w LmgiCiAKKyNpbmNsdWRlIDxRR2VvUG9zaXRpb25JbmZvU291cmNlPgogdXNpbmcgbmFtZXNwYWNl IFF0TW9iaWxpdHk7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRpb25DbGllbnRRdC5oIGIvU291cmNlL1dl YktpdC9xdC9XZWJDb3JlU3VwcG9ydC9HZW9sb2NhdGlvbkNsaWVudFF0LmgKaW5kZXggNzhiZWVi Yi4uZGVjMjI0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9H ZW9sb2NhdGlvbkNsaWVudFF0LmgKKysrIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9y dC9HZW9sb2NhdGlvbkNsaWVudFF0LmgKQEAgLTI3LDIwICsyNywyMSBAQAogI2RlZmluZSBHZW9s b2NhdGlvbkNsaWVudFF0X2gKIAogI2luY2x1ZGUgIkdlb2xvY2F0aW9uQ2xpZW50LmgiCi0jaW5j bHVkZSA8UUdlb1Bvc2l0aW9uSW5mb1NvdXJjZT4KKyNpbmNsdWRlIDxRT2JqZWN0PgogI2luY2x1 ZGUgPHd0Zi9SZWZQdHIuaD4KIAotLy8gRklYTUU6IFJlbW92ZSB1c2FnZSBvZiAidXNpbmcgbmFt ZXNwYWNlIiBpbiBhIGhlYWRlciBmaWxlLgotLy8gVGhlcmUgaXMgYnVnIGluIHF0TW9iaWxpdHkg c2lnbmFsIG5hbWVzIGFyZSBub3QgZnVsbCBxdWFsaWZpZWQgd2hlbiB1c2VkIHdpdGggbmFtZXNw YWNlCi0vLyBRdE1vYmlsaXR5IG5hbWVzcGFjZSBpbiBzbG90cyB0aHJvd3MgdXAgZXJyb3IgYW5k IGl0cyByZXF1aXJlZCB0byBiZSBmaXhlZCBpbiBxdG1vYmlsaXR5LgotdXNpbmcgbmFtZXNwYWNl IFF0TW9iaWxpdHk7CisKK25hbWVzcGFjZSBRdE1vYmlsaXR5IHsKK2NsYXNzIFFHZW9Qb3NpdGlv bkluZm9Tb3VyY2U7CitjbGFzcyBRR2VvUG9zaXRpb25JbmZvOworfQogCiBjbGFzcyBRV2ViUGFn ZTsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiAvLyBUaGlzIGNsYXNzIHByb3ZpZGVzIGEgaW1w bGVtZW50YXRpb24gb2YgYSBHZW9sb2NhdGlvblNlcnZpY2UgZm9yIHF0V2Via2l0LgotLy8gSXQg dXNlcyBRdE1vYmlsaXR5ICh2MS4wLjApIGxvY2F0aW9uIHNlcnZpY2UgdG8gZ2V0IHBvc2l0aW9u cworLy8gSXQgdXNlcyBRdE1vYmlsaXR5ID4gdjEuMC4wIGxvY2F0aW9uIHNlcnZpY2UgdG8gZ2V0 IHBvc2l0aW9ucy4KIGNsYXNzIEdlb2xvY2F0aW9uQ2xpZW50UXQgOiBwdWJsaWMgUU9iamVjdCwg cHVibGljIEdlb2xvY2F0aW9uQ2xpZW50IHsKICAgICBRX09CSkVDVAogCkBAIC02MCw3ICs2MSw3 IEBAIHB1YmxpYzoKIAogcHJpdmF0ZSBRX1NMT1RTOgogICAgIC8vIFFHZW9Qb3NpdGlvbkluZm9T b3VyY2UKLSAgICB2b2lkIHBvc2l0aW9uVXBkYXRlZChjb25zdCBRR2VvUG9zaXRpb25JbmZvJik7 CisgICAgdm9pZCBwb3NpdGlvblVwZGF0ZWQoY29uc3QgUXRNb2JpbGl0eTo6UUdlb1Bvc2l0aW9u SW5mbyYpOwogCiBwcml2YXRlOgogICAgIGNvbnN0IFFXZWJQYWdlKiBtX3BhZ2U7Ci0tIAoxLjcu NC4xCgo= 110560 2011-10-11 12:49:34 -0700 2011-10-13 11:47:28 -0700 Allowing it compile with both Qt 4.x and Qt 5 (plus cleanups) geoport.patch text/plain 5359 savagobr RnJvbSAzYjliYTg3MGI0YzliMDU5MzcwOTU4MWNkMjE1MmE4ZDljMzUzYzlkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBZGVuaWxzb24gQ2F2YWxjYW50aSA8YWRlbmlsc29uLnNpbHZh QG9wZW5ib3NzYS5vcmc+CkRhdGU6IFR1ZSwgMTEgT2N0IDIwMTEgMTU6NDY6MTUgLTA0MDAKU3Vi amVjdDogW1BBVENIXSBNYWtlIEdlb2xvY2F0aW9uQ2xpZW50UXQgdG8gY29tcGlsZSB3aXRoIFF0 IDQueCAodXNpbmcgUXQgbW9iaWxpdHkpCiBhbmQgUXQ1LiBQbHVzIHJlbW92aW5nIHVzaW5nIG5h bWVzcGFjZXMgaW4gdGhlIGhlYWRlciBmaWxlLgoKU2lnbmVkLW9mZi1ieTogQWRlbmlsc29uIENh dmFsY2FudGkgPGFkZW5pbHNvbi5zaWx2YUBvcGVuYm9zc2Eub3JnPgotLS0KIFNvdXJjZS9XZWJL aXQvcXQvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxOCArKysrKysrKysr KysKIFNvdXJjZS9XZWJLaXQvcXQvUXRXZWJLaXQucHJvICAgICAgICAgICAgICAgICAgICAgIHwg ICAgMiArCiAuLi4vcXQvV2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRpb25DbGllbnRRdC5jcHAgICAg ICB8ICAgMTMgKysrKysrKy0KIC4uLi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRp b25DbGllbnRRdC5oIHwgICAyOSArKysrKysrKysrKysrKystLS0tLQogNCBmaWxlcyBjaGFuZ2Vk LCA1MyBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggM2I4 ODNkZC4uNjdiMDJlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMS0xMC0x MSAgQWRlbmlsc29uIENhdmFsY2FudGkgIDxhZGVuaWxzb24uc2lsdmFAb3BlbmJvc3NhLm9yZz4K KworICAgICAgICBbUXRdIEdlb2xvY2F0aW9uQ2xpZW50IGNsZWFudXBzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTczNworCisgICAgICAgIFF0NSBu b3cgaGFzIGEgbG9jYXRpb24gbW9kdWxlLCBzbyBubyBuZWVkIHRvIGxpbmsgd2l0aCBhbiBleHRl cm5hbAorICAgICAgICBsaWJyYXJ5IGxpa2UgbW9iaWxpdHkuIFRoaXMgcGF0Y2ggd2lsbCBhbGxv dyB0aGUgR2VvbG9jYXRpb25DbGllbnRRdAorICAgICAgICB0byBjb21waWxlIHdpdGggYm90aCBR dDUgYW5kIFF0NC4KKworICAgICAgICBUaGlzIHBhdGNoIGFsc28gcmVtb3ZlcyB1c2Ugb2YgbmFt ZXNwYWNlcyBmcm9tIHRoZSBoZWFkZXIgZmlsZS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFF0V2ViS2l0LnBybzoKKyAgICAgICAgKiBXZWJDb3Jl U3VwcG9ydC9HZW9sb2NhdGlvbkNsaWVudFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okdlb2xv Y2F0aW9uQ2xpZW50UXQ6OnBvc2l0aW9uVXBkYXRlZCk6CisgICAgICAgICogV2ViQ29yZVN1cHBv cnQvR2VvbG9jYXRpb25DbGllbnRRdC5oOgorCiAyMDExLTEwLTExICBUb3IgQXJuZSBWZXN0YsO4 ICA8dG9yLmFybmUudmVzdGJvQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdIFJlbW92ZSBhbGwg cmVmZXJlbmNlcyB0byBRVERJUl9idWlsZCBhbmQgc3RhbmRhbG9uZV9wYWNrYWdlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L3F0L1F0V2ViS2l0LnBybyBiL1NvdXJjZS9XZWJLaXQvcXQvUXRX ZWJLaXQucHJvCmluZGV4IDNjNmU3NzQuLjNhYjJjMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvcXQvUXRXZWJLaXQucHJvCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvUXRXZWJLaXQucHJvCkBA IC0yODQsNiArMjg0LDggQEAgY29udGFpbnMoREVGSU5FUywgRU5BQkxFX0RFVklDRV9PUklFTlRB VElPTj0xKSB7CiB9CiAKIGNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9HRU9MT0NBVElPTj0xKSB7 CitxdDU6IFFUICs9IGxvY2F0aW9uCisKICAgICAgSEVBREVSUyArPSBcCiAgICAgICAgICQkUFdE L1dlYkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50UXQuaAogICAgICBTT1VSQ0VTICs9IFwK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRpb25D bGllbnRRdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9u Q2xpZW50UXQuY3BwCmluZGV4IDNjMzgyY2YuLmFmZWRkMWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRpb25DbGllbnRRdC5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9HZW9sb2NhdGlvbkNsaWVudFF0LmNwcApAQCAt MjAsNyArMjAsNyBAQAogICogUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dF VkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWQogICogT0YgTElBQklMSVRZLCBXSEVUSEVSIElO IENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCiAgKiAoSU5DTFVESU5HIE5FR0xJ R0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKLSAq IE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0Yg U1VDSCBEQU1BR0UuIAorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRI RSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCiAjaW5jbHVkZSAiY29uZmlnLmgi CkBAIC0zNyw3ICszNywxMiBAQAogI2luY2x1ZGUgInF3ZWJwYWdlLmgiCiAjaW5jbHVkZSAicXdl YnBhZ2VfcC5oIgogCisjaWYgUVRfVkVSU0lPTiA8IDB4MDUwMDAwCisjaW5jbHVkZSA8UUdlb1Bv c2l0aW9uSW5mb1NvdXJjZT4KIHVzaW5nIG5hbWVzcGFjZSBRdE1vYmlsaXR5OworI2VsaWYgUVRf VkVSU0lPTiA+PSAweDA1MDAwMAorI2luY2x1ZGUgPFF0TG9jYXRpb24vUUdlb1Bvc2l0aW9uSW5m b1NvdXJjZT4KKyNlbmRpZgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTYwLDcgKzY1LDEx IEBAIHZvaWQgR2VvbG9jYXRpb25DbGllbnRRdDo6Z2VvbG9jYXRpb25EZXN0cm95ZWQoKQogICAg IGRlbGV0ZSB0aGlzOwogfQogCi12b2lkIEdlb2xvY2F0aW9uQ2xpZW50UXQ6OnBvc2l0aW9uVXBk YXRlZChjb25zdCBRR2VvUG9zaXRpb25JbmZvICZnZW9Qb3NpdGlvbikKKyNpZiBRVF9WRVJTSU9O IDwgMHgwNTAwMDAKK3ZvaWQgR2VvbG9jYXRpb25DbGllbnRRdDo6cG9zaXRpb25VcGRhdGVkKGNv bnN0IFF0TW9iaWxpdHk6OlFHZW9Qb3NpdGlvbkluZm8mIGdlb1Bvc2l0aW9uKQorI2VsaWYgUVRf VkVSU0lPTiA+PSAweDA1MDAwMAordm9pZCBHZW9sb2NhdGlvbkNsaWVudFF0Ojpwb3NpdGlvblVw ZGF0ZWQoY29uc3QgUUdlb1Bvc2l0aW9uSW5mbyYgZ2VvUG9zaXRpb24pCisjZW5kaWYKIHsKICAg ICBpZiAoIWdlb1Bvc2l0aW9uLmlzVmFsaWQoKSkKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9HZW9sb2NhdGlvbkNsaWVudFF0Lmgg Yi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50UXQuaApp bmRleCA3OGJlZWJiLi5lMjY0YzE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNv cmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50UXQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50UXQuaApAQCAtMjcsMjAgKzI3LDI2IEBACiAj ZGVmaW5lIEdlb2xvY2F0aW9uQ2xpZW50UXRfaAogCiAjaW5jbHVkZSAiR2VvbG9jYXRpb25DbGll bnQuaCIKLSNpbmNsdWRlIDxRR2VvUG9zaXRpb25JbmZvU291cmNlPgorCisjaW5jbHVkZSA8UU9i amVjdD4KICNpbmNsdWRlIDx3dGYvUmVmUHRyLmg+CiAKLS8vIEZJWE1FOiBSZW1vdmUgdXNhZ2Ug b2YgInVzaW5nIG5hbWVzcGFjZSIgaW4gYSBoZWFkZXIgZmlsZS4KLS8vIFRoZXJlIGlzIGJ1ZyBp biBxdE1vYmlsaXR5IHNpZ25hbCBuYW1lcyBhcmUgbm90IGZ1bGwgcXVhbGlmaWVkIHdoZW4gdXNl ZCB3aXRoIG5hbWVzcGFjZQotLy8gUXRNb2JpbGl0eSBuYW1lc3BhY2UgaW4gc2xvdHMgdGhyb3dz IHVwIGVycm9yIGFuZCBpdHMgcmVxdWlyZWQgdG8gYmUgZml4ZWQgaW4gcXRtb2JpbGl0eS4KLXVz aW5nIG5hbWVzcGFjZSBRdE1vYmlsaXR5OworI2lmIFFUX1ZFUlNJT04gPCAweDA1MDAwMAorI2lu Y2x1ZGUgPFFHZW9Qb3NpdGlvbkluZm8+CituYW1lc3BhY2UgUXRNb2JpbGl0eSB7CitjbGFzcyBR R2VvUG9zaXRpb25JbmZvU291cmNlOworfQorI2VsaWYgUVRfVkVSU0lPTiA+PSAweDA1MDAwMAor I2luY2x1ZGUgPFF0TG9jYXRpb24vUUdlb1Bvc2l0aW9uSW5mbz4KK2NsYXNzIFFHZW9Qb3NpdGlv bkluZm9Tb3VyY2U7CisjZW5kaWYKKwogCiBjbGFzcyBRV2ViUGFnZTsKIAogbmFtZXNwYWNlIFdl YkNvcmUgewogCiAvLyBUaGlzIGNsYXNzIHByb3ZpZGVzIGEgaW1wbGVtZW50YXRpb24gb2YgYSBH ZW9sb2NhdGlvblNlcnZpY2UgZm9yIHF0V2Via2l0LgotLy8gSXQgdXNlcyBRdE1vYmlsaXR5ICh2 MS4wLjApIGxvY2F0aW9uIHNlcnZpY2UgdG8gZ2V0IHBvc2l0aW9ucwogY2xhc3MgR2VvbG9jYXRp b25DbGllbnRRdCA6IHB1YmxpYyBRT2JqZWN0LCBwdWJsaWMgR2VvbG9jYXRpb25DbGllbnQgewog ICAgIFFfT0JKRUNUCiAKQEAgLTU5LDEzICs2NSwyMiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2 b2lkIGNhbmNlbFBlcm1pc3Npb25SZXF1ZXN0KEdlb2xvY2F0aW9uKik7CiAKIHByaXZhdGUgUV9T TE9UUzoKLSAgICAvLyBRR2VvUG9zaXRpb25JbmZvU291cmNlCisKKyNpZiBRVF9WRVJTSU9OIDwg MHgwNTAwMDAKKyAgICB2b2lkIHBvc2l0aW9uVXBkYXRlZChjb25zdCBRdE1vYmlsaXR5OjpRR2Vv UG9zaXRpb25JbmZvJik7CisjZWxpZiBRVF9WRVJTSU9OID49IDB4MDUwMDAwCiAgICAgdm9pZCBw b3NpdGlvblVwZGF0ZWQoY29uc3QgUUdlb1Bvc2l0aW9uSW5mbyYpOworI2VuZGlmCiAKIHByaXZh dGU6CiAgICAgY29uc3QgUVdlYlBhZ2UqIG1fcGFnZTsKICAgICBSZWZQdHI8R2VvbG9jYXRpb25Q b3NpdGlvbj4gbV9sYXN0UG9zaXRpb247CisKKyNpZiBRVF9WRVJTSU9OIDwgMHgwNTAwMDAKICAg ICBRdE1vYmlsaXR5OjpRR2VvUG9zaXRpb25JbmZvU291cmNlKiBtX2xvY2F0aW9uOworI2VsaWYg UVRfVkVSU0lPTiA+PSAweDA1MDAwMAorICAgIFFHZW9Qb3NpdGlvbkluZm9Tb3VyY2UqIG1fbG9j YXRpb247CisjZW5kaWYKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKLS0gCjEuNy40LjEK Cg== 110883 2011-10-13 11:47:28 -0700 2011-10-13 13:28:14 -0700 Compiles with both Qt4/5, more tolerable use of ifdefs, better approach to test for Qt version geolocationport.patch text/plain 4617 savagobr RnJvbSBkMWUyMGEzYjlmZGI3Y2IyMjZlMjNmNTVkNDJkMzUxZmQzYzlkODYzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBZGVuaWxzb24gQ2F2YWxjYW50aSA8YWRlbmlsc29uLnNpbHZh QG9wZW5ib3NzYS5vcmc+CkRhdGU6IFRodSwgMTMgT2N0IDIwMTEgMTQ6NDQ6MDIgLTA0MDAKU3Vi amVjdDogW1BBVENIXSBHb3QgdGhlIEdlb2xvY2F0aW9uQ2xpZW50UXQgdG8gY29tcGlsZSB3aXRo IGJvdGggUXQ0LzUuCgpTaWduZWQtb2ZmLWJ5OiBBZGVuaWxzb24gQ2F2YWxjYW50aSA8YWRlbmls c29uLnNpbHZhQG9wZW5ib3NzYS5vcmc+Ci0tLQogU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cg ICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE2ICsrKysrKysrKysrKysrCiBTb3VyY2UvV2Vi S2l0L3F0L1F0V2ViS2l0LnBybyAgICAgICAgICAgICAgICAgICAgICB8ICAgIDIgKwogLi4uL3F0 L1dlYkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50UXQuY3BwICAgICAgfCAgICA4ICsrKysr LQogLi4uL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9HZW9sb2NhdGlvbkNsaWVudFF0LmggfCAg IDIyICsrKysrKysrKysrKy0tLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgMzggaW5zZXJ0aW9ucygr KSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCBlZDc0ZTg3Li4xOWNjODk5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDExLTEwLTEzICBBZGVuaWxzb24gQ2F2 YWxjYW50aSAgPGFkZW5pbHNvbi5zaWx2YUBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIFtRdF0g R2VvbG9jYXRpb25DbGllbnQgY2xlYW51cHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTY5NzM3CisKKyAgICAgICAgUXQ1IGhhcyBhIGxvY2F0aW9uIG1v ZHVsZSwgc28gbm8gbmVlZCB0byB1c2UgYW4gZXh0ZXJuYWwKKyAgICAgICAgbGlicmFyeSBsaWtl IFF0IE1vYmlsaXR5LiBUaGlzIHBhdGNoIHdpbGwgYWxsb3cgdGhlIEdlb2xvY2F0aW9uQ2xpZW50 UXQKKyAgICAgICAgdG8gY29tcGlsZSB3aXRoIGJvdGggUXQ1IGFuZCBRdDQuCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCisKKyAgICAgICAgKiBRdFdl YktpdC5wcm86CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRpb25DbGllbnRRdC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpHZW9sb2NhdGlvbkNsaWVudFF0Ojpwb3NpdGlvblVwZGF0 ZWQpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50UXQuaDoKKwog MjAxMS0xMC0xMSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAg ICAgICBNYWtlIGN1c3RvbSBzY3JvbGxiYXIgdGhlbWUgZm9yIHVzZSBpbiBEUlQsIHRvIHJlZHVj ZSBwaXhlbCBkaWZmcyBiZXR3ZWVuIHBsYXRmb3JtcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9xdC9RdFdlYktpdC5wcm8gYi9Tb3VyY2UvV2ViS2l0L3F0L1F0V2ViS2l0LnBybwppbmRleCAz YzZlNzc0Li4zYWIyYzEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1F0V2ViS2l0LnBy bworKysgYi9Tb3VyY2UvV2ViS2l0L3F0L1F0V2ViS2l0LnBybwpAQCAtMjg0LDYgKzI4NCw4IEBA IGNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9ERVZJQ0VfT1JJRU5UQVRJT049MSkgewogfQogCiBj b250YWlucyhERUZJTkVTLCBFTkFCTEVfR0VPTE9DQVRJT049MSkgeworcXQ1OiBRVCArPSBsb2Nh dGlvbgorCiAgICAgIEhFQURFUlMgKz0gXAogICAgICAgICAkJFBXRC9XZWJDb3JlU3VwcG9ydC9H ZW9sb2NhdGlvbkNsaWVudFF0LmgKICAgICAgU09VUkNFUyArPSBcCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50UXQuY3BwIGIvU291 cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9HZW9sb2NhdGlvbkNsaWVudFF0LmNwcAppbmRl eCAzYzM4MmNmLi5jZGE1ZjM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVT dXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50UXQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvV2Vi Q29yZVN1cHBvcnQvR2VvbG9jYXRpb25DbGllbnRRdC5jcHAKQEAgLTM3LDcgKzM3LDExIEBACiAj aW5jbHVkZSAicXdlYnBhZ2UuaCIKICNpbmNsdWRlICJxd2VicGFnZV9wLmgiCiAKLXVzaW5nIG5h bWVzcGFjZSBRdE1vYmlsaXR5OworI2lmIFFUX1ZFUlNJT04gPCBRVF9WRVJTSU9OX0NIRUNLKDUs IDAsIDApCisjaW5jbHVkZSA8UUdlb1Bvc2l0aW9uSW5mb1NvdXJjZT4KKyNlbGlmIFFUX1ZFUlNJ T04gPj0gUVRfVkVSU0lPTl9DSEVDSyg1LCAwLCAwKQorI2luY2x1ZGUgPFF0TG9jYXRpb24vUUdl b1Bvc2l0aW9uSW5mb1NvdXJjZT4KKyNlbmRpZgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAg LTYwLDcgKzY0LDcgQEAgdm9pZCBHZW9sb2NhdGlvbkNsaWVudFF0OjpnZW9sb2NhdGlvbkRlc3Ry b3llZCgpCiAgICAgZGVsZXRlIHRoaXM7CiB9CiAKLXZvaWQgR2VvbG9jYXRpb25DbGllbnRRdDo6 cG9zaXRpb25VcGRhdGVkKGNvbnN0IFFHZW9Qb3NpdGlvbkluZm8gJmdlb1Bvc2l0aW9uKQordm9p ZCBHZW9sb2NhdGlvbkNsaWVudFF0Ojpwb3NpdGlvblVwZGF0ZWQoY29uc3QgUUdlb1Bvc2l0aW9u SW5mbyYgZ2VvUG9zaXRpb24pCiB7CiAgICAgaWYgKCFnZW9Qb3NpdGlvbi5pc1ZhbGlkKCkpCiAg ICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBv cnQvR2VvbG9jYXRpb25DbGllbnRRdC5oIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9y dC9HZW9sb2NhdGlvbkNsaWVudFF0LmgKaW5kZXggNzhiZWViYi4uMmMzZGNkYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9HZW9sb2NhdGlvbkNsaWVudFF0LmgK KysrIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9HZW9sb2NhdGlvbkNsaWVudFF0 LmgKQEAgLTI3LDIwICsyNywyNyBAQAogI2RlZmluZSBHZW9sb2NhdGlvbkNsaWVudFF0X2gKIAog I2luY2x1ZGUgIkdlb2xvY2F0aW9uQ2xpZW50LmgiCi0jaW5jbHVkZSA8UUdlb1Bvc2l0aW9uSW5m b1NvdXJjZT4KKworI2luY2x1ZGUgPFFPYmplY3Q+CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgog Ci0vLyBGSVhNRTogUmVtb3ZlIHVzYWdlIG9mICJ1c2luZyBuYW1lc3BhY2UiIGluIGEgaGVhZGVy IGZpbGUuCi0vLyBUaGVyZSBpcyBidWcgaW4gcXRNb2JpbGl0eSBzaWduYWwgbmFtZXMgYXJlIG5v dCBmdWxsIHF1YWxpZmllZCB3aGVuIHVzZWQgd2l0aCBuYW1lc3BhY2UKLS8vIFF0TW9iaWxpdHkg bmFtZXNwYWNlIGluIHNsb3RzIHRocm93cyB1cCBlcnJvciBhbmQgaXRzIHJlcXVpcmVkIHRvIGJl IGZpeGVkIGluIHF0bW9iaWxpdHkuCisjaWYgUVRfVkVSU0lPTiA8IFFUX1ZFUlNJT05fQ0hFQ0so NSwgMCwgMCkKKyNpbmNsdWRlIDxRR2VvUG9zaXRpb25JbmZvPgorbmFtZXNwYWNlIFF0TW9iaWxp dHkgeworY2xhc3MgUUdlb1Bvc2l0aW9uSW5mb1NvdXJjZTsKK307CiB1c2luZyBuYW1lc3BhY2Ug UXRNb2JpbGl0eTsKKyNlbGlmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg1LCAwLCAw KQorI2luY2x1ZGUgPFF0TG9jYXRpb24vUUdlb1Bvc2l0aW9uSW5mbz4KK2NsYXNzIFFHZW9Qb3Np dGlvbkluZm9Tb3VyY2U7CisjZW5kaWYKKwogCiBjbGFzcyBRV2ViUGFnZTsKIAogbmFtZXNwYWNl IFdlYkNvcmUgewogCi0vLyBUaGlzIGNsYXNzIHByb3ZpZGVzIGEgaW1wbGVtZW50YXRpb24gb2Yg YSBHZW9sb2NhdGlvblNlcnZpY2UgZm9yIHF0V2Via2l0LgotLy8gSXQgdXNlcyBRdE1vYmlsaXR5 ICh2MS4wLjApIGxvY2F0aW9uIHNlcnZpY2UgdG8gZ2V0IHBvc2l0aW9ucworLy8gVGhpcyBjbGFz cyBwcm92aWRlcyBhbiBpbXBsZW1lbnRhdGlvbiBvZiBhIEdlb2xvY2F0aW9uU2VydmljZSBmb3Ig cXRXZWJraXQuCiBjbGFzcyBHZW9sb2NhdGlvbkNsaWVudFF0IDogcHVibGljIFFPYmplY3QsIHB1 YmxpYyBHZW9sb2NhdGlvbkNsaWVudCB7CiAgICAgUV9PQkpFQ1QKIApAQCAtNTksMTMgKzY2LDEy IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgY2FuY2VsUGVybWlzc2lvblJlcXVlc3QoR2Vv bG9jYXRpb24qKTsKIAogcHJpdmF0ZSBRX1NMT1RTOgotICAgIC8vIFFHZW9Qb3NpdGlvbkluZm9T b3VyY2UKICAgICB2b2lkIHBvc2l0aW9uVXBkYXRlZChjb25zdCBRR2VvUG9zaXRpb25JbmZvJik7 CiAKIHByaXZhdGU6CiAgICAgY29uc3QgUVdlYlBhZ2UqIG1fcGFnZTsKICAgICBSZWZQdHI8R2Vv bG9jYXRpb25Qb3NpdGlvbj4gbV9sYXN0UG9zaXRpb247Ci0gICAgUXRNb2JpbGl0eTo6UUdlb1Bv c2l0aW9uSW5mb1NvdXJjZSogbV9sb2NhdGlvbjsKKyAgICBRR2VvUG9zaXRpb25JbmZvU291cmNl KiBtX2xvY2F0aW9uOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQotLSAKMS43LjQuMQoK 110894 2011-10-13 13:28:14 -0700 2011-10-13 15:10:45 -0700 Fixed pending issues. geolocationport.patch text/plain 4622 savagobr RnJvbSA2YWZlMDllYWUzMDJlYWU3ZDZmMWVhYWZkM2RjZmIxZGY5MmRiN2U0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBZGVuaWxzb24gQ2F2YWxjYW50aSA8YWRlbmlsc29uLnNpbHZh QG9wZW5ib3NzYS5vcmc+CkRhdGU6IFRodSwgMTMgT2N0IDIwMTEgMTQ6NDQ6MDIgLTA0MDAKU3Vi amVjdDogW1BBVENIXSBHb3QgdGhlIEdlb2xvY2F0aW9uQ2xpZW50UXQgdG8gY29tcGlsZSB3aXRo IGJvdGggUXQ0LzUuCgpTaWduZWQtb2ZmLWJ5OiBBZGVuaWxzb24gQ2F2YWxjYW50aSA8YWRlbmls c29uLnNpbHZhQG9wZW5ib3NzYS5vcmc+Ci0tLQogU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cg ICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE2ICsrKysrKysrKysrKysrCiBTb3VyY2UvV2Vi S2l0L3F0L1F0V2ViS2l0LnBybyAgICAgICAgICAgICAgICAgICAgICB8ICAgIDIgKwogLi4uL3F0 L1dlYkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50UXQuY3BwICAgICAgfCAgICA4ICsrKysr LQogLi4uL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9HZW9sb2NhdGlvbkNsaWVudFF0LmggfCAg IDIyICsrKysrKysrKysrKy0tLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgMzggaW5zZXJ0aW9ucygr KSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCBlZDc0ZTg3Li4wODNkZmM3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDExLTEwLTEzICBBZGVuaWxzb24gQ2F2 YWxjYW50aSAgPGFkZW5pbHNvbi5zaWx2YUBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIFtRdF0g R2VvbG9jYXRpb25DbGllbnQgY2xlYW51cHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTY5NzM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBS b2hkZSBDaHJpc3RpYW5zZW4uCisKKyAgICAgICAgUXQ1IGhhcyBhIGxvY2F0aW9uIG1vZHVsZSwg c28gbm8gbmVlZCB0byB1c2UgYW4gZXh0ZXJuYWwKKyAgICAgICAgbGlicmFyeSBsaWtlIFF0IE1v YmlsaXR5LiBUaGlzIHBhdGNoIHdpbGwgYWxsb3cgdGhlIEdlb2xvY2F0aW9uQ2xpZW50UXQKKyAg ICAgICAgdG8gY29tcGlsZSB3aXRoIGJvdGggUXQ1IGFuZCBRdDQuCisKKyAgICAgICAgKiBRdFdl YktpdC5wcm86CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRpb25DbGllbnRRdC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpHZW9sb2NhdGlvbkNsaWVudFF0Ojpwb3NpdGlvblVwZGF0 ZWQpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50UXQuaDoKKwog MjAxMS0xMC0xMSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAg ICAgICBNYWtlIGN1c3RvbSBzY3JvbGxiYXIgdGhlbWUgZm9yIHVzZSBpbiBEUlQsIHRvIHJlZHVj ZSBwaXhlbCBkaWZmcyBiZXR3ZWVuIHBsYXRmb3JtcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9xdC9RdFdlYktpdC5wcm8gYi9Tb3VyY2UvV2ViS2l0L3F0L1F0V2ViS2l0LnBybwppbmRleCAz YzZlNzc0Li5iZGZkOTZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1F0V2ViS2l0LnBy bworKysgYi9Tb3VyY2UvV2ViS2l0L3F0L1F0V2ViS2l0LnBybwpAQCAtMjg0LDYgKzI4NCw4IEBA IGNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9ERVZJQ0VfT1JJRU5UQVRJT049MSkgewogfQogCiBj b250YWlucyhERUZJTkVTLCBFTkFCTEVfR0VPTE9DQVRJT049MSkgeworICAgICBxdDU6IFFUICs9 IGxvY2F0aW9uCisKICAgICAgSEVBREVSUyArPSBcCiAgICAgICAgICQkUFdEL1dlYkNvcmVTdXBw b3J0L0dlb2xvY2F0aW9uQ2xpZW50UXQuaAogICAgICBTT1VSQ0VTICs9IFwKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRpb25DbGllbnRRdC5jcHAg Yi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50UXQuY3Bw CmluZGV4IDNjMzgyY2YuLmNkYTVmMzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvV2Vi Q29yZVN1cHBvcnQvR2VvbG9jYXRpb25DbGllbnRRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9x dC9XZWJDb3JlU3VwcG9ydC9HZW9sb2NhdGlvbkNsaWVudFF0LmNwcApAQCAtMzcsNyArMzcsMTEg QEAKICNpbmNsdWRlICJxd2VicGFnZS5oIgogI2luY2x1ZGUgInF3ZWJwYWdlX3AuaCIKIAotdXNp bmcgbmFtZXNwYWNlIFF0TW9iaWxpdHk7CisjaWYgUVRfVkVSU0lPTiA8IFFUX1ZFUlNJT05fQ0hF Q0soNSwgMCwgMCkKKyNpbmNsdWRlIDxRR2VvUG9zaXRpb25JbmZvU291cmNlPgorI2VsaWYgUVRf VkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NIRUNLKDUsIDAsIDApCisjaW5jbHVkZSA8UXRMb2NhdGlv bi9RR2VvUG9zaXRpb25JbmZvU291cmNlPgorI2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK IApAQCAtNjAsNyArNjQsNyBAQCB2b2lkIEdlb2xvY2F0aW9uQ2xpZW50UXQ6Omdlb2xvY2F0aW9u RGVzdHJveWVkKCkKICAgICBkZWxldGUgdGhpczsKIH0KIAotdm9pZCBHZW9sb2NhdGlvbkNsaWVu dFF0Ojpwb3NpdGlvblVwZGF0ZWQoY29uc3QgUUdlb1Bvc2l0aW9uSW5mbyAmZ2VvUG9zaXRpb24p Cit2b2lkIEdlb2xvY2F0aW9uQ2xpZW50UXQ6OnBvc2l0aW9uVXBkYXRlZChjb25zdCBRR2VvUG9z aXRpb25JbmZvJiBnZW9Qb3NpdGlvbikKIHsKICAgICBpZiAoIWdlb1Bvc2l0aW9uLmlzVmFsaWQo KSkKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3Jl U3VwcG9ydC9HZW9sb2NhdGlvbkNsaWVudFF0LmggYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVT dXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50UXQuaAppbmRleCA3OGJlZWJiLi45YTI4MjVkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50 UXQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xp ZW50UXQuaApAQCAtMjcsMjAgKzI3LDI3IEBACiAjZGVmaW5lIEdlb2xvY2F0aW9uQ2xpZW50UXRf aAogCiAjaW5jbHVkZSAiR2VvbG9jYXRpb25DbGllbnQuaCIKLSNpbmNsdWRlIDxRR2VvUG9zaXRp b25JbmZvU291cmNlPgorCisjaW5jbHVkZSA8UU9iamVjdD4KICNpbmNsdWRlIDx3dGYvUmVmUHRy Lmg+CiAKLS8vIEZJWE1FOiBSZW1vdmUgdXNhZ2Ugb2YgInVzaW5nIG5hbWVzcGFjZSIgaW4gYSBo ZWFkZXIgZmlsZS4KLS8vIFRoZXJlIGlzIGJ1ZyBpbiBxdE1vYmlsaXR5IHNpZ25hbCBuYW1lcyBh cmUgbm90IGZ1bGwgcXVhbGlmaWVkIHdoZW4gdXNlZCB3aXRoIG5hbWVzcGFjZQotLy8gUXRNb2Jp bGl0eSBuYW1lc3BhY2UgaW4gc2xvdHMgdGhyb3dzIHVwIGVycm9yIGFuZCBpdHMgcmVxdWlyZWQg dG8gYmUgZml4ZWQgaW4gcXRtb2JpbGl0eS4KKyNpZiBRVF9WRVJTSU9OIDwgUVRfVkVSU0lPTl9D SEVDSyg1LCAwLCAwKQorI2luY2x1ZGUgPFFHZW9Qb3NpdGlvbkluZm8+CituYW1lc3BhY2UgUXRN b2JpbGl0eSB7CitjbGFzcyBRR2VvUG9zaXRpb25JbmZvU291cmNlOworfTsKIHVzaW5nIG5hbWVz cGFjZSBRdE1vYmlsaXR5OworI2VsaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NIRUNLKDUs IDAsIDApCisjaW5jbHVkZSA8UXRMb2NhdGlvbi9RR2VvUG9zaXRpb25JbmZvPgorY2xhc3MgUUdl b1Bvc2l0aW9uSW5mb1NvdXJjZTsKKyNlbmRpZgorCiAKIGNsYXNzIFFXZWJQYWdlOwogCiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKLS8vIFRoaXMgY2xhc3MgcHJvdmlkZXMgYSBpbXBsZW1lbnRhdGlv biBvZiBhIEdlb2xvY2F0aW9uU2VydmljZSBmb3IgcXRXZWJraXQuCi0vLyBJdCB1c2VzIFF0TW9i aWxpdHkgKHYxLjAuMCkgbG9jYXRpb24gc2VydmljZSB0byBnZXQgcG9zaXRpb25zCisvLyBUaGlz IGNsYXNzIHByb3ZpZGVzIGFuIGltcGxlbWVudGF0aW9uIG9mIGEgR2VvbG9jYXRpb25TZXJ2aWNl IGZvciBRdFdlYmtpdC4KIGNsYXNzIEdlb2xvY2F0aW9uQ2xpZW50UXQgOiBwdWJsaWMgUU9iamVj dCwgcHVibGljIEdlb2xvY2F0aW9uQ2xpZW50IHsKICAgICBRX09CSkVDVAogCkBAIC01OSwxMyAr NjYsMTIgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBjYW5jZWxQZXJtaXNzaW9uUmVxdWVz dChHZW9sb2NhdGlvbiopOwogCiBwcml2YXRlIFFfU0xPVFM6Ci0gICAgLy8gUUdlb1Bvc2l0aW9u SW5mb1NvdXJjZQogICAgIHZvaWQgcG9zaXRpb25VcGRhdGVkKGNvbnN0IFFHZW9Qb3NpdGlvbklu Zm8mKTsKIAogcHJpdmF0ZToKICAgICBjb25zdCBRV2ViUGFnZSogbV9wYWdlOwogICAgIFJlZlB0 cjxHZW9sb2NhdGlvblBvc2l0aW9uPiBtX2xhc3RQb3NpdGlvbjsKLSAgICBRdE1vYmlsaXR5OjpR R2VvUG9zaXRpb25JbmZvU291cmNlKiBtX2xvY2F0aW9uOworICAgIFFHZW9Qb3NpdGlvbkluZm9T b3VyY2UqIG1fbG9jYXRpb247CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCi0tIAoxLjcu NC4xCgo=