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 ede267a5 for ; Tue, 16 Jul 2019 22:22:24 +0000 (UTC) Content-Type: multipart/mixed; boundary="===============6540457890613194323==" MIME-Version: 1.0 Subject: Re: [PR PATCH] [Updated] 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 In-Reply-To: References: Date: Wed, 17 Jul 2019 00:22:24 +0200 Message-ID: <20190716222224.yoio6po11vUpjlo6dij7ti69MD79nlOQJc-xrQjFqSo@z> GitHub notification mails are now in MIME to allow UTF8. --===============6540457890613194323== MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 VGhlcmUgaXMgYW4gdXBkYXRlZCBwdWxsIHJlcXVlc3QgYnkgc2Vpc2F0c3UgYWdhaW5zdCBtYXN0 ZXIgb24gdGhlIHZvaWQtcGFja2FnZXMgcmVwb3NpdG9yeQoKaHR0cHM6Ly9naXRodWIuY29tL3Nl aXNhdHN1L3ZvaWQtcGFja2FnZXMgbWNvbWl4LXBpbC1wYXRjaApodHRwczovL2dpdGh1Yi5jb20v dm9pZC1saW51eC92b2lkLXBhY2thZ2VzL3B1bGwvMTMxNDgKCkZpeCAjMTMxNDMgYnkgcGF0Y2hp bmcgTUNvbWl4IGZvciBQSUwtNi4wLjAgY29tcGF0LgpGaXhlcyB0aGUgaW5jb21wYXRpYmlsaXR5 IGlzc3VlIGJldHdlZW4gTUNvbWl4IGFuZCBQeXRob24tUGlsbG93LTYuMC4wIGRlc2NyaWJlZCBp biBpc3N1ZSAjMTMxNDMgdXNpbmcgcGF0Y2hlcyBmb3VuZCBhdCBodHRwczovL2dpdGh1Yi5jb20v bWF0ODEzL2ZyZWVic2QtcG9ydHMvdHJlZS9kOWE1ZTM4NWFmYjNkYWI3NTVlYmU1MTM4YjA5Y2Y3 MzUxZjk5MmQ5L2dyYXBoaWNzL3B5LW1jb21peC9maWxlcw0KCgpBIHBhdGNoIGZpbGUgZnJvbSBo dHRwczovL2dpdGh1Yi5jb20vdm9pZC1saW51eC92b2lkLXBhY2thZ2VzL3B1bGwvMTMxNDgucGF0 Y2ggaXMgYXR0YWNoZWQ= --===============6540457890613194323== 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" RnJvbSA0OGQyMzE3ODgyZjU0OTU1NjI5YjJhZmM0OGEyYmIzMTVhNmE2YzkxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiAiTWljaGFlbCBELiBSZWlsZXkiIDxzZWlzYXRzdUBzZWlzYXQu c3U+CkRhdGU6IE1vbiwgMTUgSnVsIDIwMTkgMjE6Mzc6MDUgLTA3MDAKU3ViamVjdDogW1BBVENI XSBtY29taXg6IGZpeCBweXRob24tcGlsbG93LTYuMC4wIGNvbXBhdGliaWxpdHkKCi0tLQogc3Jj cGtncy9tY29taXgvcGF0Y2hlcy9pbWFnZV90b29scy5weS5wYXRjaCB8IDExNiArKysrKysrKysr KysrKysrKysrKwogc3JjcGtncy9tY29taXgvcGF0Y2hlcy9ydW4ucHkucGF0Y2ggICAgICAgICB8 ICAxNiArKysKIHNyY3BrZ3MvbWNvbWl4L3RlbXBsYXRlICAgICAgICAgICAgICAgICAgICAgfCAg IDIgKy0KIDMgZmlsZXMgY2hhbmdlZCwgMTMzIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkK IGNyZWF0ZSBtb2RlIDEwMDY0NCBzcmNwa2dzL21jb21peC9wYXRjaGVzL2ltYWdlX3Rvb2xzLnB5 LnBhdGNoCiBjcmVhdGUgbW9kZSAxMDA2NDQgc3JjcGtncy9tY29taXgvcGF0Y2hlcy9ydW4ucHku cGF0Y2gKCmRpZmYgLS1naXQgYS9zcmNwa2dzL21jb21peC9wYXRjaGVzL2ltYWdlX3Rvb2xzLnB5 LnBhdGNoIGIvc3JjcGtncy9tY29taXgvcGF0Y2hlcy9pbWFnZV90b29scy5weS5wYXRjaApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4uOTkyOGVkODIyOGQKLS0tIC9kZXYv bnVsbAorKysgYi9zcmNwa2dzL21jb21peC9wYXRjaGVzL2ltYWdlX3Rvb2xzLnB5LnBhdGNoCkBA IC0wLDAgKzEsMTE2IEBACitHcmFiYmVkIGZyb20gaHR0cHM6Ly9naXRodWIuY29tL21hdDgxMy9m cmVlYnNkLXBvcnRzL3RyZWUvZDlhNWUzODVhZmIzZGFiNzU1ZWJlNTEzOGIwOWNmNzM1MWY5OTJk OS9ncmFwaGljcy9weS1tY29taXgvZmlsZXMKKy0tLSBtY29taXgvaW1hZ2VfdG9vbHMucHkub3Jp ZwkyMDE2LTAyLTEyIDE4OjUxOjU4IFVUQworKysrIG1jb21peC9pbWFnZV90b29scy5weQorQEAg LTksNyArOSw2IEBAIGltcG9ydCBndGsKKyBmcm9tIFBJTCBpbXBvcnQgSW1hZ2UKKyBmcm9tIFBJ TCBpbXBvcnQgSW1hZ2VFbmhhbmNlCisgZnJvbSBQSUwgaW1wb3J0IEltYWdlT3BzCistZnJvbSBQ SUwuSnBlZ0ltYWdlUGx1Z2luIGltcG9ydCBfZ2V0ZXhpZgorIHRyeToKKyAgICAgZnJvbSBQSUwg aW1wb3J0IFBJTExPV19WRVJTSU9OCisgICAgIFBJTF9WRVJTSU9OID0gKCdQaWxsb3cnLCBQSUxM T1dfVkVSU0lPTikKK0BAIC01MSw3ICs1MCwzOCBAQCBhc3NlcnQgTUlTU0lOR19JTUFHRV9JQ09O CisgR1RLX0dES19DT0xPUl9CTEFDSyA9IGd0ay5nZGsuY29sb3JfcGFyc2UoJ2JsYWNrJykKKyBH VEtfR0RLX0NPTE9SX1dISVRFID0gZ3RrLmdkay5jb2xvcl9wYXJzZSgnd2hpdGUnKQorIAorK2Rl ZiBfZ2V0ZXhpZihpbSk6CisrICAgIGV4aWY9e30KKysgICAgdHJ5OgorKyAgICAgICAgZXhpZi51 cGRhdGUoaW0uZ2V0ZXhpZigpKQorKyAgICBleGNlcHQgQXR0cmlidXRlRXJyb3I6CisrICAgICAg ICBwYXNzCisrICAgIGlmIGV4aWY6CisrICAgICAgICByZXR1cm4gZXhpZgorIAorKyAgICAjIEV4 aWYgb2YgUE5HIGlzIHN0aWxsIGJ1Z2d5IGluIFBpbGxvdyA2LjAuMAorKyAgICB0cnk6CisrICAg ICAgICBsMSxsMixzaXplLGxpbmVzPWltLmluZm8uZ2V0KCdSYXcgcHJvZmlsZSB0eXBlIGV4aWYn KS5zcGxpdGxpbmVzKCkKKysgICAgICAgIGlmIGwyIT0nZXhpZic6CisrICAgICAgICAgICAgIyBO b3QgdmFsaWQgRXhpZiBkYXRhLgorKyAgICAgICAgICAgIHJldHVybiB7fQorKyAgICAgICAgc2l6 ZT1pbnQoc2l6ZSkKKysgICAgICAgIGRhdGE9YmluYXNjaWkudW5oZXhsaWZ5KCcnLmpvaW4obGlu ZXMpKQorKyAgICAgICAgaWYgbGVuKGRhdGEpIT1zaXplOgorKyAgICAgICAgICAgICMgU2l6ZSBu b3QgbWF0Y2guCisrICAgICAgICAgICAgcmV0dXJuIHt9CisrICAgICAgICBpbS5pbmZvWydleGlm J109ZGF0YQorKyAgICBleGNlcHQ6CisrICAgICAgICAjIE5vdCB2YWxpZCBFeGlmIGRhdGEuCisr ICAgICAgICByZXR1cm4ge30KKysKKysgICAgIyBsb2FkIEV4aWYgYWdhaW4KKysgICAgdHJ5Ogor KyAgICAgICAgZXhpZi51cGRhdGUoaW0uZ2V0ZXhpZigpKQorKyAgICBleGNlcHQgQXR0cmlidXRl RXJyb3I6CisrICAgICAgICBwYXNzCisrICAgIHJldHVybiBleGlmCisrCisgZGVmIHJvdGF0ZV9w aXhidWYoc3JjLCByb3RhdGlvbik6CisgICAgIHJvdGF0aW9uICU9IDM2MAorICAgICBpZiAwID09 IHJvdGF0aW9uOgorQEAgLTMwMCwxNCArMzMwLDcgQEAgZGVmIHBpbF90b19waXhidWYoaW0sIGtl ZXBfb3JpZW50YXRpb249RmFsc2UpOgorICAgICApCisgICAgIGlmIGtlZXBfb3JpZW50YXRpb246 CisgICAgICAgICAjIEtlZXAgb3JpZW50YXRpb24gbWV0YWRhdGEuCistICAgICAgICBvcmllbnRh dGlvbiA9IE5vbmUKKy0gICAgICAgIGV4aWYgPSBpbS5pbmZvLmdldCgnZXhpZicpCistICAgICAg ICBpZiBleGlmIGlzIG5vdCBOb25lOgorLSAgICAgICAgICAgIGV4aWYgPSBfZ2V0ZXhpZihpbSkK Ky0gICAgICAgICAgICBvcmllbnRhdGlvbiA9IGV4aWYuZ2V0KDI3NCwgTm9uZSkKKy0gICAgICAg IGlmIG9yaWVudGF0aW9uIGlzIE5vbmU6CistICAgICAgICAgICAgIyBNYXliZSBpdCdzIGEgUE5H PyBUcnkgYWx0ZXJuYXRpdmUgbWV0aG9kLgorLSAgICAgICAgICAgIG9yaWVudGF0aW9uID0gX2dl dF9wbmdfaW1wbGllZF9yb3RhdGlvbihpbSkKKysgICAgICAgIG9yaWVudGF0aW9uID0gX2dldGV4 aXQoaW0pLmdldCgyNzQsIE5vbmUpCisgICAgICAgICBpZiBvcmllbnRhdGlvbiBpcyBub3QgTm9u ZToKKyAgICAgICAgICAgICBzZXRhdHRyKHBpeGJ1ZiwgJ29yaWVudGF0aW9uJywgc3RyKG9yaWVu dGF0aW9uKSkKKyAgICAgcmV0dXJuIHBpeGJ1ZgorQEAgLTM4NSwzOSArNDA4LDYgQEAgZGVmIGVu aGFuY2UocGl4YnVmLCBicmlnaHRuZXNzPTEuMCwgY29udHJhc3Q9MS4wLCBzYXR1CisgICAgICAg ICBpbSA9IEltYWdlRW5oYW5jZS5TaGFycG5lc3MoaW0pLmVuaGFuY2Uoc2hhcnBuZXNzKQorICAg ICByZXR1cm4gcGlsX3RvX3BpeGJ1ZihpbSkKKyAKKy1kZWYgX2dldF9wbmdfaW1wbGllZF9yb3Rh dGlvbihwaXhidWZfb3JfaW1hZ2UpOgorLSAgICAiIiJTYW1lIGFzIDxnZXRfaW1wbGllZF9yb3Rh dGlvbj4gZm9yIFBORyBmaWxlcy4KKy0KKy0gICAgTG9va3VwIGZvciBFeGlmIGRhdGEgaW4gdGhl IHRFWHQgY2h1bmsuCistICAgICIiIgorLSAgICBpZiBpc2luc3RhbmNlKHBpeGJ1Zl9vcl9pbWFn ZSwgZ3RrLmdkay5QaXhidWYpOgorLSAgICAgICAgZXhpZiA9IHBpeGJ1Zl9vcl9pbWFnZS5nZXRf b3B0aW9uKCd0RVh0OjpSYXcgcHJvZmlsZSB0eXBlIGV4aWYnKQorLSAgICBlbGlmIGlzaW5zdGFu Y2UocGl4YnVmX29yX2ltYWdlLCBJbWFnZS5JbWFnZSk6CistICAgICAgICBleGlmID0gcGl4YnVm X29yX2ltYWdlLmluZm8uZ2V0KCdSYXcgcHJvZmlsZSB0eXBlIGV4aWYnKQorLSAgICBlbHNlOgor LSAgICAgICAgcmFpc2UgVmFsdWVFcnJvcigpCistICAgIGlmIGV4aWYgaXMgTm9uZToKKy0gICAg ICAgIHJldHVybiBOb25lCistICAgIGV4aWYgPSBleGlmLnNwbGl0KCdcbicpCistICAgIGlmIGxl bihleGlmKSA8IDQgb3IgJ2V4aWYnICE9IGV4aWZbMV06CistICAgICAgICAjIE5vdCB2YWxpZCBF eGlmIGRhdGEuCistICAgICAgICByZXR1cm4gTm9uZQorLSAgICBzaXplID0gaW50KGV4aWZbMl0p CistICAgIHRyeToKKy0gICAgICAgIGRhdGEgPSBiaW5hc2NpaS51bmhleGxpZnkoJycuam9pbihl eGlmWzM6XSkpCistICAgIGV4Y2VwdCBUeXBlRXJyb3I6CistICAgICAgICAjIE5vdCB2YWxpZCBo ZXhhZGVjaW1hbCBjb250ZW50LgorLSAgICAgICAgcmV0dXJuIE5vbmUKKy0gICAgaWYgc2l6ZSAh PSBsZW4oZGF0YSk6CistICAgICAgICAjIFNpemVzIHNob3VsZCBtYXRjaC4KKy0gICAgICAgIHJl dHVybiBOb25lCistICAgIGltID0gbmFtZWR0dXBsZSgnRmFrZUltYWdlJywgJ2luZm8nKSh7ICdl eGlmJzogZGF0YSB9KQorLSAgICBleGlmID0gX2dldGV4aWYoaW0pCistICAgIG9yaWVudGF0aW9u ID0gZXhpZi5nZXQoMjc0LCBOb25lKQorLSAgICBpZiBvcmllbnRhdGlvbiBpcyBub3QgTm9uZToK Ky0gICAgICAgIG9yaWVudGF0aW9uID0gc3RyKG9yaWVudGF0aW9uKQorLSAgICByZXR1cm4gb3Jp ZW50YXRpb24KKy0KKyBkZWYgZ2V0X2ltcGxpZWRfcm90YXRpb24ocGl4YnVmKToKKyAgICAgIiIi UmV0dXJuIHRoZSBpbXBsaWVkIHJvdGF0aW9uIGluIGRlZ3JlZXM6IDAsIDkwLCAxODAsIG9yIDI3 MC4KKyAKK0BAIC00MjksOSArNDE5LDYgQEAgZGVmIGdldF9pbXBsaWVkX3JvdGF0aW9uKHBpeGJ1 Zik6CisgICAgIG9yaWVudGF0aW9uID0gZ2V0YXR0cihwaXhidWYsICdvcmllbnRhdGlvbicsIE5v bmUpCisgICAgIGlmIG9yaWVudGF0aW9uIGlzIE5vbmU6CisgICAgICAgICBvcmllbnRhdGlvbiA9 IHBpeGJ1Zi5nZXRfb3B0aW9uKCdvcmllbnRhdGlvbicpCistICAgIGlmIG9yaWVudGF0aW9uIGlz IE5vbmU6CistICAgICAgICAjIE1heWJlIGl0J3MgYSBQTkc/IFRyeSBhbHRlcm5hdGl2ZSBtZXRo b2QuCistICAgICAgICBvcmllbnRhdGlvbiA9IF9nZXRfcG5nX2ltcGxpZWRfcm90YXRpb24ocGl4 YnVmKQorICAgICBpZiBvcmllbnRhdGlvbiA9PSAnMyc6CisgICAgICAgICByZXR1cm4gMTgwCisg ICAgIGVsaWYgb3JpZW50YXRpb24gPT0gJzYnOgpkaWZmIC0tZ2l0IGEvc3JjcGtncy9tY29taXgv cGF0Y2hlcy9ydW4ucHkucGF0Y2ggYi9zcmNwa2dzL21jb21peC9wYXRjaGVzL3J1bi5weS5wYXRj aApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4uMDlmOTUyNzc1Y2EKLS0t IC9kZXYvbnVsbAorKysgYi9zcmNwa2dzL21jb21peC9wYXRjaGVzL3J1bi5weS5wYXRjaApAQCAt MCwwICsxLDE2IEBACitHcmFiYmVkIGZyb20gaHR0cHM6Ly9naXRodWIuY29tL21hdDgxMy9mcmVl YnNkLXBvcnRzL3RyZWUvZDlhNWUzODVhZmIzZGFiNzU1ZWJlNTEzOGIwOWNmNzM1MWY5OTJkOS9n cmFwaGljcy9weS1tY29taXgvZmlsZXMKKy0tLSBtY29taXgvcnVuLnB5Lm9yaWcJMjAxNi0wMi0x MiAxODo1MjoxMiBVVEMKKysrKyBtY29taXgvcnVuLnB5CitAQCAtMjAzLDcgKzIwMywxMSBAQCBk ZWYgcnVuKCk6CisgCisgICAgIHRyeToKKyAgICAgICAgIGltcG9ydCBQSUwuSW1hZ2UKKy0gICAg ICAgIGFzc2VydCBQSUwuSW1hZ2UuVkVSU0lPTiA+PSAnMS4xLjUnCisrICAgICAgICB0cnk6Cisr ICAgICAgICAgICAgYXNzZXJ0IFBJTC5JbWFnZS5WRVJTSU9OID49ICcxLjEuNScKKysgICAgICAg IGV4Y2VwdCBBdHRyaWJ1dGVFcnJvcjoKKysgICAgICAgICAgICAjIEZpZWxkIFZFUlNJT04gZGVw cmVjYXRlZCBpbiBQaWxsb3cgNS4yLjAgYW5kIGRyb3BwZWQgaW4gNi4wLjAKKysgICAgICAgICAg ICBhc3NlcnQgUElMLl9fdmVyc2lvbl9fID49ICc1LjIuMCcKKyAKKyAgICAgZXhjZXB0IEFzc2Vy dGlvbkVycm9yOgorICAgICAgICAgbG9nLmVycm9yKCBfKCJZb3UgZG9uJ3QgaGF2ZSB0aGUgcmVx dWlyZWQgdmVyc2lvbiBvZiB0aGUgUHl0aG9uIEltYWdpbmciKSwgZW5kPScgJykKZGlmZiAtLWdp dCBhL3NyY3BrZ3MvbWNvbWl4L3RlbXBsYXRlIGIvc3JjcGtncy9tY29taXgvdGVtcGxhdGUKaW5k ZXggZmIwMzk3NmY4YzkuLjMxNzliNDUxYmUxIDEwMDY0NAotLS0gYS9zcmNwa2dzL21jb21peC90 ZW1wbGF0ZQorKysgYi9zcmNwa2dzL21jb21peC90ZW1wbGF0ZQpAQCAtMSw3ICsxLDcgQEAKICMg VGVtcGxhdGUgZmlsZSBmb3IgJ21jb21peCcKIHBrZ25hbWU9bWNvbWl4CiB2ZXJzaW9uPTEuMi4x Ci1yZXZpc2lvbj0xCityZXZpc2lvbj0yCiBhcmNocz1ub2FyY2gKIGJ1aWxkX3N0eWxlPXB5dGhv bjItbW9kdWxlCiBweWNvbXBpbGVfbW9kdWxlPSIke3BrZ25hbWV9Igo= --===============6540457890613194323==--