Date: Sat, 22 Dec 2007 17:35:32 +0100 From: "Ullrich Franke" <trash.esiac@googlemail.com> To: freebsd-ports-bugs@freebsd.org, edwin@freebsd.org Cc: yokota@res.otaru-uc.ac.jp, Mikhail Teterin <mi+mill@aldan.algebra.com>, trash.esiac@gmail.com Subject: Re: ports/118784: [PATCH] print/lyx15: update to 1.5.3 Message-ID: <2de866bc0712220835k3795bf8bqbdff8ca2f54223e8@mail.gmail.com> In-Reply-To: <2de866bc0712220649v6cb8b780rb5242a4f5c43e629@mail.gmail.com> References: <200712202146.lBKLkjE8020213@freefall.freebsd.org> <200712211539.49389.mi%2Bmill@aldan.algebra.com> <2de866bc0712211350h5d3450d5p38b985672c1edf39@mail.gmail.com> <200712211719.30880.mi%2Bmill@aldan.algebra.com> <2de866bc0712220649v6cb8b780rb5242a4f5c43e629@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
------=_Part_4053_33470814.1198341332168 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline Attached is an updated unified recursive diff of print/lyx15 with many many work from Mikhail Teterin and Koji Yokota. This should also fix build problems with qt33 and qt4 installed (ports/118046). Please submit the attached patch. Thank you for the help. Regards, Ullrich ------=_Part_4053_33470814.1198341332168 Content-Type: application/octet-stream; name=lyx-1.5.3_final.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_faidbh8l Content-Disposition: attachment; filename=lyx-1.5.3_final.patch ZGlmZiAtdXIgbHl4MTUub3JpZy9NYWtlZmlsZSBseXgxNS9NYWtlZmlsZQotLS0gbHl4MTUub3Jp Zy9NYWtlZmlsZQkyMDA3LTEyLTIwIDIwOjQ4OjU4LjAwMDAwMDAwMCArMDEwMAorKysgbHl4MTUv TWFrZWZpbGUJMjAwNy0xMi0yMiAxNzoyMDowMS4wMDAwMDAwMDAgKzAxMDAKQEAgLTYsNyArNiw3 IEBACiAjCiAKIFBPUlROQU1FPQlseXgKLVBPUlRWRVJTSU9OPQkxLjUuMQorUE9SVFZFUlNJT049 CTEuNS4zCiBDQVRFR09SSUVTPQlwcmludAogTUFTVEVSX1NJVEVTPQlmdHA6Ly9mdHAubHl4Lm9y Zy9wdWIvbHl4L3N0YWJsZS8gXAogCQlmdHA6Ly9mdHAucGxhbmV0bWlycm9yLmNvbS9wdWIvbHl4 L3N0YWJsZS8gXApAQCAtMjIsNiArMjIsNyBAQAogCiBCVUlMRF9ERVBFTkRTPQlsYXRleDoke1BP UlRTRElSfS9wcmludC90ZVRlWAogUlVOX0RFUEVORFM9CWxhdGV4OiR7UE9SVFNESVJ9L3ByaW50 L3RlVGVYIFwKKwkJJHtMT0NBTEJBU0V9L3NoYXJlL3RleG1mL3RleC9sYXRleC9wcmV0dHlyZWYv cHJldHR5cmVmLnN0eToke1BPUlRTRElSfS9wcmludC9sYXRleC1wcmV0dHlyZWYgXAogCQkke1gx MUJBU0V9L2xpYi9YMTEvZm9udHMvdGV4Y20tdHRmL2NtZXgxMC50dGY6JHtQT1JUU0RJUn0veDEx LWZvbnRzL3RleGNtLXR0ZgogTElCX0RFUEVORFM9CWJvb3N0X3JlZ2V4OiR7UE9SVFNESVJ9L2Rl dmVsL2Jvb3N0CiAKQEAgLTMxLDEwICszMiw5IEBACiAKIE9QVElPTlM9CUFTUEVMTAkiVXRpbGl6 ZSBBU1BFTEwgbGlicmFyeSIJb24JXAogCQlBSUtTQVVSCSJCdWlsZCBBaWtzYXVydXMgc3VwcG9y dCAoRW5nbGlzaCB0aGVzYXVydXMpIglvbglcCi0JCU5MUyAgICAgIk5hdGl2ZSBsYW5ndWFnZSBz dXBwb3J0IglPbglcCi0JCUlOQ0dUCSJVc2UgdGhlIGluY2x1ZGVkIEdldHRleHQgbGlicmFyeSIJ b2ZmCisJCU5MUyAgICAgIk5hdGl2ZSBsYW5ndWFnZSBzdXBwb3J0IglPbgogCi1BTExfVEFSR0VU PQlhbGwgY2hlY2sKK0FMTF9UQVJHRVQ9CS1qYCR7U1lTQ1RMfSAtbiBody5uY3B1YAogVVNFX0Ja SVAyPQl5ZXMKIFVTRV9HTk9NRT0JZ25vbWV0YXJnZXQgbHRoYWNrCiBVU0VfUEVSTDU9CXllcwpA QCAtNDYsMTggKzQ2LDIyIEBACiAKIENPTkZMSUNUUz0JbHl4LTEuNC4qCiAKLUVYVFJBQ1RfQUZU RVJfQVJHUz18ICR7VEFSfSAteGYgLSAtLWV4Y2x1ZGUgJHtQT1JUTkFNRX0tJHtQT1JUVkVSU0lP Tn0vaW50bC8qLltjaF0gLS1leGNsdWRlICR7UE9SVE5BTUV9LSR7UE9SVFZFUlNJT059L2Jvb3N0 Ci1DT05GSUdVUkVfQVJHUz0JLS13aXRoLWV4dHJhLWxpYj0iJHtMT0NBTEJBU0V9L2xpYiIgXAot CQktLXdpdGgtZXh0cmEtaW5jPSIke0xPQ0FMQkFTRX0vaW5jbHVkZS9RdCogJHtMT0NBTEJBU0V9 L2luY2x1ZGUiIFwKK0VYVFJBQ1RfQUZURVJfQVJHUz18ICR7VEFSfSAteGYgLSAtLWV4Y2x1ZGUg JHtQT1JUTkFNRX0tJHtQT1JUVkVSU0lPTn0vaW50bC8qLltjaF0JXAorCS0tZXhjbHVkZSAke1BP UlROQU1FfS0ke1BPUlRWRVJTSU9OfS9ib29zdCAtLWV4Y2x1ZGUgJHtQT1JUTkFNRX0tJHtQT1JU VkVSU0lPTn0vaW50bAorQ09ORklHVVJFX0FSR1M9CS0td2l0aC1mcm9udGVuZD1xdDQgXAogCQkt LXdpdGhvdXQtaW5jbHVkZWQtYm9vc3QgXAotCQktLXdpdGgtZnJvbnRlbmQ9cXQ0CisJCS0td2l0 aG91dC1pbmNsdWRlZC1nZXR0ZXh0IFwKKwkJLS13aXRoLWxpYmljb252LXByZWZpeD0ke0xPQ0FM QkFTRX0KKwogTUFLRV9BUkdTPQlBQ0xPQ0FMPSIke1RSVUV9IiBBVVRPQ09ORj0iJHtUUlVFfSIg QVVUT01BS0U9IiR7VFJVRX0iIFwKIAkJQVVUT0hFQURFUj0iJHtUUlVFfSIKIE1BTjE9CQlseXgu MSB0ZXgybHl4LjEgbHl4Y2xpZW50LjEKIAogcG9zdC1wYXRjaDoKIAkjIFJlbW92aW5nIG1lbnRp b24gb2YgdGhlIGJ1bmRsZWQgYm9vc3QKLQkke1JFSU5QTEFDRV9DTUR9IC1lICdzLCBib29zdC9b XiBdKk1ha2VmaWxlLCxnJyAke1dSS1NSQ30vY29uZmlndXJlCisJJHtSRUlOUExBQ0VfQ01EfSAt ZSAncywgYm9vc3QvW14gXSpNYWtlZmlsZSwsZycgLWUgJ3MsIGludGwvTWFrZWZpbGUsLGcnCVwK KwkJJHtXUktTUkN9L2NvbmZpZ3VyZQorCSR7UkVJTlBMQUNFX0NNRH0gLWUgJ3MsIGludGwgLCAs JyAke1dSS1NSQ30vTWFrZWZpbGUuaW4KIAkke1JFSU5QTEFDRV9DTUR9IC1lICdzLGRldGFpbC9u dWxsc3RyZWFtLHV0aWxzL251bGxzdHJlYW0sJyBcCiAJICAgICR7V1JLU1JDfS9zcmMvcGNoLmgg JHtXUktTUkN9L3NyYy9zdXBwb3J0L3BjaC5oIFwKIAkgICAgJHtXUktTUkN9L3NyYy9zdXBwb3J0 L2RlYnVnc3RyZWFtLmgKQEAgLTc2LDYgKzgwLDEwIEBACiAJIyBSZW1vdmluZyBleHBsaWNpdCBs aW5raW5nIHdpdGggLWxjCiAJJHtSRUlOUExBQ0VfQ01EfSAtZSAncywtbGMgLCwnICR7V1JLU1JD fS8qL01ha2VmaWxlCiAKK3Bvc3QtYnVpbGQgY2hlY2sgdGVzdDoKKwkjIFJ1bm5pbmcgdmVuZG9y J3Mgc2VsZi10ZXN0czoKKwkke0dNQUtFfSAtQyAke1dSS1NSQ30gY2hlY2sKKwogLmluY2x1ZGUg PGJzZC5wb3J0LnByZS5taz4KIAogLmlmIGV4aXN0cygke1gxMUJBU0V9L2Jpbi9tYWtlcHNyZXMp CkBAIC0xMDAsMTUgKzEwOCwxNyBAQAogLmVuZGlmCiAKIC5pZiAhZGVmaW5lZChXSVRIT1VUX05M UykKLS5pZiBkZWZpbmVkKFdJVEhfSU5DR1QpCi1DT05GSUdVUkVfQVJHUys9CS0td2l0aC1pbmNs dWRlZC1nZXR0ZXh0Ci0uZWxzZQogVVNFX0dFVFRFWFQ9CXllcwogUExJU1RfU1VCKz0JTkxTPSIi Ci0uZW5kaWYKIC5lbHNlCiBDT05GSUdVUkVfQVJHUys9CS0tZGlzYWJsZS1ubHMKIFBMSVNUX1NV Qis9CU5MUz0iQGNvbW1lbnQgIgogLmVuZGlmCiAKKyMgaW5jbHVkZXMgb2YgcXQ0IG11c3QgYmUg Zm91bmQgZWFybGllciB0aGFuIHRob3NlIG9mIHF0MworQ09ORklHVVJFX0VOVis9CVFUNF9DT1JF X0NGTEFHUz0iLURRVF9TSEFSRUQgLUkke0xPQ0FMQkFTRX0vaW5jbHVkZS9RdENvcmUgXAorCQkt SSR7TE9DQUxCQVNFfS9pbmNsdWRlIiBcCisJUVQ0X0ZST05URU5EX0NGTEFHUz0iLURRVF9TSEFS RUQgLUkke0xPQ0FMQkFTRX0vaW5jbHVkZS9RdENvcmUgXAorCQktSSR7TE9DQUxCQVNFfS9pbmNs dWRlL1F0R3VpIC1JJHtMT0NBTEJBU0V9L2luY2x1ZGUiCisKIC5pbmNsdWRlIDxic2QucG9ydC5w b3N0Lm1rPgpkaWZmIC11ciBseXgxNS5vcmlnL2Rpc3RpbmZvIGx5eDE1L2Rpc3RpbmZvCi0tLSBs eXgxNS5vcmlnL2Rpc3RpbmZvCTIwMDctMTItMjAgMjA6NDg6NTguMDAwMDAwMDAwICswMTAwCisr KyBseXgxNS9kaXN0aW5mbwkyMDA3LTEyLTIyIDE3OjE5OjQ3LjAwMDAwMDAwMCArMDEwMApAQCAt MSw2ICsxLDYgQEAKLU1ENSAobHl4LTEuNS4xLnRhci5neikgPSA3YTA2NTIzZDk5YzI3YmE1YTBi YWViYzU2NjQwMjRiYQotU0hBMjU2IChseXgtMS41LjEudGFyLmd6KSA9IDlmMTAwMGVlOTQ3M2Jl Y2I5Y2M0NmFjZGY2NTE3ZDgxODJhNWY2NzljMThmZjYyM2RmNDM2ZDE3MmMwNjhlM2EKLVNJWkUg KGx5eC0xLjUuMS50YXIuZ3opID0gMTAxMTUyMTkKLU1ENSAobHl4LTEuNS4xLnRhci5iejIpID0g MGFlM2I5Y2NiMmFhNzQ3NzZiZTRhZjhjMTk5ZGJiZTkKLVNIQTI1NiAobHl4LTEuNS4xLnRhci5i ejIpID0gZDcyMGZmMDgyZWQyOWQzODVjNTJlN2FkMzcwNDk5ZDIzMjc1ZTU5NWU5ZDdhMzIxYjM4 MzYwOWY2OGFjZjIzZQotU0laRSAobHl4LTEuNS4xLnRhci5iejIpID0gNzgyMzg4NgorTUQ1IChs eXgtMS41LjMudGFyLmd6KSA9IDI2ZDVkYmUxNmI4NGQ3ZDBlMGQyMmZiM2UwNGIxNTNjCitTSEEy NTYgKGx5eC0xLjUuMy50YXIuZ3opID0gYWZjNjUyZTY4NWY2N2M2MjRmN2M2ZGRkMmRhMGQzYmE5 ZjVhMjE5NGQ1OTdhNmMyYjQwMWViY2I1YzEwNmFjYgorU0laRSAobHl4LTEuNS4zLnRhci5neikg PSAxMTMzMzI2NQorTUQ1IChseXgtMS41LjMudGFyLmJ6MikgPSA0ZmUwMTMyNDg3MTNiYjEyNjg3 N2MzMTdjYWQ1NzIzOAorU0hBMjU2IChseXgtMS41LjMudGFyLmJ6MikgPSA1YjZkMDUxZjI0M2U1 NTk1YmY4ZmI1NmE1N2VjZTFiNzcwNDlkNDc0NWJmYzM0NzNlMmYxMjBiOTMzYTQxZGUwCitTSVpF IChseXgtMS41LjMudGFyLmJ6MikgPSA4NzQzMDM1Cg== ------=_Part_4053_33470814.1198341332168--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2de866bc0712220835k3795bf8bqbdff8ca2f54223e8>