219844 2020-12-13 20:22:32 -0800 [GTK] Build failures with GTK4 3.99.5.1 2021-01-07 02:02:54 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=219983 P2 Normal --- 1 lmoura lmoura annulen benjamin berto bugs-noreply cdumez cgarcia cmarcelo ews-watchlist gustavo gyuyoung.kim pnormand ryuan.choi sergio oldest_to_newest 1714369 0 lmoura 2020-12-13 20:22:32 -0800 While updating GTK4 from 3.99.4 to 3.99.5 in bug219781, the compilation failed due to some deprecated API that were removed between 3.99.4 and 3.99.5: * gtk_window_get_size * gtk_window_resize * gtk_native_check_resize 1714373 1 416136 lmoura 2020-12-13 21:00:39 -0800 Created attachment 416136 Initial patch Initial patch with tentative fixes where the build failed. In `webkitWebViewBaseSizeAllocate` I left the gtk_native_check_resize commented out as I'm not sure how to proceed with it. The GTK changes replaced it with explicit calls to the child types. Should WebKitGTK then do something similar and go through each of the internal children and call the appropiate functions? 1714374 2 ews-watchlist 2020-12-13 21:01:15 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See https://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1714404 3 416136 cgarcia 2020-12-14 02:36:02 -0800 Comment on attachment 416136 Initial patch View in context: https://bugs.webkit.org/attachment.cgi?id=416136&action=review I had to fix the build too, I'll submit a new patch > Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp:201 > +#if USE(GTK4) > + gtk_window_get_default_size(GTK_WINDOW(window), &width, &height); > +#else > gtk_window_get_size(GTK_WINDOW(window), &width, &height); > +#endif We normally add the missing function to GtkVersioning.h to avoid the ifdefs. > Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp:868 > - if (GTK_IS_NATIVE(child)) > - gtk_native_check_resize(GTK_NATIVE(child)); > + // FIXME > + // GTK Replaced check_resize with explicit calls on each widget (eg gtk_popover_present) > + // if (GTK_IS_NATIVE(child)) > + // gtk_native_check_resize(GTK_NATIVE(child)); This is always a popover in our case, it's either the context menu or an input drop down list. > Source/WebKit/UIProcess/API/gtk/WebKitWebViewGtk.cpp:303 > +#if USE(GTK4) > + // FIXME get the default_widget and resize or just NOP as we just got the default_size? > +#else > gtk_window_resize(window, x, y); > +#endif This is a good point, I guess we will have to save the previous size now in the case of gtk4. 1714406 4 416142 cgarcia 2020-12-14 02:37:09 -0800 Created attachment 416142 Patch 1714408 5 416144 cgarcia 2020-12-14 02:41:50 -0800 Created attachment 416144 Patch 1717912 6 cgarcia 2021-01-07 02:02:54 -0800 Committed r271231: <https://trac.webkit.org/changeset/271231> 416136 2020-12-13 21:00:39 -0800 2020-12-14 02:37:09 -0800 Initial patch bug-219844-20201214020038.patch text/plain 9889 lmoura U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNjY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDg0YzYyZmQzM2QyODAyNzE0 NTNkMzQxMzBkOWRlNjg2ZmQ2MDcxYzQuLjJiNmYyZjFlOTdmMjEyMjNiNDdiODQyMzZjMGVmMTll YjI0YzlkMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjAtMTItMTMgIExhdXJvIE1v dXJhICA8bG1vdXJhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gQnVpbGQgZmFpbHVyZXMg d2l0aCBHVEs0IDMuOTkuNS4xCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTk4NDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzCisKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL2dsaWIvV2ViS2l0VUlDbGllbnQuY3BwOiBEZXByZWNhdGVkCisgICAgICAgIGd0a193 aW5kb3dfZ2V0X3NpemUKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3 QmFzZS5jcHA6CisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZVNpemVBbGxvY2F0ZSk6IFRPRE8g UmVwbGFjZSBndGtfbmF0aXZlX2NoZWNrX3Jlc2l6ZQorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdFdlYlZpZXdHdGsuY3BwOgorICAgICAgICAod2Via2l0V2ViVmlld01heGltaXpl V2luZG93KTogRGVwcmVjYXRlZCBndGtfd2luZG93X3Jlc2l6ZQorICAgICAgICAod2Via2l0V2Vi Vmlld1Jlc3RvcmVXaW5kb3cpOiBEaXR0by4KKwogMjAyMC0xMi0xMCAgQW5keSBFc3RlcyAgPGFl c3Rlc0BhcHBsZS5jb20+CiAKICAgICAgICAgW01hY10gQ3JlYXRlIGEgZm9ybWF0IHJlYWRlciBw bHVnLWluIGZvciBXZWJNCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Z2xpYi9XZWJLaXRVSUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xp Yi9XZWJLaXRVSUNsaWVudC5jcHAKaW5kZXggMmNlYjJiNGY0OWY0MDliYmU2ZTY4MTAxMTVlMzZk MGM4NGY4M2I1ZC4uOTRkNWJlMGFlNTE3NWViN2YyYmEzNTc4NzIwM2MyNjk3N2MxZTUyNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0VUlDbGllbnQu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFVJQ2xpZW50 LmNwcApAQCAtMTk0LDcgKzE5NCwxMSBAQCBwcml2YXRlOgogICAgICAgICAgICAgYm9vbCBuZWVk c1Jlc2l6ZSA9IGZhbHNlOwogICAgICAgICAgICAgaWYgKGdlb21ldHJ5LndpZHRoID4gMCAmJiBn ZW9tZXRyeS5oZWlnaHQgPiAwKSB7CiAgICAgICAgICAgICAgICAgaW50IHdpZHRoLCBoZWlnaHQ7 CisjaWYgVVNFKEdUSzQpCisgICAgICAgICAgICAgICAgZ3RrX3dpbmRvd19nZXRfZGVmYXVsdF9z aXplKEdUS19XSU5ET1cod2luZG93KSwgJndpZHRoLCAmaGVpZ2h0KTsKKyNlbHNlCiAgICAgICAg ICAgICAgICAgZ3RrX3dpbmRvd19nZXRfc2l6ZShHVEtfV0lORE9XKHdpbmRvdyksICZ3aWR0aCwg JmhlaWdodCk7CisjZW5kaWYKICAgICAgICAgICAgICAgICBuZWVkc1Jlc2l6ZSA9IHdpZHRoICE9 IGdlb21ldHJ5LndpZHRoIHx8IGhlaWdodCAhPSBnZW9tZXRyeS5oZWlnaHQ7CiAgICAgICAgICAg ICB9CiAKQEAgLTIxMiw4ICsyMTYsMTMgQEAgcHJpdmF0ZToKICAgICAgICAgICAgIGlmIChuZWVk c01vdmUpCiAgICAgICAgICAgICAgICAgZ3RrX3dpbmRvd19tb3ZlKEdUS19XSU5ET1cod2luZG93 KSwgZ2VvbWV0cnkueCwgZ2VvbWV0cnkueSk7CiAjZW5kaWYgLy8gIVVTRShHVEs0KQotICAgICAg ICAgICAgaWYgKG5lZWRzUmVzaXplKQorICAgICAgICAgICAgaWYgKG5lZWRzUmVzaXplKSB7Cisj aWYgVVNFKEdUSzQpCisgICAgICAgICAgICAgICAgZ3RrX3dpbmRvd19zZXRfZGVmYXVsdF9zaXpl KEdUS19XSU5ET1cod2luZG93KSwgZ2VvbWV0cnkud2lkdGgsIGdlb21ldHJ5LmhlaWdodCk7Cisj ZWxzZQogICAgICAgICAgICAgICAgIGd0a193aW5kb3dfcmVzaXplKEdUS19XSU5ET1cod2luZG93 KSwgZ2VvbWV0cnkud2lkdGgsIGdlb21ldHJ5LmhlaWdodCk7CisjZW5kaWYKKyAgICAgICAgICAg IH0KIAogICAgICAgICAgICAgLy8gV2UgbmVlZCB0aGUgbW92ZS9yZXNpemUgdG8gaGFwcGVuIHN5 bmNocm9ub3VzbHkgaW4gYXV0b21hdGlvbiBtb2RlLCBzbyB3ZSB1c2UgYSBuZXN0ZWQgUnVuTG9v cAogICAgICAgICAgICAgLy8gdG8gd2FpdCwgdXAgdG9wIDIwMCBtaWxsaXNlY29uZHMsIGZvciB0 aGUgY29uZmlndXJlIGV2ZW50cy4KQEAgLTIzOSw3ICsyNDgsMTEgQEAgcHJpdmF0ZToKICAgICAg ICAgR3RrV2lkZ2V0KiB3aW5kb3cgPSBndGtfd2lkZ2V0X2dldF90b3BsZXZlbChHVEtfV0lER0VU KG1fd2ViVmlldykpOwogICAgICAgICBpZiAoV2ViQ29yZTo6d2lkZ2V0SXNPbnNjcmVlblRvcGxl dmVsV2luZG93KHdpbmRvdykgJiYgZ3RrX3dpZGdldF9nZXRfdmlzaWJsZSh3aW5kb3cpKSB7CiAg ICAgICAgICAgICBndGtfd2luZG93X2dldF9wb3NpdGlvbihHVEtfV0lORE9XKHdpbmRvdyksICZn ZW9tZXRyeS54LCAmZ2VvbWV0cnkueSk7CisjaWYgVVNFKEdUSzQpCisgICAgICAgICAgICBndGtf d2luZG93X2dldF9kZWZhdWx0X3NpemUoR1RLX1dJTkRPVyh3aW5kb3cpLCAmZ2VvbWV0cnkud2lk dGgsICZnZW9tZXRyeS5oZWlnaHQpOworI2Vsc2UKICAgICAgICAgICAgIGd0a193aW5kb3dfZ2V0 X3NpemUoR1RLX1dJTkRPVyh3aW5kb3cpLCAmZ2VvbWV0cnkud2lkdGgsICZnZW9tZXRyeS5oZWln aHQpOworI2VuZGlmCiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBHZGtSZWN0YW5nbGUg ZGVmYXVsdEdlb21ldHJ5OwogICAgICAgICAgICAgd2Via2l0X3dpbmRvd19wcm9wZXJ0aWVzX2dl dF9nZW9tZXRyeSh3ZWJraXRfd2ViX3ZpZXdfZ2V0X3dpbmRvd19wcm9wZXJ0aWVzKG1fd2ViVmll dyksICZkZWZhdWx0R2VvbWV0cnkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcAppbmRleCBiYmMzOTcxZWUyYjc1ZWY4Mzhl ZmIzMzUwNTIwNTU1YWQyZjc5M2Y3Li41ZGYyMTNjOTg2MTY4NDgyOTk2ZmI1MmYxZTllMTE1NWEz OGVlOTk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dFdlYlZpZXdCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFdlYlZpZXdCYXNlLmNwcApAQCAtODYyLDggKzg2MiwxMCBAQCBzdGF0aWMgdm9pZCB3ZWJr aXRXZWJWaWV3QmFzZVNpemVBbGxvY2F0ZShHdGtXaWRnZXQqIHdpZGdldCwgR3RrQWxsb2NhdGlv biogYWxsbwogCiAjaWYgVVNFKEdUSzQpCiAgICAgZm9yIChhdXRvKiBjaGlsZCA9IGd0a193aWRn ZXRfZ2V0X2ZpcnN0X2NoaWxkKHdpZGdldCk7IGNoaWxkOyBjaGlsZCA9IGd0a193aWRnZXRfZ2V0 X25leHRfc2libGluZyhjaGlsZCkpIHsKLSAgICAgICAgaWYgKEdUS19JU19OQVRJVkUoY2hpbGQp KQotICAgICAgICAgICAgZ3RrX25hdGl2ZV9jaGVja19yZXNpemUoR1RLX05BVElWRShjaGlsZCkp OworICAgICAgICAvLyBGSVhNRQorICAgICAgICAvLyBHVEsgUmVwbGFjZWQgY2hlY2tfcmVzaXpl IHdpdGggZXhwbGljaXQgY2FsbHMgb24gZWFjaCB3aWRnZXQgKGVnIGd0a19wb3BvdmVyX3ByZXNl bnQpCisgICAgICAgIC8vIGlmIChHVEtfSVNfTkFUSVZFKGNoaWxkKSkKKyAgICAgICAgLy8gICAg IGd0a19uYXRpdmVfY2hlY2tfcmVzaXplKEdUS19OQVRJVkUoY2hpbGQpKTsKICAgICB9CiAjZW5k aWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRX ZWJWaWV3R3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vi Vmlld0d0ay5jcHAKaW5kZXggOGIwYzg5MGMyMWJkMmU1M2Q3ODAzZjIwZThkZmE0MGM3YzIxMDJi Yy4uMGZkYzBhNWFlZmM2MDM2NjRlNGY0YjJkNThmZmNjYjMwMWQ5YzM1ZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3R3RrLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdHdGsuY3BwCkBA IC0yNDQsNyArMjQ0LDExIEBAIHZvaWQgd2Via2l0V2ViVmlld01heGltaXplV2luZG93KFdlYktp dFdlYlZpZXcqIHZpZXcsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mCiAgICAgICAgIGlmICgh Z19zdHJjbXAwKHVuZGVyWHZmYiwgInllcyIpKSB7CiAgICAgICAgICAgICBhdXRvIHNjcmVlblJl Y3QgPSBXZWJDb3JlOjpzY3JlZW5BdmFpbGFibGVSZWN0KG51bGxwdHIpOwogICAgICAgICAgICAg Z3RrX3dpbmRvd19tb3ZlKHdpbmRvdywgc2NyZWVuUmVjdC54KCksIHNjcmVlblJlY3QueSgpKTsK KyNpZiBVU0UoR1RLNCkKKyAgICAgICAgICAgIGd0a193aW5kb3dfc2V0X2RlZmF1bHRfc2l6ZSh3 aW5kb3csIHNjcmVlblJlY3Qud2lkdGgoKSwgc2NyZWVuUmVjdC5oZWlnaHQoKSk7CisjZWxzZQog ICAgICAgICAgICAgZ3RrX3dpbmRvd19yZXNpemUod2luZG93LCBzY3JlZW5SZWN0LndpZHRoKCks IHNjcmVlblJlY3QuaGVpZ2h0KCkpOworI2VuZGlmCiAgICAgICAgIH0KICAgICB9CiAjZW5kaWYK QEAgLTI5Miw3ICsyOTYsMTEgQEAgdm9pZCB3ZWJraXRXZWJWaWV3UmVzdG9yZVdpbmRvdyhXZWJL aXRXZWJWaWV3KiB2aWV3LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYKICAgICAgICAgaWYg KCFnX3N0cmNtcDAodW5kZXJYdmZiLCAieWVzIikpIHsKICAgICAgICAgICAgIGludCB4LCB5Owog ICAgICAgICAgICAgZ3RrX3dpbmRvd19nZXRfZGVmYXVsdF9zaXplKHdpbmRvdywgJngsICZ5KTsK KyNpZiBVU0UoR1RLNCkKKyAgICAgICAgICAgIC8vIEZJWE1FIGdldCB0aGUgZGVmYXVsdF93aWRn ZXQgYW5kIHJlc2l6ZSBvciBqdXN0IE5PUCBhcyB3ZSBqdXN0IGdvdCB0aGUgZGVmYXVsdF9zaXpl PworI2Vsc2UKICAgICAgICAgICAgIGd0a193aW5kb3dfcmVzaXplKHdpbmRvdywgeCwgeSk7Cisj ZW5kaWYKICAgICAgICAgfQogICAgIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdl TG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGE2MDA0NTgxYThjMjFkNzg4MTc4NDIzZmQxYWU0 MWRmMzJlNGMwM2QuLmE4MWRlZDI2NjEwMzRkMzAxYTdjMjY2MjcwYTUwNGVjYjQ2N2VjM2QgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwyMSBAQAorMjAyMC0xMi0xMyAgTGF1cm8gTW91cmEgIDxsbW91cmFAaWdhbGlhLmNvbT4KKwor ICAgICAgICBbR1RLXSBCdWlsZCBmYWlsdXJlcyB3aXRoIEdUSzQgMy45OS41LjEKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTg0NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTWluaUJyb3dzZXIvZ3Rr L0Jyb3dzZXJTZWFyY2hCb3guYzoKKyAgICAgICAgKGJyb3dzZXJTZWFyY2hCb3hTaXplQWxsb2Nh dGUpOiBSZXBsYWNlIG5hdGl2ZV9jaGVja19yZXNpemUgd2l0aAorICAgICAgICBwb3BvdmVyX3By ZXNlbnQKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jOgorICAgICAg ICAod2ViVmlld1JlYWR5VG9TaG93KTogRGVwcmVjYXRlZCBndGtfd2luZG93X3Jlc2l6ZQorICAg ICAgICAqIFRlc3RXZWJLaXRBUEkvZ3RrL1BsYXRmb3JtV2ViVmlld0d0ay5jcHA6CisgICAgICAg IChUZXN0V2ViS2l0QVBJOjpQbGF0Zm9ybVdlYlZpZXc6OnJlc2l6ZVRvKTogRGl0dG8KKyAgICAg ICAgKiBXZWJLaXRUZXN0UnVubmVyL2d0ay9QbGF0Zm9ybVdlYlZpZXdHdGsuY3BwOgorICAgICAg ICAoV1RSOjpQbGF0Zm9ybVdlYlZpZXc6OndpbmRvd0ZyYW1lKTogRGVwcmVjYXRlZCBndGtfd2lu ZG93X2dldF9zaXplCisgICAgICAgIChXVFI6OlBsYXRmb3JtV2ViVmlldzo6c2V0V2luZG93RnJh bWUpOiBEaXR0bworCiAyMDIwLTEyLTEwICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+ CiAKICAgICAgICAgW0dQVVByb2Nlc3NdIEN1dCBpbiBoYWxmIGFtb3VudCBvZiBJUEMgbmVlZGVk IHRvIGRvIFdlYkF1ZGlvCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3Nl clNlYXJjaEJveC5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJTZWFyY2hCb3guYwpp bmRleCBhNzYwZWFiZTJjYWJhZDUzNWQ2NTRlMjA3YmFiYWEyNjRlZGVlYzdiLi44ZWI0MDc5Mjkx YTZlODNkMTk4ZDBjYWYxZWE4NGYzNTZjYmNmNzQ2IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJv d3Nlci9ndGsvQnJvd3NlclNlYXJjaEJveC5jCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9C cm93c2VyU2VhcmNoQm94LmMKQEAgLTI5Niw3ICsyOTYsNyBAQCBzdGF0aWMgdm9pZCBicm93c2Vy U2VhcmNoQm94U2l6ZUFsbG9jYXRlKEd0a1dpZGdldCAqd2lkZ2V0LCBpbnQgd2lkdGgsIGludCBo ZWlnaAogCiAgICAgQnJvd3NlclNlYXJjaEJveCAqc2VhcmNoQm94ID0gQlJPV1NFUl9TRUFSQ0hf Qk9YKHdpZGdldCk7CiAgICAgaWYgKHNlYXJjaEJveC0+b3B0aW9uc1BvcG92ZXIpCi0gICAgICAg IGd0a19uYXRpdmVfY2hlY2tfcmVzaXplKEdUS19OQVRJVkUoc2VhcmNoQm94LT5vcHRpb25zUG9w b3ZlcikpOworICAgICAgICBndGtfcG9wb3Zlcl9wcmVzZW50KEdUS19QT1BPVkVSKHNlYXJjaEJv eC0+b3B0aW9uc1BvcG92ZXIpKTsKIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Ub29scy9NaW5p QnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dz ZXJXaW5kb3cuYwppbmRleCBkZDIxMmFiNTNiYTgzY2IzZWI2ODI0YWE0YzZlMTRmMWZkYzdiNDc4 Li5jZTAwZmFmOWY0YmI4NTgyMTg4NDc0ZjY3NmQ3M2Q2NDA1M2IyNDVkIDEwMDY0NAotLS0gYS9U b29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jCisrKyBiL1Rvb2xzL01pbmlCcm93 c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKQEAgLTQwMyw4ICs0MDMsMTMgQEAgc3RhdGljIHZvaWQg d2ViVmlld1JlYWR5VG9TaG93KFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEJyb3dzZXJXaW5kb3cg KndpbmRvdykKICAgICBpZiAoZ2VvbWV0cnkueCA+PSAwICYmIGdlb21ldHJ5LnkgPj0gMCkKICAg ICAgICAgZ3RrX3dpbmRvd19tb3ZlKEdUS19XSU5ET1cod2luZG93KSwgZ2VvbWV0cnkueCwgZ2Vv bWV0cnkueSk7CiAjZW5kaWYKLSAgICBpZiAoZ2VvbWV0cnkud2lkdGggPiAwICYmIGdlb21ldHJ5 LmhlaWdodCA+IDApCisgICAgaWYgKGdlb21ldHJ5LndpZHRoID4gMCAmJiBnZW9tZXRyeS5oZWln aHQgPiAwKSB7CisjaWYgIUdUS19DSEVDS19WRVJTSU9OKDMsIDk5LCA1KQogICAgICAgICBndGtf d2luZG93X3Jlc2l6ZShHVEtfV0lORE9XKHdpbmRvdyksIGdlb21ldHJ5LndpZHRoLCBnZW9tZXRy eS5oZWlnaHQpOworI2Vsc2UKKyAgICAgICAgZ3RrX3dpbmRvd19zZXRfZGVmYXVsdF9zaXplKEdU S19XSU5ET1cod2luZG93KSwgZ2VvbWV0cnkud2lkdGgsIGdlb21ldHJ5LmhlaWdodCk7CisjZW5k aWYKKyAgICB9CiAKICAgICBpZiAoIXdlYmtpdF93aW5kb3dfcHJvcGVydGllc19nZXRfdG9vbGJh cl92aXNpYmxlKHdpbmRvd1Byb3BlcnRpZXMpKQogICAgICAgICBndGtfd2lkZ2V0X2hpZGUod2lu ZG93LT50b29sYmFyKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ3RrL1BsYXRm b3JtV2ViVmlld0d0ay5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2d0ay9QbGF0Zm9ybVdlYlZp ZXdHdGsuY3BwCmluZGV4IDViM2VjNmZlM2EyOTVlMGQ4ODM3ZDI0NGRlMjMxMzUwZjVkNzgzYjEu LmIwNjZlMTg0NGI0ZDlkZmEzNTA5MTk3MmMzZTEwMGEyYjU2OWUwMTAgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvZ3RrL1BsYXRmb3JtV2ViVmlld0d0ay5jcHAKKysrIGIvVG9vbHMv VGVzdFdlYktpdEFQSS9ndGsvUGxhdGZvcm1XZWJWaWV3R3RrLmNwcApAQCAtOTAsNyArOTAsMTEg QEAgV0tQYWdlUmVmIFBsYXRmb3JtV2ViVmlldzo6cGFnZSgpIGNvbnN0CiAKIHZvaWQgUGxhdGZv cm1XZWJWaWV3OjpyZXNpemVUbyh1bnNpZ25lZCB3aWR0aCwgdW5zaWduZWQgaGVpZ2h0KQogewor I2lmIFVTRShHVEs0KQorICAgIGd0a193aW5kb3dfc2V0X2RlZmF1bHRfc2l6ZShHVEtfV0lORE9X KG1fd2luZG93KSwgd2lkdGgsIGhlaWdodCk7CisjZWxzZQogICAgIGd0a193aW5kb3dfcmVzaXpl KEdUS19XSU5ET1cobV93aW5kb3cpLCB3aWR0aCwgaGVpZ2h0KTsKKyNlbmRpZgogfQogCiBzdGF0 aWMgaW5saW5lIFdlYktpdFdlYlZpZXdCYXNlKiB0b1dlYktpdEdMaWJBUEkoUGxhdGZvcm1XS1Zp ZXcgdmlldykKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvZ3RrL1BsYXRmb3Jt V2ViVmlld0d0ay5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2d0ay9QbGF0Zm9ybVdlYlZp ZXdHdGsuY3BwCmluZGV4IDU0OTcxZDQyODZkYTBiZTY0YjYyMjIyMzU4OTczMjRjMjFkZTQ1NTEu LmNiODYxZWI4MzQyZTk3NTM5MzlkMDliYmQwZDQ1ZTc3OGExYjYyNjYgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvZ3RrL1BsYXRmb3JtV2ViVmlld0d0ay5jcHAKKysrIGIvVG9v bHMvV2ViS2l0VGVzdFJ1bm5lci9ndGsvUGxhdGZvcm1XZWJWaWV3R3RrLmNwcApAQCAtMTMyLDcg KzEzMiw3IEBAIFdLUmVjdCBQbGF0Zm9ybVdlYlZpZXc6OndpbmRvd0ZyYW1lKCkKIHsKICAgICBH dGtBbGxvY2F0aW9uIGdlb21ldHJ5ID0geyAwLCAwLCAwLCAwIH07CiAjaWYgVVNFKEdUSzQpCi0g ICAgZ3RrX3dpbmRvd19nZXRfc2l6ZShHVEtfV0lORE9XKG1fd2luZG93KSwgJmdlb21ldHJ5Lndp ZHRoLCAmZ2VvbWV0cnkuaGVpZ2h0KTsKKyAgICBndGtfd2luZG93X2dldF9kZWZhdWx0X3NpemUo R1RLX1dJTkRPVyhtX3dpbmRvdyksICZnZW9tZXRyeS53aWR0aCwgJmdlb21ldHJ5LmhlaWdodCk7 CiAjZWxzZQogICAgIGdka193aW5kb3dfZ2V0X2dlb21ldHJ5KGd0a193aWRnZXRfZ2V0X3dpbmRv dyhHVEtfV0lER0VUKG1fd2luZG93KSksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJmdl b21ldHJ5LngsICZnZW9tZXRyeS55LCAmZ2VvbWV0cnkud2lkdGgsICZnZW9tZXRyeS5oZWlnaHQp OwpAQCAtMTQ5LDcgKzE0OSw3IEBAIFdLUmVjdCBQbGF0Zm9ybVdlYlZpZXc6OndpbmRvd0ZyYW1l KCkKIHZvaWQgUGxhdGZvcm1XZWJWaWV3OjpzZXRXaW5kb3dGcmFtZShXS1JlY3QgZnJhbWUsIFdl YlZpZXdTaXppbmdNb2RlKQogewogI2lmIFVTRShHVEs0KQotICAgIGd0a193aW5kb3dfcmVzaXpl KEdUS19XSU5ET1cobV93aW5kb3cpLCBmcmFtZS5zaXplLndpZHRoLCBmcmFtZS5zaXplLmhlaWdo dCk7CisgICAgZ3RrX3dpbmRvd19zZXRfZGVmYXVsdF9zaXplKEdUS19XSU5ET1cobV93aW5kb3cp LCBmcmFtZS5zaXplLndpZHRoLCBmcmFtZS5zaXplLmhlaWdodCk7CiAjZWxzZQogICAgIGdka193 aW5kb3dfbW92ZV9yZXNpemUoZ3RrX3dpZGdldF9nZXRfd2luZG93KEdUS19XSURHRVQobV93aW5k b3cpKSwKICAgICAgICAgZnJhbWUub3JpZ2luLngsIGZyYW1lLm9yaWdpbi55LCBmcmFtZS5zaXpl LndpZHRoLCBmcmFtZS5zaXplLmhlaWdodCk7Cg== 416142 2020-12-14 02:37:09 -0800 2020-12-14 02:41:50 -0800 Patch wk2-gtk4-build.diff text/plain 6465 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggMzRkNDA5MzZmMGY0Li4xMTllODg0NzllN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIw MjAtMTItMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisg ICAgICAgIFtHVEtdIEJ1aWxkIGZhaWx1cmVzIHdpdGggR1RLNCAzLjk5LjUuMQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5ODQ0CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3dGYvUGxhdGZvcm0uaDoK KwogMjAyMC0xMi0xMCAgSm9obiBXaWxhbmRlciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KIAogICAg ICAgICBQQ006IFR1cm4gZmVhdHVyZSBvbiBieSBkZWZhdWx0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V1RGL3d0Zi9QbGF0Zm9ybS5oIGIvU291cmNlL1dURi93dGYvUGxhdGZvcm0uaAppbmRleCAwMDE4 YWZkYzkxOTIuLmIwZDgxNzcyNzM3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvUGxhdGZv cm0uaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oCkBAIC04NSw3ICs4NSw3IEBACiAj aWYgUExBVEZPUk0oR1RLKQogI2RlZmluZSBHTElCX1ZFUlNJT05fTUlOX1JFUVVJUkVEIEdMSUJf VkVSU0lPTl8yXzQ0CiAjaWYgVVNFKEdUSzQpCi0jZGVmaW5lIEdES19WRVJTSU9OX01JTl9SRVFV SVJFRCBHREtfVkVSU0lPTl8zXzkyCisjZGVmaW5lIEdES19WRVJTSU9OX01JTl9SRVFVSVJFRCBH REtfVkVSU0lPTl80XzAKICNlbHNlCiAjZGVmaW5lIEdES19WRVJTSU9OX01JTl9SRVFVSVJFRCBH REtfVkVSU0lPTl8zXzIyCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0MDY5YmZmMTkyMDIuLjJmMWIz MjI4MzZlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTEyLTE0ICBDYXJsb3Mg R2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBCdWls ZCBmYWlsdXJlcyB3aXRoIEdUSzQgMy45OS41LjEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTg0NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoT09QUyEpLgorCisgICAgICAgICog cGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuaDoKKyAgICAgICAgKGd0a193aW5kb3dfcmVzaXpl KToKKyAgICAgICAgKGd0a193aW5kb3dfZ2V0X3NpemUpOgorCiAyMDIwLTEyLTExICBDYXJsb3Mg R2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk LiBSZW1vdmUgdGVtcG9yYXJ5IHdvcmthcm91bmQgYWRkZWQgdG8gZml4IHRoZSBidWlsZCB3aXRo IEdDQyAxMApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNp b25pbmcuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmgKaW5k ZXggNGNmMTllYjYyMGMzLi43MjljZDI3NmVkZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL0d0a1ZlcnNpb25pbmcuaApAQCAtNjIsNiArNjIsMTggQEAgZ3RrX3dpbmRvd19tb3Zl KEd0a1dpbmRvdyosIGludCwgaW50KQogewogfQogCitzdGF0aWMgaW5saW5lIHZvaWQKK2d0a193 aW5kb3dfcmVzaXplKEd0a1dpbmRvdyogd2luZG93LCBpbnQgd2lkdGgsIGludCBoZWlnaHQpCit7 CisgICAgZ3RrX3dpbmRvd19zZXRfZGVmYXVsdF9zaXplKHdpbmRvdywgd2lkdGgsIGhlaWdodCk7 Cit9CisKK3N0YXRpYyBpbmxpbmUgdm9pZAorZ3RrX3dpbmRvd19nZXRfc2l6ZShHdGtXaW5kb3cq IHdpbmRvdywgaW50KiB3aWR0aCwgaW50KiBoZWlnaHQpCit7CisgICAgZ3RrX3dpbmRvd19nZXRf ZGVmYXVsdF9zaXplKHdpbmRvdywgd2lkdGgsIGhlaWdodCk7Cit9CisKIHN0YXRpYyBpbmxpbmUg dm9pZAogZ3RrX2luaXQoaW50KiwgY2hhcioqKikKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggOTdmNzhlNWEzMzZl Li4wYWJkMjNlNDlhYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMTItMTQgIENh cmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtd IEJ1aWxkIGZhaWx1cmVzIHdpdGggR1RLNCAzLjk5LjUuMQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5ODQ0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJW aWV3QmFzZS5jcHA6CisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZVNpemVBbGxvY2F0ZSk6CisK IDIwMjAtMTItMTEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgog CiAgICAgICAgIFByb3RlY3QgdGhlIFdlYlByb2Nlc3NQb29sIGVhcmxpZXIgaW4gV2ViUHJvY2Vz c0NhY2hlOjphZGRQcm9jZXNzSWZQb3NzaWJsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcAppbmRleCBiYmMzOTcxZWUyYjcu Ljc5ODBhZjYxNjk0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKQEAgLTg2Miw4ICs4NjIsOCBAQCBzdGF0aWMgdm9p ZCB3ZWJraXRXZWJWaWV3QmFzZVNpemVBbGxvY2F0ZShHdGtXaWRnZXQqIHdpZGdldCwgR3RrQWxs b2NhdGlvbiogYWxsbwogCiAjaWYgVVNFKEdUSzQpCiAgICAgZm9yIChhdXRvKiBjaGlsZCA9IGd0 a193aWRnZXRfZ2V0X2ZpcnN0X2NoaWxkKHdpZGdldCk7IGNoaWxkOyBjaGlsZCA9IGd0a193aWRn ZXRfZ2V0X25leHRfc2libGluZyhjaGlsZCkpIHsKLSAgICAgICAgaWYgKEdUS19JU19OQVRJVkUo Y2hpbGQpKQotICAgICAgICAgICAgZ3RrX25hdGl2ZV9jaGVja19yZXNpemUoR1RLX05BVElWRShj aGlsZCkpOworICAgICAgICBpZiAoR1RLX0lTX1BPUE9WRVIoY2hpbGQpKQorICAgICAgICAgICAg Z3RrX3BvcG92ZXJfcHJlc2VudChHVEtfUE9QT1ZFUihjaGlsZCkpOwogICAgIH0KICNlbmRpZgog CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzEz ZjAxNDQwOTBmLi41NmJkNmFlYzg0YTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysg Yi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMC0xMi0xNCAgQ2FybG9zIEdh cmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gQnVpbGQg ZmFpbHVyZXMgd2l0aCBHVEs0IDMuOTkuNS4xCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk4NDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIE1pbmlCcm93c2VyL2d0ay9Ccm93c2VyU2VhcmNoQm94LmM6 CisgICAgICAgIChicm93c2VyU2VhcmNoQm94U2l6ZUFsbG9jYXRlKToKKyAgICAgICAgKiBNaW5p QnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jOgorICAgICAgICAod2ViVmlld1JlYWR5VG9TaG93 KToKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9ndGsvQ01ha2VMaXN0cy50eHQ6CisKIDIwMjAtMTIt MTEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAg IFJFR1JFU1NJT04ocjI3MDE4Nik6IFtHVEtdIE1pbmlCcm93c2VyOiBkbyBub3QgZXhpdCBhZnRl ciBsb2FkIHdoZW4gbm8gYXJndW1lbnRzIGdpdmVuCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJv d3Nlci9ndGsvQnJvd3NlclNlYXJjaEJveC5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dz ZXJTZWFyY2hCb3guYwppbmRleCBhNzYwZWFiZTJjYWIuLjhlYjQwNzkyOTFhNiAxMDA2NDQKLS0t IGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJTZWFyY2hCb3guYworKysgYi9Ub29scy9N aW5pQnJvd3Nlci9ndGsvQnJvd3NlclNlYXJjaEJveC5jCkBAIC0yOTYsNyArMjk2LDcgQEAgc3Rh dGljIHZvaWQgYnJvd3NlclNlYXJjaEJveFNpemVBbGxvY2F0ZShHdGtXaWRnZXQgKndpZGdldCwg aW50IHdpZHRoLCBpbnQgaGVpZ2gKIAogICAgIEJyb3dzZXJTZWFyY2hCb3ggKnNlYXJjaEJveCA9 IEJST1dTRVJfU0VBUkNIX0JPWCh3aWRnZXQpOwogICAgIGlmIChzZWFyY2hCb3gtPm9wdGlvbnNQ b3BvdmVyKQotICAgICAgICBndGtfbmF0aXZlX2NoZWNrX3Jlc2l6ZShHVEtfTkFUSVZFKHNlYXJj aEJveC0+b3B0aW9uc1BvcG92ZXIpKTsKKyAgICAgICAgZ3RrX3BvcG92ZXJfcHJlc2VudChHVEtf UE9QT1ZFUihzZWFyY2hCb3gtPm9wdGlvbnNQb3BvdmVyKSk7CiB9CiAjZW5kaWYKIApkaWZmIC0t Z2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYyBiL1Rvb2xzL01pbmlC cm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKaW5kZXggZGQyMTJhYjUzYmE4Li5mYWQzMTVkMTgz MTEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKKysr IGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYwpAQCAtMzk5LDEyICszOTks MTUgQEAgc3RhdGljIHZvaWQgd2ViVmlld1JlYWR5VG9TaG93KFdlYktpdFdlYlZpZXcgKndlYlZp ZXcsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykKIAogICAgIEdka1JlY3RhbmdsZSBnZW9tZXRyeTsK ICAgICB3ZWJraXRfd2luZG93X3Byb3BlcnRpZXNfZ2V0X2dlb21ldHJ5KHdpbmRvd1Byb3BlcnRp ZXMsICZnZW9tZXRyeSk7Ci0jaWYgIUdUS19DSEVDS19WRVJTSU9OKDMsIDk4LCAwKQorI2lmIEdU S19DSEVDS19WRVJTSU9OKDMsIDk5LCA1KQorICAgIGlmIChnZW9tZXRyeS53aWR0aCA+IDAgJiYg Z2VvbWV0cnkuaGVpZ2h0ID4gMCkKKwlndGtfd2luZG93X3NldF9kZWZhdWx0X3NpemUoR1RLX1dJ TkRPVyh3aW5kb3cpLCBnZW9tZXRyeS53aWR0aCwgZ2VvbWV0cnkuaGVpZ2h0KTsKKyNlbHNlCiAg ICAgaWYgKGdlb21ldHJ5LnggPj0gMCAmJiBnZW9tZXRyeS55ID49IDApCiAgICAgICAgIGd0a193 aW5kb3dfbW92ZShHVEtfV0lORE9XKHdpbmRvdyksIGdlb21ldHJ5LngsIGdlb21ldHJ5LnkpOwot I2VuZGlmCiAgICAgaWYgKGdlb21ldHJ5LndpZHRoID4gMCAmJiBnZW9tZXRyeS5oZWlnaHQgPiAw KQogICAgICAgICBndGtfd2luZG93X3Jlc2l6ZShHVEtfV0lORE9XKHdpbmRvdyksIGdlb21ldHJ5 LndpZHRoLCBnZW9tZXRyeS5oZWlnaHQpOworI2VuZGlmCiAKICAgICBpZiAoIXdlYmtpdF93aW5k b3dfcHJvcGVydGllc19nZXRfdG9vbGJhcl92aXNpYmxlKHdpbmRvd1Byb3BlcnRpZXMpKQogICAg ICAgICBndGtfd2lkZ2V0X2hpZGUod2luZG93LT50b29sYmFyKTsKZGlmZiAtLWdpdCBhL1Rvb2xz L01pbmlCcm93c2VyL2d0ay9DTWFrZUxpc3RzLnR4dCBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9D TWFrZUxpc3RzLnR4dAppbmRleCAxOTA4NWM3ODgwNTYuLjkzYjYyNTIxNmM4ZCAxMDA2NDQKLS0t IGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0NNYWtlTGlzdHMudHh0CisrKyBiL1Rvb2xzL01pbmlC cm93c2VyL2d0ay9DTWFrZUxpc3RzLnR4dApAQCAtNTYsNyArNTYsNyBAQCBhZGRfY3VzdG9tX2Nv bW1hbmQoCiAgICAgVkVSQkFUSU0pCiAKIGlmIChVU0VfR1RLNCkKLSAgICBzZXQoTWluaUJyb3dz ZXJfUFJJVkFURV9ERUZJTklUSU9OUyBHREtfVkVSU0lPTl9NSU5fUkVRVUlSRUQ9R0RLX1ZFUlNJ T05fM185MikKKyAgICBzZXQoTWluaUJyb3dzZXJfUFJJVkFURV9ERUZJTklUSU9OUyBHREtfVkVS U0lPTl9NSU5fUkVRVUlSRUQ9R0RLX1ZFUlNJT05fNF8wKQogZWxzZSAoKQogICAgIHNldChNaW5p QnJvd3Nlcl9QUklWQVRFX0RFRklOSVRJT05TIEdES19WRVJTSU9OX01JTl9SRVFVSVJFRD1HREtf VkVSU0lPTl8zXzIyKQogZW5kaWYgKCkK 416144 2020-12-14 02:41:50 -0800 2021-01-07 01:51:41 -0800 Patch wk2-gtk4-build.diff text/plain 6439 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggMzRkNDA5MzZmMGY0Li4xMTllODg0NzllN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIw MjAtMTItMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisg ICAgICAgIFtHVEtdIEJ1aWxkIGZhaWx1cmVzIHdpdGggR1RLNCAzLjk5LjUuMQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5ODQ0CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3dGYvUGxhdGZvcm0uaDoK KwogMjAyMC0xMi0xMCAgSm9obiBXaWxhbmRlciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KIAogICAg ICAgICBQQ006IFR1cm4gZmVhdHVyZSBvbiBieSBkZWZhdWx0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V1RGL3d0Zi9QbGF0Zm9ybS5oIGIvU291cmNlL1dURi93dGYvUGxhdGZvcm0uaAppbmRleCAwMDE4 YWZkYzkxOTIuLmIwZDgxNzcyNzM3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvUGxhdGZv cm0uaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oCkBAIC04NSw3ICs4NSw3IEBACiAj aWYgUExBVEZPUk0oR1RLKQogI2RlZmluZSBHTElCX1ZFUlNJT05fTUlOX1JFUVVJUkVEIEdMSUJf VkVSU0lPTl8yXzQ0CiAjaWYgVVNFKEdUSzQpCi0jZGVmaW5lIEdES19WRVJTSU9OX01JTl9SRVFV SVJFRCBHREtfVkVSU0lPTl8zXzkyCisjZGVmaW5lIEdES19WRVJTSU9OX01JTl9SRVFVSVJFRCBH REtfVkVSU0lPTl80XzAKICNlbHNlCiAjZGVmaW5lIEdES19WRVJTSU9OX01JTl9SRVFVSVJFRCBH REtfVkVSU0lPTl8zXzIyCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0MDY5YmZmMTkyMDIuLjY4NDc5 OGE1NDRjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIwLTEyLTE0ICBDYXJsb3Mg R2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBCdWls ZCBmYWlsdXJlcyB3aXRoIEdUSzQgMy45OS41LjEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTg0NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuaDoKKyAg ICAgICAgKGd0a193aW5kb3dfcmVzaXplKToKKyAgICAgICAgKGd0a193aW5kb3dfZ2V0X3NpemUp OgorCiAyMDIwLTEyLTExICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkLiBSZW1vdmUgdGVtcG9yYXJ5IHdvcmthcm91bmQgYWRk ZWQgdG8gZml4IHRoZSBidWlsZCB3aXRoIEdDQyAxMApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2d0ay9HdGtWZXJzaW9uaW5nLmgKaW5kZXggNGNmMTllYjYyMGMzLi43MjljZDI3NmVkZjAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuaApAQCAtNjIsNiAr NjIsMTggQEAgZ3RrX3dpbmRvd19tb3ZlKEd0a1dpbmRvdyosIGludCwgaW50KQogewogfQogCitz dGF0aWMgaW5saW5lIHZvaWQKK2d0a193aW5kb3dfcmVzaXplKEd0a1dpbmRvdyogd2luZG93LCBp bnQgd2lkdGgsIGludCBoZWlnaHQpCit7CisgICAgZ3RrX3dpbmRvd19zZXRfZGVmYXVsdF9zaXpl KHdpbmRvdywgd2lkdGgsIGhlaWdodCk7Cit9CisKK3N0YXRpYyBpbmxpbmUgdm9pZAorZ3RrX3dp bmRvd19nZXRfc2l6ZShHdGtXaW5kb3cqIHdpbmRvdywgaW50KiB3aWR0aCwgaW50KiBoZWlnaHQp Cit7CisgICAgZ3RrX3dpbmRvd19nZXRfZGVmYXVsdF9zaXplKHdpbmRvdywgd2lkdGgsIGhlaWdo dCk7Cit9CisKIHN0YXRpYyBpbmxpbmUgdm9pZAogZ3RrX2luaXQoaW50KiwgY2hhcioqKikKIHsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggOTdmNzhlNWEzMzZlLi4wYWJkMjNlNDlhYTEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTMgQEAKKzIwMjAtMTItMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtHVEtdIEJ1aWxkIGZhaWx1cmVzIHdpdGggR1RLNCAzLjk5LjUu MQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5ODQ0 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHA6CisgICAgICAgICh3ZWJraXRXZWJW aWV3QmFzZVNpemVBbGxvY2F0ZSk6CisKIDIwMjAtMTItMTEgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFByb3RlY3QgdGhlIFdlYlByb2Nlc3NQ b29sIGVhcmxpZXIgaW4gV2ViUHJvY2Vzc0NhY2hlOjphZGRQcm9jZXNzSWZQb3NzaWJsZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFz ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNl LmNwcAppbmRleCBiYmMzOTcxZWUyYjcuLjc5ODBhZjYxNjk0ZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKQEAgLTg2 Miw4ICs4NjIsOCBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVNpemVBbGxvY2F0ZShH dGtXaWRnZXQqIHdpZGdldCwgR3RrQWxsb2NhdGlvbiogYWxsbwogCiAjaWYgVVNFKEdUSzQpCiAg ICAgZm9yIChhdXRvKiBjaGlsZCA9IGd0a193aWRnZXRfZ2V0X2ZpcnN0X2NoaWxkKHdpZGdldCk7 IGNoaWxkOyBjaGlsZCA9IGd0a193aWRnZXRfZ2V0X25leHRfc2libGluZyhjaGlsZCkpIHsKLSAg ICAgICAgaWYgKEdUS19JU19OQVRJVkUoY2hpbGQpKQotICAgICAgICAgICAgZ3RrX25hdGl2ZV9j aGVja19yZXNpemUoR1RLX05BVElWRShjaGlsZCkpOworICAgICAgICBpZiAoR1RLX0lTX1BPUE9W RVIoY2hpbGQpKQorICAgICAgICAgICAgZ3RrX3BvcG92ZXJfcHJlc2VudChHVEtfUE9QT1ZFUihj aGlsZCkpOwogICAgIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9U b29scy9DaGFuZ2VMb2cKaW5kZXggNzEzZjAxNDQwOTBmLi41NmJkNmFlYzg0YTAgMTAwNjQ0Ci0t LSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBA QAorMjAyMC0xMi0xNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+ CisKKyAgICAgICAgW0dUS10gQnVpbGQgZmFpbHVyZXMgd2l0aCBHVEs0IDMuOTkuNS4xCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk4NDQKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1pbmlCcm93c2Vy L2d0ay9Ccm93c2VyU2VhcmNoQm94LmM6CisgICAgICAgIChicm93c2VyU2VhcmNoQm94U2l6ZUFs bG9jYXRlKToKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jOgorICAg ICAgICAod2ViVmlld1JlYWR5VG9TaG93KToKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9ndGsvQ01h a2VMaXN0cy50eHQ6CisKIDIwMjAtMTItMTEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNp YUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjI3MDE4Nik6IFtHVEtdIE1pbmlC cm93c2VyOiBkbyBub3QgZXhpdCBhZnRlciBsb2FkIHdoZW4gbm8gYXJndW1lbnRzIGdpdmVuCmRp ZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlclNlYXJjaEJveC5jIGIvVG9v bHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJTZWFyY2hCb3guYwppbmRleCBhNzYwZWFiZTJjYWIu LjhlYjQwNzkyOTFhNiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJT ZWFyY2hCb3guYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlclNlYXJjaEJveC5j CkBAIC0yOTYsNyArMjk2LDcgQEAgc3RhdGljIHZvaWQgYnJvd3NlclNlYXJjaEJveFNpemVBbGxv Y2F0ZShHdGtXaWRnZXQgKndpZGdldCwgaW50IHdpZHRoLCBpbnQgaGVpZ2gKIAogICAgIEJyb3dz ZXJTZWFyY2hCb3ggKnNlYXJjaEJveCA9IEJST1dTRVJfU0VBUkNIX0JPWCh3aWRnZXQpOwogICAg IGlmIChzZWFyY2hCb3gtPm9wdGlvbnNQb3BvdmVyKQotICAgICAgICBndGtfbmF0aXZlX2NoZWNr X3Jlc2l6ZShHVEtfTkFUSVZFKHNlYXJjaEJveC0+b3B0aW9uc1BvcG92ZXIpKTsKKyAgICAgICAg Z3RrX3BvcG92ZXJfcHJlc2VudChHVEtfUE9QT1ZFUihzZWFyY2hCb3gtPm9wdGlvbnNQb3BvdmVy KSk7CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dz ZXJXaW5kb3cuYyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKaW5kZXgg ZGQyMTJhYjUzYmE4Li5kMWViODlhZDk5ZmUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2Vy L2d0ay9Ccm93c2VyV2luZG93LmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJX aW5kb3cuYwpAQCAtMzk5LDEyICszOTksMTUgQEAgc3RhdGljIHZvaWQgd2ViVmlld1JlYWR5VG9T aG93KFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykKIAogICAg IEdka1JlY3RhbmdsZSBnZW9tZXRyeTsKICAgICB3ZWJraXRfd2luZG93X3Byb3BlcnRpZXNfZ2V0 X2dlb21ldHJ5KHdpbmRvd1Byb3BlcnRpZXMsICZnZW9tZXRyeSk7Ci0jaWYgIUdUS19DSEVDS19W RVJTSU9OKDMsIDk4LCAwKQorI2lmIEdUS19DSEVDS19WRVJTSU9OKDMsIDk5LCA1KQorICAgIGlm IChnZW9tZXRyeS53aWR0aCA+IDAgJiYgZ2VvbWV0cnkuaGVpZ2h0ID4gMCkKKyAgICAgICAgZ3Rr X3dpbmRvd19zZXRfZGVmYXVsdF9zaXplKEdUS19XSU5ET1cod2luZG93KSwgZ2VvbWV0cnkud2lk dGgsIGdlb21ldHJ5LmhlaWdodCk7CisjZWxzZQogICAgIGlmIChnZW9tZXRyeS54ID49IDAgJiYg Z2VvbWV0cnkueSA+PSAwKQogICAgICAgICBndGtfd2luZG93X21vdmUoR1RLX1dJTkRPVyh3aW5k b3cpLCBnZW9tZXRyeS54LCBnZW9tZXRyeS55KTsKLSNlbmRpZgogICAgIGlmIChnZW9tZXRyeS53 aWR0aCA+IDAgJiYgZ2VvbWV0cnkuaGVpZ2h0ID4gMCkKICAgICAgICAgZ3RrX3dpbmRvd19yZXNp emUoR1RLX1dJTkRPVyh3aW5kb3cpLCBnZW9tZXRyeS53aWR0aCwgZ2VvbWV0cnkuaGVpZ2h0KTsK KyNlbmRpZgogCiAgICAgaWYgKCF3ZWJraXRfd2luZG93X3Byb3BlcnRpZXNfZ2V0X3Rvb2xiYXJf dmlzaWJsZSh3aW5kb3dQcm9wZXJ0aWVzKSkKICAgICAgICAgZ3RrX3dpZGdldF9oaWRlKHdpbmRv dy0+dG9vbGJhcik7CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQ01ha2VMaXN0 cy50eHQgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQ01ha2VMaXN0cy50eHQKaW5kZXggMTkwODVj Nzg4MDU2Li45M2I2MjUyMTZjOGQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9D TWFrZUxpc3RzLnR4dAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQ01ha2VMaXN0cy50eHQK QEAgLTU2LDcgKzU2LDcgQEAgYWRkX2N1c3RvbV9jb21tYW5kKAogICAgIFZFUkJBVElNKQogCiBp ZiAoVVNFX0dUSzQpCi0gICAgc2V0KE1pbmlCcm93c2VyX1BSSVZBVEVfREVGSU5JVElPTlMgR0RL X1ZFUlNJT05fTUlOX1JFUVVJUkVEPUdES19WRVJTSU9OXzNfOTIpCisgICAgc2V0KE1pbmlCcm93 c2VyX1BSSVZBVEVfREVGSU5JVElPTlMgR0RLX1ZFUlNJT05fTUlOX1JFUVVJUkVEPUdES19WRVJT SU9OXzRfMCkKIGVsc2UgKCkKICAgICBzZXQoTWluaUJyb3dzZXJfUFJJVkFURV9ERUZJTklUSU9O UyBHREtfVkVSU0lPTl9NSU5fUkVRVUlSRUQ9R0RLX1ZFUlNJT05fM18yMikKIGVuZGlmICgpCg==