Patch for building against libxml2 version 2.7.4 and 2.7.5
Jonas Finnemann Jensen <[email protected]> Mon, 27 Sep 2010 21:47:17 +0200
| Newsgroups | gmane.comp.gnome.ximian.openoffice |
|---|---|
| Message-ID | <[email protected]> |
--0016364ed85cdb63c8049142ff3c Content-Type: multipart/alternative; boundary=0016364ed85cdb63c1049142ff3a --0016364ed85cdb63c1049142ff3a Content-Type: text/plain; charset=ISO-8859-1 Hi, I spend some time this weekend getting master to build on my now somewhat old ubuntu install... Anyway, I ran into an issue with the libxmlsec module, it has some fixes for older versions of libxml2, which are applied based on version number of libxml2... Checking the recent versions of libxml2, I discovered that this version number was a bit off (in the libxmlsec module).. So I made a patch for it... and added it to the apply file... Committed git and ran $ git format-patch origin/master I'm not certain that I applied it the right place in the apply file... But it works... I hope this is the right place to post it... [1] says to send them to dev at lists.go-oo.org, but I assume that's an old list... I've also reported and provided patch for upstream, issue #114782 [1] http://www.freedesktop.org/wiki/Software/ooo-build/Contributing#Mailingthechanges -- Regards Jonas Finnemann Jensen. --0016364ed85cdb63c1049142ff3a Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hi,<div><br></div><div>I spend some time this weekend getting master to bui= ld on my now somewhat old ubuntu install... Anyway, I ran into an issue wit= h the libxmlsec module, it has some fixes for older versions of libxml2, wh= ich are applied based on version number of libxml2... Checking the recent v= ersions of libxml2, I discovered that this version number was a bit off (in= the libxmlsec module)..</div> <div>So I made a patch for it... and added it to the apply file... Committe= d git and ran $ git format-patch origin/master</div><div>I'm not certai= n that I applied it the right place in the apply file... But it works...</d= iv> <div><br></div><div>I hope this is the right place to post it... [1] says t= o send them to dev at <a href=3D"http://lists.go-oo.org">lists.go-oo.org</a= >, but I assume that's an old list...</div><div>I've also reported = and provided patch for upstream, issue #114782</div> <meta http-equiv=3D"content-type" content=3D"text/html; charset=3Dutf-8"><d= iv><br></div><div>[1]=A0<a href=3D"http://www.freedesktop.org/wiki/Software= /ooo-build/Contributing#Mailingthechanges">http://www.freedesktop.org/wiki/= Software/ooo-build/Contributing#Mailingthechanges</a></div> <div><br clear=3D"all">--<br>Regards Jonas Finnemann Jensen.<br> </div> --0016364ed85cdb63c1049142ff3a-- --0016364ed85cdb63c8049142ff3c Content-Type: text/x-patch; charset=US-ASCII; name="0001-Fix-in-patch-that-fixes-older-libxml2-versions.patch" Content-Disposition: attachment; filename="0001-Fix-in-patch-that-fixes-older-libxml2-versions.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gelq0d9a0 RnJvbSA5NjM0YjZiNTQ2YmYzNTA5NGQxOTU3MDQ5NjgxNzBhYzVlY2I4ZGU1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb25hcyBGaW5uZW1hbm4gSmVuc2VuIDxqb3BzZW5AZ21haWwu Y29tPgpEYXRlOiBTYXQsIDI1IFNlcCAyMDEwIDE2OjAxOjQ0ICswMjAwClN1YmplY3Q6IFtQQVRD SF0gRml4IGluIHBhdGNoIHRoYXQgZml4ZXMgb2xkZXIgbGlieG1sMiB2ZXJzaW9ucwoKbGlieG1s c2VjL3htbHNlYzEtb2xkZXJsaWJ4bWwyLnBhdGNoIGZpeGVzIGEgbWlzc2luZyBlbnVtIGluIG9s ZGVyCnZlcnNpb25zIG9mIGxpYnhtbDIuIEhvd2V2ZXIsIHRoZSAjaWYgTElCWE1MX1ZFUlNJT04g PCAuLi4gdGhhdAplbmFibGVzIHRoZSBwYXRjaCBoYWQgdGhlIHdyb25nIHZlcnNpb24gbnVtYmVy LiBUaGlzIGlzIGZpeGVkIHNvIE9PLm8KY29tcGlsZXMgd2l0aCBsaWJ4bWwyIDIuNy40IGFuZCAy LjcuNSBhZ2Fpbi4KKFRoZXNlIHdoZXJlIHRoZSBvbmx5IGFmZmVjdGVkIHZlcnNpb24gbnVtYmVy cykuCi0tLQogcGF0Y2hlcy9kZXYzMDAvYXBwbHkgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgfCAgICAzICsrKwogLi4uL2RldjMwMC9saWJ4bWxzZWMtb2xkZXJsaWJ4bWwycGF0Y2gtZml4 LmRpZmYgICAgfCAgIDEzICsrKysrKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgMTYgaW5zZXJ0 aW9ucygrKSwgMCBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBwYXRjaGVzL2RldjMw MC9saWJ4bWxzZWMtb2xkZXJsaWJ4bWwycGF0Y2gtZml4LmRpZmYKCmRpZmYgLS1naXQgYS9wYXRj aGVzL2RldjMwMC9hcHBseSBiL3BhdGNoZXMvZGV2MzAwL2FwcGx5CmluZGV4IGM4MDM1NGQuLjhk N2NhMTQgMTAwNjQ0Ci0tLSBhL3BhdGNoZXMvZGV2MzAwL2FwcGx5CisrKyBiL3BhdGNoZXMvZGV2 MzAwL2FwcGx5CkBAIC0zNDgsNiArMzQ4LDkgQEAgc2Z4Mi1jaGVjay1leGlzdGluZy10ZW1wbGF0 ZS1kaXJzLmRpZmYsIGkjMTAwNTE4LCBwbWxhZGVrCiAjIEZJWE1FOiB0ZW1wb3JhcmlseSBkaXNh YmxlZCBhcyB0aGlzIGNhdXNlcyBhIHJhY2UgY29uZGl0aW9uIGluIGNhbGMncyBjZWxsIGZvcm1h dCBkaWFsb2cuCiAjdmNsLWtlcm5pbmctZml4LmRpZmYsIG4jNDY0NDM2LCBpIzI2NTE5LCBjYm9z ZG8KIAorI0ZpeCB2ZXJzaW9uIG51bWJlciBidWcgaW4gcGF0Y2ggZm9yIG9sZCBsaWJ4bWwyCits aWJ4bWxzZWMtb2xkZXJsaWJ4bWwycGF0Y2gtZml4LmRpZmYsIGpvcHNlbgorCiBbIExpbnV4T25s eSBdCiAjIGZpeCB0aGF0IGFsbG93cyBPT28gdG8gd29yayB3aXRoIGEgc3RhbmRhcmQgKHVucGF0 Y2hlZCkgbGlianBlZywKIGpwZWdjLmMuZGlmZiwgaSM4MDY3NCwgbiMyNzI1NzQsIGZscgpkaWZm IC0tZ2l0IGEvcGF0Y2hlcy9kZXYzMDAvbGlieG1sc2VjLW9sZGVybGlieG1sMnBhdGNoLWZpeC5k aWZmIGIvcGF0Y2hlcy9kZXYzMDAvbGlieG1sc2VjLW9sZGVybGlieG1sMnBhdGNoLWZpeC5kaWZm Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjBmZGVlZmIKLS0tIC9kZXYvbnVs bAorKysgYi9wYXRjaGVzL2RldjMwMC9saWJ4bWxzZWMtb2xkZXJsaWJ4bWwycGF0Y2gtZml4LmRp ZmYKQEAgLTAsMCArMSwxMyBAQAorZGlmZiAtLWdpdCBsaWJ4bWxzZWMveG1sc2VjMS1vbGRlcmxp YnhtbDIucGF0Y2ggbGlieG1sc2VjL3htbHNlYzEtb2xkZXJsaWJ4bWwyLnBhdGNoCitpbmRleCBi NWYzZDU3Li5mMmJkODVmIDEwMDY0NAorLS0tIGxpYnhtbHNlYy94bWxzZWMxLW9sZGVybGlieG1s Mi5wYXRjaAorKysrIGxpYnhtbHNlYy94bWxzZWMxLW9sZGVybGlieG1sMi5wYXRjaAorQEAgLTQs NyArNCw3IEBACisgICAgICByZXR1cm4oMCk7CisgIH0KKyAgCistKyNpZiAhZGVmaW5lZChMSUJY TUxfVkVSU0lPTikgfHwgTElCWE1MX1ZFUlNJT04gPCAyMDcwNgorKysjaWYgIWRlZmluZWQoTElC WE1MX1ZFUlNJT04pIHx8IExJQlhNTF9WRVJTSU9OIDwgMjA3MDQKKyArLyoKKyArICogeG1sQzE0 Tk1vZGU6CisgKyAqIAotLSAKMS42LjYuMQoK --0016364ed85cdb63c8049142ff3c Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline