From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=ham autolearn_force=no version=3.4.2 Received: from inbox.vuxu.org (localhost [IPv6:::1]) by inbox.vuxu.org (OpenSMTPD) with ESMTP id 2635e633 for ; Tue, 16 Jul 2019 04:41:38 +0000 (UTC) Content-Type: multipart/mixed; boundary="===============0580930516567716374==" MIME-Version: 1.0 Subject: [PR PATCH] Fix #13143 by patching MComix for PIL-6.0.0 compat. To: ml@inbox.vuxu.org From: voidlinux-github@inbox.vuxu.org Reply-to: ml@inbox.vuxu.org Message-ID: Date: Tue, 16 Jul 2019 06:41:38 +0200 GitHub notification mails are now in MIME to allow UTF8. --===============0580930516567716374== MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 VGhlcmUgaXMgYSBuZXcgcHVsbCByZXF1ZXN0IGJ5IHNlaXNhdHN1IGFnYWluc3QgbWFzdGVyIG9u IHRoZSB2b2lkLXBhY2thZ2VzIHJlcG9zaXRvcnkKCmh0dHBzOi8vZ2l0aHViLmNvbS9zZWlzYXRz dS92b2lkLXBhY2thZ2VzIG1jb21peC1waWwtcGF0Y2gKaHR0cHM6Ly9naXRodWIuY29tL3ZvaWQt bGludXgvdm9pZC1wYWNrYWdlcy9wdWxsLzEzMTQ4CgpGaXggIzEzMTQzIGJ5IHBhdGNoaW5nIE1D b21peCBmb3IgUElMLTYuMC4wIGNvbXBhdC4KRml4ZXMgdGhlIGluY29tcGF0aWJpbGl0eSBpc3N1 ZSBiZXR3ZWVuIE1Db21peCBhbmQgUHl0aG9uLVBpbGxvdy02LjAuMCBkZXNjcmliZWQgaW4gaXNz dWUgIzEzMTQzIHVzaW5nIHBhdGNoZXMgZm91bmQgYXQgaHR0cHM6Ly9naXRodWIuY29tL21hdDgx My9mcmVlYnNkLXBvcnRzL3RyZWUvZDlhNWUzODVhZmIzZGFiNzU1ZWJlNTEzOGIwOWNmNzM1MWY5 OTJkOS9ncmFwaGljcy9weS1tY29taXgvZmlsZXMNCgoKQSBwYXRjaCBmaWxlIGZyb20gaHR0cHM6 Ly9naXRodWIuY29tL3ZvaWQtbGludXgvdm9pZC1wYWNrYWdlcy9wdWxsLzEzMTQ4LnBhdGNoIGlz IGF0dGFjaGVk --===============0580930516567716374== Content-Type: application/text/x-diff MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="github-pr-mcomix-pil-patch-13148.patch" RnJvbSAzMDdlMjczZGRlMDA1MmVlZjBlMTU2Y2ZlNjJhMWVkMjU0MmZkNzgyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiAiTWljaGFlbCBELiBSZWlsZXkiIDxzZWlzYXRzdUBzZWlzYXQu c3U+CkRhdGU6IE1vbiwgMTUgSnVsIDIwMTkgMjE6Mzc6MDUgLTA3MDAKU3ViamVjdDogW1BBVENI XSBGaXggIzEzMTQzIGJ5IHBhdGNoaW5nIE1Db21peCBmb3IgUElMLTYuMC4wIGNvbXBhdC4KCi0t LQogc3JjcGtncy9tY29taXgvcGF0Y2hlcy9pbWFnZV90b29scy5weS5wYXRjaCB8IDExNiArKysr KysrKysrKysrKysrKysrKwogc3JjcGtncy9tY29taXgvcGF0Y2hlcy9ydW4ucHkucGF0Y2ggICAg ICAgICB8ICAxNiArKysKIDIgZmlsZXMgY2hhbmdlZCwgMTMyIGluc2VydGlvbnMoKykKIGNyZWF0 ZSBtb2RlIDEwMDY0NCBzcmNwa2dzL21jb21peC9wYXRjaGVzL2ltYWdlX3Rvb2xzLnB5LnBhdGNo CiBjcmVhdGUgbW9kZSAxMDA2NDQgc3JjcGtncy9tY29taXgvcGF0Y2hlcy9ydW4ucHkucGF0Y2gK CmRpZmYgLS1naXQgYS9zcmNwa2dzL21jb21peC9wYXRjaGVzL2ltYWdlX3Rvb2xzLnB5LnBhdGNo IGIvc3JjcGtncy9tY29taXgvcGF0Y2hlcy9pbWFnZV90b29scy5weS5wYXRjaApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4uOTkyOGVkODIyOGQKLS0tIC9kZXYvbnVsbAor KysgYi9zcmNwa2dzL21jb21peC9wYXRjaGVzL2ltYWdlX3Rvb2xzLnB5LnBhdGNoCkBAIC0wLDAg KzEsMTE2IEBACitHcmFiYmVkIGZyb20gaHR0cHM6Ly9naXRodWIuY29tL21hdDgxMy9mcmVlYnNk LXBvcnRzL3RyZWUvZDlhNWUzODVhZmIzZGFiNzU1ZWJlNTEzOGIwOWNmNzM1MWY5OTJkOS9ncmFw aGljcy9weS1tY29taXgvZmlsZXMKKy0tLSBtY29taXgvaW1hZ2VfdG9vbHMucHkub3JpZwkyMDE2 LTAyLTEyIDE4OjUxOjU4IFVUQworKysrIG1jb21peC9pbWFnZV90b29scy5weQorQEAgLTksNyAr OSw2IEBAIGltcG9ydCBndGsKKyBmcm9tIFBJTCBpbXBvcnQgSW1hZ2UKKyBmcm9tIFBJTCBpbXBv cnQgSW1hZ2VFbmhhbmNlCisgZnJvbSBQSUwgaW1wb3J0IEltYWdlT3BzCistZnJvbSBQSUwuSnBl Z0ltYWdlUGx1Z2luIGltcG9ydCBfZ2V0ZXhpZgorIHRyeToKKyAgICAgZnJvbSBQSUwgaW1wb3J0 IFBJTExPV19WRVJTSU9OCisgICAgIFBJTF9WRVJTSU9OID0gKCdQaWxsb3cnLCBQSUxMT1dfVkVS U0lPTikKK0BAIC01MSw3ICs1MCwzOCBAQCBhc3NlcnQgTUlTU0lOR19JTUFHRV9JQ09OCisgR1RL X0dES19DT0xPUl9CTEFDSyA9IGd0ay5nZGsuY29sb3JfcGFyc2UoJ2JsYWNrJykKKyBHVEtfR0RL X0NPTE9SX1dISVRFID0gZ3RrLmdkay5jb2xvcl9wYXJzZSgnd2hpdGUnKQorIAorK2RlZiBfZ2V0 ZXhpZihpbSk6CisrICAgIGV4aWY9e30KKysgICAgdHJ5OgorKyAgICAgICAgZXhpZi51cGRhdGUo aW0uZ2V0ZXhpZigpKQorKyAgICBleGNlcHQgQXR0cmlidXRlRXJyb3I6CisrICAgICAgICBwYXNz CisrICAgIGlmIGV4aWY6CisrICAgICAgICByZXR1cm4gZXhpZgorIAorKyAgICAjIEV4aWYgb2Yg UE5HIGlzIHN0aWxsIGJ1Z2d5IGluIFBpbGxvdyA2LjAuMAorKyAgICB0cnk6CisrICAgICAgICBs MSxsMixzaXplLGxpbmVzPWltLmluZm8uZ2V0KCdSYXcgcHJvZmlsZSB0eXBlIGV4aWYnKS5zcGxp dGxpbmVzKCkKKysgICAgICAgIGlmIGwyIT0nZXhpZic6CisrICAgICAgICAgICAgIyBOb3QgdmFs aWQgRXhpZiBkYXRhLgorKyAgICAgICAgICAgIHJldHVybiB7fQorKyAgICAgICAgc2l6ZT1pbnQo c2l6ZSkKKysgICAgICAgIGRhdGE9YmluYXNjaWkudW5oZXhsaWZ5KCcnLmpvaW4obGluZXMpKQor KyAgICAgICAgaWYgbGVuKGRhdGEpIT1zaXplOgorKyAgICAgICAgICAgICMgU2l6ZSBub3QgbWF0 Y2guCisrICAgICAgICAgICAgcmV0dXJuIHt9CisrICAgICAgICBpbS5pbmZvWydleGlmJ109ZGF0 YQorKyAgICBleGNlcHQ6CisrICAgICAgICAjIE5vdCB2YWxpZCBFeGlmIGRhdGEuCisrICAgICAg ICByZXR1cm4ge30KKysKKysgICAgIyBsb2FkIEV4aWYgYWdhaW4KKysgICAgdHJ5OgorKyAgICAg ICAgZXhpZi51cGRhdGUoaW0uZ2V0ZXhpZigpKQorKyAgICBleGNlcHQgQXR0cmlidXRlRXJyb3I6 CisrICAgICAgICBwYXNzCisrICAgIHJldHVybiBleGlmCisrCisgZGVmIHJvdGF0ZV9waXhidWYo c3JjLCByb3RhdGlvbik6CisgICAgIHJvdGF0aW9uICU9IDM2MAorICAgICBpZiAwID09IHJvdGF0 aW9uOgorQEAgLTMwMCwxNCArMzMwLDcgQEAgZGVmIHBpbF90b19waXhidWYoaW0sIGtlZXBfb3Jp ZW50YXRpb249RmFsc2UpOgorICAgICApCisgICAgIGlmIGtlZXBfb3JpZW50YXRpb246CisgICAg ICAgICAjIEtlZXAgb3JpZW50YXRpb24gbWV0YWRhdGEuCistICAgICAgICBvcmllbnRhdGlvbiA9 IE5vbmUKKy0gICAgICAgIGV4aWYgPSBpbS5pbmZvLmdldCgnZXhpZicpCistICAgICAgICBpZiBl eGlmIGlzIG5vdCBOb25lOgorLSAgICAgICAgICAgIGV4aWYgPSBfZ2V0ZXhpZihpbSkKKy0gICAg ICAgICAgICBvcmllbnRhdGlvbiA9IGV4aWYuZ2V0KDI3NCwgTm9uZSkKKy0gICAgICAgIGlmIG9y aWVudGF0aW9uIGlzIE5vbmU6CistICAgICAgICAgICAgIyBNYXliZSBpdCdzIGEgUE5HPyBUcnkg YWx0ZXJuYXRpdmUgbWV0aG9kLgorLSAgICAgICAgICAgIG9yaWVudGF0aW9uID0gX2dldF9wbmdf aW1wbGllZF9yb3RhdGlvbihpbSkKKysgICAgICAgIG9yaWVudGF0aW9uID0gX2dldGV4aXQoaW0p LmdldCgyNzQsIE5vbmUpCisgICAgICAgICBpZiBvcmllbnRhdGlvbiBpcyBub3QgTm9uZToKKyAg ICAgICAgICAgICBzZXRhdHRyKHBpeGJ1ZiwgJ29yaWVudGF0aW9uJywgc3RyKG9yaWVudGF0aW9u KSkKKyAgICAgcmV0dXJuIHBpeGJ1ZgorQEAgLTM4NSwzOSArNDA4LDYgQEAgZGVmIGVuaGFuY2Uo cGl4YnVmLCBicmlnaHRuZXNzPTEuMCwgY29udHJhc3Q9MS4wLCBzYXR1CisgICAgICAgICBpbSA9 IEltYWdlRW5oYW5jZS5TaGFycG5lc3MoaW0pLmVuaGFuY2Uoc2hhcnBuZXNzKQorICAgICByZXR1 cm4gcGlsX3RvX3BpeGJ1ZihpbSkKKyAKKy1kZWYgX2dldF9wbmdfaW1wbGllZF9yb3RhdGlvbihw aXhidWZfb3JfaW1hZ2UpOgorLSAgICAiIiJTYW1lIGFzIDxnZXRfaW1wbGllZF9yb3RhdGlvbj4g Zm9yIFBORyBmaWxlcy4KKy0KKy0gICAgTG9va3VwIGZvciBFeGlmIGRhdGEgaW4gdGhlIHRFWHQg Y2h1bmsuCistICAgICIiIgorLSAgICBpZiBpc2luc3RhbmNlKHBpeGJ1Zl9vcl9pbWFnZSwgZ3Rr Lmdkay5QaXhidWYpOgorLSAgICAgICAgZXhpZiA9IHBpeGJ1Zl9vcl9pbWFnZS5nZXRfb3B0aW9u KCd0RVh0OjpSYXcgcHJvZmlsZSB0eXBlIGV4aWYnKQorLSAgICBlbGlmIGlzaW5zdGFuY2UocGl4 YnVmX29yX2ltYWdlLCBJbWFnZS5JbWFnZSk6CistICAgICAgICBleGlmID0gcGl4YnVmX29yX2lt YWdlLmluZm8uZ2V0KCdSYXcgcHJvZmlsZSB0eXBlIGV4aWYnKQorLSAgICBlbHNlOgorLSAgICAg ICAgcmFpc2UgVmFsdWVFcnJvcigpCistICAgIGlmIGV4aWYgaXMgTm9uZToKKy0gICAgICAgIHJl dHVybiBOb25lCistICAgIGV4aWYgPSBleGlmLnNwbGl0KCdcbicpCistICAgIGlmIGxlbihleGlm KSA8IDQgb3IgJ2V4aWYnICE9IGV4aWZbMV06CistICAgICAgICAjIE5vdCB2YWxpZCBFeGlmIGRh dGEuCistICAgICAgICByZXR1cm4gTm9uZQorLSAgICBzaXplID0gaW50KGV4aWZbMl0pCistICAg IHRyeToKKy0gICAgICAgIGRhdGEgPSBiaW5hc2NpaS51bmhleGxpZnkoJycuam9pbihleGlmWzM6 XSkpCistICAgIGV4Y2VwdCBUeXBlRXJyb3I6CistICAgICAgICAjIE5vdCB2YWxpZCBoZXhhZGVj aW1hbCBjb250ZW50LgorLSAgICAgICAgcmV0dXJuIE5vbmUKKy0gICAgaWYgc2l6ZSAhPSBsZW4o ZGF0YSk6CistICAgICAgICAjIFNpemVzIHNob3VsZCBtYXRjaC4KKy0gICAgICAgIHJldHVybiBO b25lCistICAgIGltID0gbmFtZWR0dXBsZSgnRmFrZUltYWdlJywgJ2luZm8nKSh7ICdleGlmJzog ZGF0YSB9KQorLSAgICBleGlmID0gX2dldGV4aWYoaW0pCistICAgIG9yaWVudGF0aW9uID0gZXhp Zi5nZXQoMjc0LCBOb25lKQorLSAgICBpZiBvcmllbnRhdGlvbiBpcyBub3QgTm9uZToKKy0gICAg ICAgIG9yaWVudGF0aW9uID0gc3RyKG9yaWVudGF0aW9uKQorLSAgICByZXR1cm4gb3JpZW50YXRp b24KKy0KKyBkZWYgZ2V0X2ltcGxpZWRfcm90YXRpb24ocGl4YnVmKToKKyAgICAgIiIiUmV0dXJu IHRoZSBpbXBsaWVkIHJvdGF0aW9uIGluIGRlZ3JlZXM6IDAsIDkwLCAxODAsIG9yIDI3MC4KKyAK K0BAIC00MjksOSArNDE5LDYgQEAgZGVmIGdldF9pbXBsaWVkX3JvdGF0aW9uKHBpeGJ1Zik6Cisg ICAgIG9yaWVudGF0aW9uID0gZ2V0YXR0cihwaXhidWYsICdvcmllbnRhdGlvbicsIE5vbmUpCisg ICAgIGlmIG9yaWVudGF0aW9uIGlzIE5vbmU6CisgICAgICAgICBvcmllbnRhdGlvbiA9IHBpeGJ1 Zi5nZXRfb3B0aW9uKCdvcmllbnRhdGlvbicpCistICAgIGlmIG9yaWVudGF0aW9uIGlzIE5vbmU6 CistICAgICAgICAjIE1heWJlIGl0J3MgYSBQTkc/IFRyeSBhbHRlcm5hdGl2ZSBtZXRob2QuCist ICAgICAgICBvcmllbnRhdGlvbiA9IF9nZXRfcG5nX2ltcGxpZWRfcm90YXRpb24ocGl4YnVmKQor ICAgICBpZiBvcmllbnRhdGlvbiA9PSAnMyc6CisgICAgICAgICByZXR1cm4gMTgwCisgICAgIGVs aWYgb3JpZW50YXRpb24gPT0gJzYnOgpkaWZmIC0tZ2l0IGEvc3JjcGtncy9tY29taXgvcGF0Y2hl cy9ydW4ucHkucGF0Y2ggYi9zcmNwa2dzL21jb21peC9wYXRjaGVzL3J1bi5weS5wYXRjaApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4uMDlmOTUyNzc1Y2EKLS0tIC9kZXYv bnVsbAorKysgYi9zcmNwa2dzL21jb21peC9wYXRjaGVzL3J1bi5weS5wYXRjaApAQCAtMCwwICsx LDE2IEBACitHcmFiYmVkIGZyb20gaHR0cHM6Ly9naXRodWIuY29tL21hdDgxMy9mcmVlYnNkLXBv cnRzL3RyZWUvZDlhNWUzODVhZmIzZGFiNzU1ZWJlNTEzOGIwOWNmNzM1MWY5OTJkOS9ncmFwaGlj cy9weS1tY29taXgvZmlsZXMKKy0tLSBtY29taXgvcnVuLnB5Lm9yaWcJMjAxNi0wMi0xMiAxODo1 MjoxMiBVVEMKKysrKyBtY29taXgvcnVuLnB5CitAQCAtMjAzLDcgKzIwMywxMSBAQCBkZWYgcnVu KCk6CisgCisgICAgIHRyeToKKyAgICAgICAgIGltcG9ydCBQSUwuSW1hZ2UKKy0gICAgICAgIGFz c2VydCBQSUwuSW1hZ2UuVkVSU0lPTiA+PSAnMS4xLjUnCisrICAgICAgICB0cnk6CisrICAgICAg ICAgICAgYXNzZXJ0IFBJTC5JbWFnZS5WRVJTSU9OID49ICcxLjEuNScKKysgICAgICAgIGV4Y2Vw dCBBdHRyaWJ1dGVFcnJvcjoKKysgICAgICAgICAgICAjIEZpZWxkIFZFUlNJT04gZGVwcmVjYXRl ZCBpbiBQaWxsb3cgNS4yLjAgYW5kIGRyb3BwZWQgaW4gNi4wLjAKKysgICAgICAgICAgICBhc3Nl cnQgUElMLl9fdmVyc2lvbl9fID49ICc1LjIuMCcKKyAKKyAgICAgZXhjZXB0IEFzc2VydGlvbkVy cm9yOgorICAgICAgICAgbG9nLmVycm9yKCBfKCJZb3UgZG9uJ3QgaGF2ZSB0aGUgcmVxdWlyZWQg dmVyc2lvbiBvZiB0aGUgUHl0aG9uIEltYWdpbmciKSwgZW5kPScgJykK --===============0580930516567716374==--