On 02/16/2012 06:21 PM, Stephan Bergmann wrote:
On 02/16/2012 05:12 PM, Stephan Bergmann wrote:
On 02/16/2012 04:50 PM, Stephan Bergmann wrote:
On 02/15/2012 04:54 PM, Michael Meeks wrote:
On Wed, 2012-02-15 at 15:07 +0100, Stephan Bergmann wrote:
As per<https://bugs.freedesktop.org/show_bug.cgi?id=45696#c3>
"Importing uno bindings in python causes crash" the master commit
<http://cgit.freedesktop.org/libreoffice/core/commit/?id=0b1be1ce0e0ac7b34c4b73d53f4bf32ec5df7290>



"Reintroduce pyuno.so wrapper around libpyuno.so" should please be
reviewed and cherry-picked to libreoffice-3-5.

Looks reasonable enough to me; can you cherry-pick it with my
sign-off ? :-) and I assume the relevant .component file is magically
updated as it's built etc. ?

Just noted that the revert does not take the necessary changes for
Python 3 into account, so an additional
<http://cgit.freedesktop.org/libreoffice/core/commit/?id=1bb0d979b5ac5ed0cd831c6c8c0ab55dc2621eba>


"Adapt pyuno.so wrapper to Python 3 support" is necessary.

So please re-review attached
0001-Reintroduce-pyuno.so-wrapper-around-libpyuno.so.patch (which
combines the two relevant master commits into one) for application to
libreoffice-3-5.

Rats, missing return value. Now, third attempt, please look at the newly
attached, slightly modified patch instead. Sigh.

Ha! What can I say? Still lacks a WaE workaround... So here comes patch
number four.

Embarrassing as it is, turns out yet another patch needs to be backported from master to libreoffice-3-5, namely <http://cgit.freedesktop.org/libreoffice/core/commit/?id=2ea723e8ce4077c7efa957d278637c4d9f32cf14> "Revert 'Mac OS X uses .dylib and not .so for python modules.'" That should fix the broken Mac OS X tinderbox build at <http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=libreoffice-3-5&brief-log=1329834601.30865#55594>, and I verified that at least --enable-python=internal indeed works with Python components named *.so.

So please also review and cherry-pick that additional patch.

Thanks,
Stephan
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Reply via email to