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 ff74dd22 for ; Fri, 21 Jun 2019 16:17:09 +0000 (UTC) Content-Type: multipart/mixed; boundary="===============2177700827136070379==" MIME-Version: 1.0 Subject: [PR PATCH] qt5: move conflicting files into correct subpkg To: ml@inbox.vuxu.org From: voidlinux-github@inbox.vuxu.org Reply-to: ml@inbox.vuxu.org Message-ID: Date: Fri, 21 Jun 2019 18:17:09 +0200 GitHub notification mails are now in MIME to allow UTF8. --===============2177700827136070379== MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 VGhlcmUgaXMgYSBuZXcgcHVsbCByZXF1ZXN0IGJ5IEpvaG5ueW5hdG9yIGFnYWluc3QgbWFzdGVy IG9uIHRoZSB2b2lkLXBhY2thZ2VzIHJlcG9zaXRvcnkKCmh0dHBzOi8vZ2l0aHViLmNvbS9Kb2hu bnluYXRvci92b2lkLXBhY2thZ2VzIHF0NS1jb25mbGljdHMKaHR0cHM6Ly9naXRodWIuY29tL3Zv aWQtbGludXgvdm9pZC1wYWNrYWdlcy9wdWxsLzEyNjA4CgpxdDU6IG1vdmUgY29uZmxpY3Rpbmcg ZmlsZXMgaW50byBjb3JyZWN0IHN1YnBrZwpbY2kgc2tpcF0KCkEgcGF0Y2ggZmlsZSBmcm9tIGh0 dHBzOi8vZ2l0aHViLmNvbS92b2lkLWxpbnV4L3ZvaWQtcGFja2FnZXMvcHVsbC8xMjYwOC5wYXRj aCBpcyBhdHRhY2hlZA== --===============2177700827136070379== Content-Type: application/text/x-diff MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="github-pr-qt5-conflicts-12608.patch" RnJvbSBhNzNkYzNkNjUzZTMwMzE4NzJlOWRlNDc1YzgzNjE4YzgwOTVkNzZjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2huIDxqb2huekBwb3N0ZW8ubmV0PgpEYXRlOiBGcmksIDIx IEp1biAyMDE5IDE4OjE2OjE1ICswMjAwClN1YmplY3Q6IFtQQVRDSF0gcXQ1OiBtb3ZlIGNvbmZs aWN0aW5nIGZpbGVzIGludG8gY29ycmVjdCBzdWJwa2cKCltjaSBza2lwXQotLS0KIHNyY3BrZ3Mv cXQ1L3RlbXBsYXRlIHwgNiArKystLS0KIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyks IDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjcGtncy9xdDUvdGVtcGxhdGUgYi9zcmNw a2dzL3F0NS90ZW1wbGF0ZQppbmRleCBiZmQ4NzEyZTdhZi4uOGQxNzA1MzVlODkgMTAwNjQ0Ci0t LSBhL3NyY3BrZ3MvcXQ1L3RlbXBsYXRlCisrKyBiL3NyY3BrZ3MvcXQ1L3RlbXBsYXRlCkBAIC0x LDcgKzEsNyBAQAogIyBUZW1wbGF0ZSBmaWxlIGZvciAncXQ1JwogcGtnbmFtZT1xdDUKIHZlcnNp b249NS4xMS4zCi1yZXZpc2lvbj03CityZXZpc2lvbj04CiB3cmtzcmM9InF0LWV2ZXJ5d2hlcmUt c3JjLSR7dmVyc2lvbn0iCiBidWlsZF9zdHlsZT1nbnUtY29uZmlndXJlCiBob3N0bWFrZWRlcGVu ZHM9ImNtYWtlIGNsYW5nIGZsZXggZ2l0IGdsaWItZGV2ZWwgZ3BlcmYgbmluamEgcGtnLWNvbmZp ZwpAQCAtMTA1NSw3ICsxMDU1LDcgQEAgcXQ1LWhvc3QtdG9vbHNfcGFja2FnZSgpIHsKIAkJCWlm IFsgLWYgJHtERVNURElSfS91c3IvbGliL3F0NS9iaW4vJHtmfSBdOyB0aGVuCiAJCQkJdm1vdmUg dXNyL2xpYi9xdDUvYmluLyR7Zn0KIAkJCWZpCi0JCQlpZiBbIC1mICR7REVTVERJUn0vdXNyL2Jp bi8ke2Z9LXF0NSBdOyB0aGVuCisJCQlpZiBbIC1mICR7REVTVERJUn0vdXNyL2Jpbi8ke2Z9LXF0 NSBdIHx8IFsgLWggJHtERVNURElSfS91c3IvYmluLyR7Zn0tcXQ1IF07IHRoZW4KIAkJCQl2bW92 ZSB1c3IvYmluLyR7Zn0tcXQ1CiAJCQllbHNlCiAJCQkJbG4gLXNmIC4uL2xpYi9xdDUvYmluLyR7 Zn0gJHtQS0dERVNURElSfS91c3IvYmluLyR7Zn0tcXQ1CkBAIC0xMTA0LDcgKzExMDQsNyBAQCBx dDUtdG9vbHNfcGFja2FnZSgpIHsKIAkJCQlta2RpciAtcCAke2Rlc3R9L3Vzci9saWIvcXQ1L2Jp bgogCQkJCW12IC12ICR7UEtHREVTVERJUn0vdXNyL2xpYi9xdDUvYmluLyR7Zn0gJHtkZXN0fS91 c3IvbGliL3F0NS9iaW4vCiAJCQlmaQotCQkJaWYgWyAtZiAke1BLR0RFU1RESVJ9L3Vzci9iaW4v JHtmfS1xdDUgXTsgdGhlbgorCQkJaWYgWyAtZiAke1BLR0RFU1RESVJ9L3Vzci9iaW4vJHtmfS1x dDUgXSB8fCBbIC1oICR7UEtHREVTVERJUn0vdXNyL2Jpbi8ke2Z9LXF0NSBdOyB0aGVuCiAJCQkJ bWtkaXIgLXAgJHtkZXN0fS91c3IvYmluCiAJCQkJbXYgLXYgJHtQS0dERVNURElSfS91c3IvYmlu LyR7Zn0tcXQ1ICR7ZGVzdH0vdXNyL2Jpbi8KIAkJCWZpCg== --===============2177700827136070379==--