Date: Thu, 5 Jul 2012 15:31:44 +0200 From: Luca Pizzamiglio <luca.pizzamiglio@gmail.com> To: office@freebsd.org Cc: freebsd-ports@freebsd.org Subject: editors/libreoffice : patches for 8.3-STABLE (i386) Message-ID: <CAB88xy9Wh-tA3PypLdfazvWRAz4Q2rzK7Zc=6sDEdPwQRq2EmA@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
--14dae934100d78496a04c4152c77 Content-Type: text/plain; charset=ISO-8859-1 Hi all. I'm Luca and my system is a 8.3-STABLE system (then with clang derived from ports) on a i386 architecture. I had problem to build the latest libreoffice (3.5.4), so I tried to solve issues I met and I developed this easy patches. Are they acceptable? Are this problem known also on other systems/architectures? Best regards, Luca Pizzamiglio PS: please, include my email address on reply, I'm not (yet) using this address on this mailing list ;) --14dae934100d78496a04c4152c77 Content-Type: application/octet-stream; name="patch-filter__source__graphicfilter__icgm__bitmap.cxx" Content-Disposition: attachment; filename="patch-filter__source__graphicfilter__icgm__bitmap.cxx" Content-Transfer-Encoding: base64 X-Attachment-Id: f_h49vc0d00 LS0tIGZpbHRlci9zb3VyY2UvZ3JhcGhpY2ZpbHRlci9pY2dtL2JpdG1hcC5jeHgub3JpZwkyMDEy LTA3LTA1IDE1OjAyOjU5LjAwMDAwMDAwMCArMDIwMAorKysgZmlsdGVyL3NvdXJjZS9ncmFwaGlj ZmlsdGVyL2ljZ20vYml0bWFwLmN4eAkyMDEyLTA3LTA1IDE1OjAzOjM4LjAwMDAwMDAwMCArMDIw MApAQCAtMjU2LDcgKzI1Niw3IEBACiAgICAgckRlc2MubW5TY2FuU2l6ZSA9IDA7CiAgICAgc3dp dGNoKCByRGVzYy5tbkxvY2FsQ29sb3JQcmVjaXNpb24gKQogICAgIHsKLSAgICAgICAgY2FzZSAw eDgwMDAwMDAxIDogICAgICAgICAgICAgICAgICAgICAgIC8vIG1vbm9jaHJvbWUgKCBiaXQgPSAw LT5iYWNrZ3JvdW5kY29sb3IgKQorLy8gICAgICAgIGNhc2UgMHg4MDAwMDAwMSA6ICAgICAgICAg ICAgICAgICAgICAgICAvLyBtb25vY2hyb21lICggYml0ID0gMC0+YmFja2dyb3VuZGNvbG9yICkK ICAgICAgICAgY2FzZSAwIDogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vICAgICAg ICAgICAgICBiaXQgPSAxLT5maWxsY29sb3IKICAgICAgICAgICAgIHJEZXNjLm1uRHN0Qml0c1Bl clBpeGVsID0gMTsKICAgICAgICAgICAgIGJyZWFrOwo= --14dae934100d78496a04c4152c77 Content-Type: application/octet-stream; name="patch-sd__source__filter__eppt__pptx-epptbase.cxx" Content-Disposition: attachment; filename="patch-sd__source__filter__eppt__pptx-epptbase.cxx" Content-Transfer-Encoding: base64 X-Attachment-Id: f_h49vc5pp1 LS0tIHNkL3NvdXJjZS9maWx0ZXIvZXBwdC9wcHR4LWVwcHRiYXNlLmN4eC5vcmlnCTIwMTItMDct MDUgMTU6MDU6NTQuMDAwMDAwMDAwICswMjAwCisrKyBzZC9zb3VyY2UvZmlsdGVyL2VwcHQvcHB0 eC1lcHB0YmFzZS5jeHgJMjAxMi0wNy0wNSAxNTowNjoxMS4wMDAwMDAwMDAgKzAyMDAKQEAgLTIz Nyw3ICsyMzcsNyBAQAogCiAgICAgZm9yICggaSA9IDA7IGkgPCBtblBhZ2VzOyBpKysgKQogICAg IHsKLSAgICAgICAgREJHKHByaW50ZiggImNhbGwgSW1wbENyZWF0ZVNsaWRlKCAlIlNBTF9QUkl1 VUlOVDMyIiApXG4iLCBpKSk7CisgICAgICAgIERCRyhwcmludGYoICJjYWxsIEltcGxDcmVhdGVT bGlkZSggJSIgU0FMX1BSSXVVSU5UMzIgIiApXG4iLCBpKSk7CiAgICAgICAgIGlmICggIUNyZWF0 ZVNsaWRlKCBpICkgKQogICAgICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTQ1NSw3ICs0NTUs NyBAQAogICAgIGlmICggR2V0UHJvcGVydHlWYWx1ZSggYUFueSwgclhQcm9wU2V0LCBTdHJpbmco IFJUTF9DT05TVEFTQ0lJX1VTVFJJTkdQQVJBTSggIkxheW91dCIgKSApICksIHNhbF9UcnVlICkK ICAgICAgICAgYUFueSA+Pj0gbkxheW91dDsKIAotICAgIERCRyhwcmludGYoIkdldExheW91dE9m ZnNldCAlIlNBTF9QUklkSU5UMzIiXG4iLCBuTGF5b3V0KSk7CisgICAgREJHKHByaW50ZigiR2V0 TGF5b3V0T2Zmc2V0ICUiIFNBTF9QUklkSU5UMzIgIlxuIiwgbkxheW91dCkpOwogCiAgICAgcmV0 dXJuIG5MYXlvdXQ7CiB9CkBAIC00ODYsNyArNDg2LDcgQEAKICAgICBpZiggbk9mZnNldCA+PSAw ICYmIG5PZmZzZXQgPCBFUFBfTEFZT1VUX1NJWkUgKQogICAgICAgICByZXR1cm4gcFBITGF5b3V0 WyBuT2Zmc2V0IF07CiAKLSAgICBEQkcocHJpbnRmKCJhc2tlZCAlIlNBTF9QUklkSU5UMzIiIGZv ciBsYXlvdXQgb3V0c2lkZSBvZiAwLCVkIGFycmF5IHNjb3BlXG4iLCBuT2Zmc2V0LCBFUFBfTEFZ T1VUX1NJWkUgKSk7CisgICAgREJHKHByaW50ZigiYXNrZWQgJSIgU0FMX1BSSWRJTlQzMiAiIGZv ciBsYXlvdXQgb3V0c2lkZSBvZiAwLCVkIGFycmF5IHNjb3BlXG4iLCBuT2Zmc2V0LCBFUFBfTEFZ T1VUX1NJWkUgKSk7CiAKICAgICByZXR1cm4gcFBITGF5b3V0WyAwIF07CiB9Cg== --14dae934100d78496a04c4152c77 Content-Type: application/octet-stream; name="patch-sd__source__filter__eppt__pptx-epptooxml.cxx" Content-Disposition: attachment; filename="patch-sd__source__filter__eppt__pptx-epptooxml.cxx" Content-Transfer-Encoding: base64 X-Attachment-Id: f_h49vc9l62 LS0tIHNkL3NvdXJjZS9maWx0ZXIvZXBwdC9wcHR4LWVwcHRvb3htbC5jeHgub3JpZwkyMDEyLTA3 LTA1IDE1OjA3OjI2LjAwMDAwMDAwMCArMDIwMAorKysgc2Qvc291cmNlL2ZpbHRlci9lcHB0L3Bw dHgtZXBwdG9veG1sLmN4eAkyMDEyLTA3LTA1IDE1OjA3OjQyLjAwMDAwMDAwMCArMDIwMApAQCAt MTM3Nyw3ICsxMzc3LDcgQEAKIHZvaWQgUG93ZXJQb2ludEV4cG9ydDo6SW1wbFdyaXRlU2xpZGUo IHNhbF91SW50MzIgblBhZ2VOdW0sIHNhbF91SW50MzIgbk1hc3Rlck51bSwgc2FsX3VJbnQxNiAv KiBuTW9kZSAqLywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNhbF9C b29sIGJIYXNCYWNrZ3JvdW5kLCBSZWZlcmVuY2U8IFhQcm9wZXJ0eVNldCA+IGFYQmFja2dyb3Vu ZFByb3BTZXQgKQogewotICAgIERCRyhwcmludGYoIndyaXRlIHNsaWRlOiAlIlNBTF9QUkl1VUlO VDMyIlxuLS0tLS0tLS0tLS0tLS0tLVxuIiwgblBhZ2VOdW0pKTsKKyAgICBEQkcocHJpbnRmKCJ3 cml0ZSBzbGlkZTogJSIgU0FMX1BSSXVVSU5UMzIgIlxuLS0tLS0tLS0tLS0tLS0tLVxuIiwgblBh Z2VOdW0pKTsKIAogICAgIC8vIHNsaWRlcyBsaXN0CiAgICAgaWYoIG5QYWdlTnVtID09IDAgKQpA QCAtMTQ2Niw3ICsxNDY2LDcgQEAKICAgICBpZiggIW1iQ3JlYXRlTm90ZXMgfHwgIUNvbnRhaW5z T3RoZXJTaGFwZVRoYW5QbGFjZWhvbGRlcnMoIHNhbF9UcnVlICkgKQogICAgIHJldHVybjsKIAot ICAgIERCRyhwcmludGYoIndyaXRlIE5vdGVzICUiU0FMX1BSSXVVSU5UMzIiXG4tLS0tLS0tLS0t LS0tLS0tXG4iLCBuUGFnZU51bSkpOworICAgIERCRyhwcmludGYoIndyaXRlIE5vdGVzICUiIFNB TF9QUkl1VUlOVDMyICJcbi0tLS0tLS0tLS0tLS0tLS1cbiIsIG5QYWdlTnVtKSk7CiAKICAgICBG U0hlbHBlclB0ciBwRlMgPSBvcGVuRnJhZ21lbnRTdHJlYW1XaXRoU2VyaWFsaXplciggT1VTdHJp bmdCdWZmZXIoKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAuYXBwZW5kQXNjaWkoICJwcHQvbm90ZXNTbGlkZXMvbm90ZXNTbGlkZSIgKQpA QCAtMTU3NSw3ICsxNTc1LDcgQEAKIAogdm9pZCBQb3dlclBvaW50RXhwb3J0OjpJbXBsV3JpdGVT bGlkZU1hc3Rlciggc2FsX3VJbnQzMiBuUGFnZU51bSwgUmVmZXJlbmNlPCBYUHJvcGVydHlTZXQg PiBhWEJhY2tncm91bmRQcm9wU2V0ICkKIHsKLSAgICBEQkcocHJpbnRmKCJ3cml0ZSBzbGlkZSBt YXN0ZXI6ICUiU0FMX1BSSXVVSU5UMzIiXG4tLS0tLS0tLS0tLS0tLS0tXG4iLCBuUGFnZU51bSkp OworICAgIERCRyhwcmludGYoIndyaXRlIHNsaWRlIG1hc3RlcjogJSIgU0FMX1BSSXVVSU5UMzIg IlxuLS0tLS0tLS0tLS0tLS0tLVxuIiwgblBhZ2VOdW0pKTsKIAogICAgIC8vIHNsaWRlcyBsaXN0 CiAgICAgaWYoIG5QYWdlTnVtID09IDAgKQpAQCAtMTY2OSw3ICsxNjY5LDcgQEAKIAogc2FsX0lu dDMyIFBvd2VyUG9pbnRFeHBvcnQ6OkdldExheW91dEZpbGVJZCggc2FsX0ludDMyIG5PZmZzZXQs IHNhbF91SW50MzIgbk1hc3Rlck51bSApCiB7Ci0gICAgREJHKHByaW50ZigiR2V0TGF5b3V0Rmls ZUlkIG9mZnNldDogJSJTQUxfUFJJZElOVDMyIiBtYXN0ZXI6ICUiU0FMX1BSSXVVSU5UMzIiIiwg bk9mZnNldCwgbk1hc3Rlck51bSkpOworICAgIERCRyhwcmludGYoIkdldExheW91dEZpbGVJZCBv ZmZzZXQ6ICUiIFNBTF9QUklkSU5UMzIgIiBtYXN0ZXI6ICUiIFNBTF9QUkl1VUlOVDMyICIiLCBu T2Zmc2V0LCBuTWFzdGVyTnVtKSk7CiAgICAgaWYoIG1MYXlvdXRJbmZvWyBuT2Zmc2V0IF0ubW5G aWxlSWRBcnJheS5zaXplKCkgPD0gbk1hc3Rlck51bSApCiAgICAgICAgIHJldHVybiAwOwogCkBA IC0xNjg0LDcgKzE2ODQsNyBAQAogCiB2b2lkIFBvd2VyUG9pbnRFeHBvcnQ6OkltcGxXcml0ZVBQ VFhMYXlvdXQoIHNhbF9JbnQzMiBuT2Zmc2V0LCBzYWxfdUludDMyIG5NYXN0ZXJOdW0gKQogewot ICAgIERCRyhwcmludGYoIndyaXRlIGxheW91dDogJSJTQUxfUFJJZElOVDMyIlxuIiwgbk9mZnNl dCkpOworICAgIERCRyhwcmludGYoIndyaXRlIGxheW91dDogJSIgU0FMX1BSSWRJTlQzMiAiXG4i LCBuT2Zmc2V0KSk7CiAKICAgICBSZWZlcmVuY2U8IGRyYXdpbmc6OlhEcmF3UGFnZXNTdXBwbGll ciA+IHhEUFMoIGdldE1vZGVsKCksIHVubzo6VU5PX1FVRVJZICk7CiAgICAgUmVmZXJlbmNlPCBk cmF3aW5nOjpYRHJhd1BhZ2VzID4geERyYXdQYWdlcyggeERQUy0+Z2V0RHJhd1BhZ2VzKCksIHVu bzo6VU5PX1FVRVJZICk7CkBAIC0yMjcyLDcgKzIyNzIsNyBAQAogICAgICAgICBpZiggdmFsdWUg Pj49IHN0clZhbHVlICkKICAgICAgICAgICAgIHByaW50ZiAoIlwiJXNcIlxuIiwgVVNTKCBzdHJW YWx1ZSApICk7CiAgICAgICAgIGVsc2UgaWYoIHZhbHVlID4+PSBpbnRWYWx1ZSApCi0gICAgICAg ICAgICBwcmludGYgKCIlIlNBTF9QUklkSU5UMzIiICAgICAgICAgICAgKGhleDogJSJTQUxfUFJJ eFVJTlQzMiIpXG4iLCBpbnRWYWx1ZSwgaW50VmFsdWUpOworICAgICAgICAgICAgcHJpbnRmICgi JSIgU0FMX1BSSWRJTlQzMiAiICAgICAgICAgICAgKGhleDogJSIgU0FMX1BSSXhVSU5UMzIgIilc biIsIGludFZhbHVlLCBpbnRWYWx1ZSk7CiAgICAgICAgIGVsc2UgaWYoIHZhbHVlID4+PSBib29s VmFsdWUgKQogICAgICAgICAgICAgcHJpbnRmICgiJWQgICAgICAgICAgICAoYm9vbClcbiIsIGJv b2xWYWx1ZSk7CiAgICAgICAgIGVsc2UgaWYoIHZhbHVlID4+PSBwb2ludFZhbHVlICkK --14dae934100d78496a04c4152c77--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAB88xy9Wh-tA3PypLdfazvWRAz4Q2rzK7Zc=6sDEdPwQRq2EmA>