Re: [Libreoffice] [REVIEW][3-5] let postgresql-sdbc find its dependencies
On Mon, Jan 23, 2012 at 03:21:30PM +0100, Stephan Bergmann wrote: changing the postgresql-sdbc functionality from a bundled extension into a proper (optional) part of LO. The attached 0001-Changed-postgresql-sdbc-from-bundled-oxt-to-proper-o.patch (against recent libreoffice-3-5) does just that. It builds fine on Linux and produces installation sets that properly contain the various files for the postgresql-sdbc functionality. (...) it would need to be checked that it also works on other platforms (esp. Windows, also including whether the functionality is offered there correctly as an optional component during installation). It is not being offered as an optional component during installation on Windows. It seems to be installed as part of another component. Maybe Base? Also, it is still displayed as a bundled extension in the extension manager (only on Windows, not on GNU/Linux), but all in low case and without any additional information (descriptive blurb, version number, provider). I don't have a clue on how to fix that. The GNU/Linux deb packages have a separate libobasis3.5-postgresql-sdbc package - properly optional. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW][3-5] let postgresql-sdbc find its dependencies
On Mon, Jan 23, 2012 at 04:16:55PM +0100, Lionel Elie Mamane wrote: On Mon, Jan 23, 2012 at 03:21:30PM +0100, Stephan Bergmann wrote: * https://bugs.freedesktop.org/show_bug.cgi?id=45058 postgresql-sdbc doesn't work on LO 3.5RC1 win32 * https://bugs.freedesktop.org/show_bug.cgi?id=45090 PostgreSQL-SDBC fails to load on Unix / official binaries: missing libldap50.so can (only) be solved by changing the postgresql-sdbc functionality from a bundled extension into a proper (optional) part of LO. Whether the functionality actually works there however is not clear to me, as I have no recipe how to test it. I'm working on that. Doing a recompile with your patch applied. No, does not work for me. Says (on stderr): warn:configmgr:30707:1:/home/master/src/libreoffice/core/configmgr/source/components.cxx:723: file does not exist: file:///home/master/src/libreoffice/core/solver/unxlngx6/installation/opt/program/../share/extensions/postgresql-sdbc/postgresql.xcu And when actually trying to connect, a GUI pop-up says: An exception occured Type: com.sun.star.loader.CannotActivateFactoryException Message: file:///path/to/libo/solver/unxlngx6/installation/opt/program/../program/postgresql-sdbc.uno.so: cannot get factory of demanded implementation: org.openoffice.comp.connectivity.pq.Connection And probably unrelated, also says: warn:legacy.osl:30729:8:/home/master/src/libreoffice/core/tools/source/rc/resmgr.cxx:813: file:///home/master/src/libreoffice/core/solver/unxlngx6/installation/opt/program/../program/resource/vclen-US.res Class: 275, Id: 25017. Cannot load resource! Resource Stack warn:legacy.osl:30729:8:/home/master/src/libreoffice/core/vcl/source/gdi/bitmapex.cxx:117: BitmapEx::BitmapEx( const ResId rResId ): could not load image resource not found warn:legacy.tools:30729:8:/home/master/src/libreoffice/core/vcl/source/gdi/bmpacc.cxx:77: Forbidden Access to empty bitmap! warn:legacy.osl:30729:8:/home/master/src/libreoffice/core/tools/source/rc/resmgr.cxx:813: file:///home/master/src/libreoffice/core/solver/unxlngx6/installation/opt/program/../program/resource/vclen-US.res Class: 275, Id: 24017. Cannot load resource! Resource Stack warn:legacy.osl:30729:8:/home/master/src/libreoffice/core/vcl/source/gdi/bitmapex.cxx:117: BitmapEx::BitmapEx( const ResId rResId ): could not load image resource not found warn:legacy.tools:30729:8:/home/master/src/libreoffice/core/vcl/source/gdi/bmpacc.cxx:77: Forbidden Access to empty bitmap! -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW][3-5] let postgresql-sdbc find its dependencies
On Tue, Jan 24, 2012 at 06:15:09PM +0100, Lionel Elie Mamane wrote: On Mon, Jan 23, 2012 at 04:16:55PM +0100, Lionel Elie Mamane wrote: On Mon, Jan 23, 2012 at 03:21:30PM +0100, Stephan Bergmann wrote: * https://bugs.freedesktop.org/show_bug.cgi?id=45058 postgresql-sdbc doesn't work on LO 3.5RC1 win32 * https://bugs.freedesktop.org/show_bug.cgi?id=45090 PostgreSQL-SDBC fails to load on Unix / official binaries: missing libldap50.so can (only) be solved by changing the postgresql-sdbc functionality from a bundled extension into a proper (optional) part of LO. Whether the functionality actually works there however is not clear to me, as I have no recipe how to test it. I'm working on that. Doing a recompile with your patch applied. No, does not work for me. Says (on stderr): warn:configmgr:30707:1:/home/master/src/libreoffice/core/configmgr/source/components.cxx:723: file does not exist: file:///home/master/src/libreoffice/core/solver/unxlngx6/installation/opt/program/../share/extensions/postgresql-sdbc/postgresql.xcu And when actually trying to connect, a GUI pop-up says: An exception occured Type: com.sun.star.loader.CannotActivateFactoryException Message: file:///path/to/libo/solver/unxlngx6/installation/opt/program/../program/postgresql-sdbc.uno.so: cannot get factory of demanded implementation: org.openoffice.comp.connectivity.pq.Connection Ah no, you fixed that; just seen the other message. Will pull, recompile and test again. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [REVIEW][3-5] let postgresql-sdbc find its dependencies
As discussed in the recent thread starting at http://lists.freedesktop.org/archives/libreoffice/2012-January/024255.html rpath / ... for extensions (and the case of PostgreSQL-SDBC), it looks like the two bugs * https://bugs.freedesktop.org/show_bug.cgi?id=45058 postgresql-sdbc doesn't work on LO 3.5RC1 win32 * https://bugs.freedesktop.org/show_bug.cgi?id=45090 PostgreSQL-SDBC fails to load on Unix / official binaries: missing libldap50.so (of which neither is currently attached to https://bugs.freedesktop.org/show_bug.cgi?id=37361 LibreOffice 3.5 most annoying bugs, however) can (only) be solved by changing the postgresql-sdbc functionality from a bundled extension into a proper (optional) part of LO. The attached 0001-Changed-postgresql-sdbc-from-bundled-oxt-to-proper-o.patch (against recent libreoffice-3-5) does just that. It builds fine on Linux and produces installation sets that properly contain the various files for the postgresql-sdbc functionality. Whether the functionality actually works there however is not clear to me, as I have no recipe how to test it. Also, it would need to be checked that it also works on other platforms (esp. Windows, also including whether the functionality is offered there correctly as an optional component during installation). Feel free to review for inclusion in LO 3.5. (I can do the actual push in case enough reviewers approve.) Stephan From f67f580e87a187ea31b09d196029fe646e6f8619 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann sberg...@redhat.com Date: Mon, 23 Jan 2012 15:08:36 +0100 Subject: [PATCH] Changed postgresql-sdbc from bundled oxt to proper optional part. --- configure.in | 91 +--- connectivity/prj/d.lst |6 +- .../source/drivers/postgresql/description.xml | 17 .../postgresql/description/description_en-US.txt |1 - connectivity/source/drivers/postgresql/makefile.mk | 79 + .../source/drivers/postgresql/manifest.xml | 10 -- .../postgresql/postgresql-sdbc-impl.component | 35 .../drivers/postgresql/postgresql-sdbc.component | 35 .../source/drivers/postgresql/postgresql-sdbc.ini |2 + .../source/drivers/postgresql/postgresql-sdbc.uno |2 - .../source/drivers/postgresql/pq_connection.cxx| 15 +--- .../source/drivers/postgresql/pq_driver.cxx| 13 --- distro-configs/LibreOfficeLinux.conf |1 - distro-configs/LibreOfficeMacOSX.conf |1 - distro-configs/LibreOfficeWin32.conf |1 - postprocess/packregistry/makefile.mk |4 + scp2/source/base/makefile.mk |6 +- scp2/source/base/postgresqlsdbc.scp| 71 +++ scp2/source/base/postgresqlsdbc.ulf| 36 scp2/source/extensions/directory_extensions.scp| 11 --- scp2/source/extensions/file_extensions.scp | 13 --- scp2/source/extensions/module_extensions.scp | 15 --- scp2/source/extensions/module_extensions.ulf |6 -- scp2/util/makefile.mk |3 +- set_soenv.in |1 - .../source/packinfo/packinfo_extensions.txt| 15 --- setup_native/source/packinfo/packinfo_office.txt | 15 +++ 27 files changed, 271 insertions(+), 234 deletions(-) delete mode 100644 connectivity/source/drivers/postgresql/description.xml delete mode 100644 connectivity/source/drivers/postgresql/description/description_en-US.txt delete mode 100644 connectivity/source/drivers/postgresql/manifest.xml create mode 100644 connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component create mode 100644 connectivity/source/drivers/postgresql/postgresql-sdbc.component create mode 100644 connectivity/source/drivers/postgresql/postgresql-sdbc.ini delete mode 100644 connectivity/source/drivers/postgresql/postgresql-sdbc.uno create mode 100644 scp2/source/base/postgresqlsdbc.scp create mode 100644 scp2/source/base/postgresqlsdbc.ulf diff --git a/configure.in b/configure.in index b15f76c..6bd4aac 100644 --- a/configure.in +++ b/configure.in @@ -355,11 +355,6 @@ AC_ARG_ENABLE(ext-pdfimport, [Disable the PDF Import extension.]) ) -AC_ARG_ENABLE(ext-postgresql-sdbc, -AS_HELP_STRING([--enable-ext-postgresql-sdbc], -[Enable the build of the PostgreSQL-SDBC extension.]) -) - AC_ARG_ENABLE(ext-presenter-console, AS_HELP_STRING([--disable-ext-presenter-console], [Disable the Presenter Console extension.]) @@ -5388,58 +5383,50 @@ dnl === dnl Check for PostgreSQL stuff dnl === -if test x$enable_ext_postgresql_sdbc = xyes; then -if test x$enable_extension_integration = xyes; then -
Re: [Libreoffice] [REVIEW][3-5] let postgresql-sdbc find its dependencies
On 23/01/12 15:21, Stephan Bergmann wrote: The attached 0001-Changed-postgresql-sdbc-from-bundled-oxt-to-proper-o.patch (against recent libreoffice-3-5) does just that. It builds fine on Linux and produces installation sets that properly contain the various files for the postgresql-sdbc functionality. is it still possible to disable the postgres support completely? i think it would be better to have a disable option in configure... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW][3-5] let postgresql-sdbc find its dependencies
On 23/01/12 15:21, Stephan Bergmann wrote: Feel free to review for inclusion in LO 3.5. (I can do the actual push in case enough reviewers approve.) Go for it ! F. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW][3-5] let postgresql-sdbc find its dependencies
On 01/23/2012 03:33 PM, Michael Stahl wrote: On 23/01/12 15:21, Stephan Bergmann wrote: The attached 0001-Changed-postgresql-sdbc-from-bundled-oxt-to-proper-o.patch (against recent libreoffice-3-5) does just that. It builds fine on Linux and produces installation sets that properly contain the various files for the postgresql-sdbc functionality. is it still possible to disable the postgres support completely? i think it would be better to have a disable option in configure... Ah, right, the old configure.in had the whole whether and which postgresql to use implicitly conditional on --enable-ext-postgresql-sdbc. Yes, should add that again as --enable-postgresql-sdbc. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW][3-5] let postgresql-sdbc find its dependencies
On Mon, Jan 23, 2012 at 03:21:30PM +0100, Stephan Bergmann wrote: * https://bugs.freedesktop.org/show_bug.cgi?id=45058 postgresql-sdbc doesn't work on LO 3.5RC1 win32 * https://bugs.freedesktop.org/show_bug.cgi?id=45090 PostgreSQL-SDBC fails to load on Unix / official binaries: missing libldap50.so (of which neither is currently attached to https://bugs.freedesktop.org/show_bug.cgi?id=37361 LibreOffice 3.5 most annoying bugs, however) can (only) be solved by changing the postgresql-sdbc functionality from a bundled extension into a proper (optional) part of LO. The attached 0001-Changed-postgresql-sdbc-from-bundled-oxt-to-proper-o.patch (against recent libreoffice-3-5) does just that. It builds fine on Linux and produces installation sets that properly contain the various files for the postgresql-sdbc functionality. only fixed is exaggerated. Maybe most cleanly fixed. fdo#45058: I'm not convinced it is a DLL loading problem, but future tests will tell us. I'm not convinced it isn't either. fdo#45090: we could also set LD_LIBRARY_PATH in soffice shell wrapper, like we do in the *BSD case, or copy the DLL into the .oxt file. Whether the functionality actually works there however is not clear to me, as I have no recipe how to test it. I'm working on that. Doing a recompile with your patch applied. Feel free to review for inclusion in LO 3.5. I don't see anything very wrong on the patch, but this late in the development cycle, I'd like someone else than me to review/approve it. I notice that this makes the PostgreSQL-SDBC code optional to *install*, but not optional to *compile*. Are we OK with that? -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW][3-5] let postgresql-sdbc find its dependencies
On 01/23/2012 04:16 PM, Lionel Elie Mamane wrote: only fixed is exaggerated. Maybe most cleanly fixed. I came rather late to this discussion, so may miss some point completely. If you know of a non-hacky fix that does not require giving up the oxt, I'd be more than happy to not do the change. (And no, LD_LIBRARY_PATH does not qualify as a non-hacky fix. We are happy that we got rid of it long ago.) Whether the functionality actually works there however is not clear to me, as I have no recipe how to test it. I'm working on that. Doing a recompile with your patch applied. There's still a bug in the patch, second last line of connectivity/source/drivers/postgresql/makefile.mk must use SHL2TARGETN instead of SHL1TARGETN. I notice that this makes the PostgreSQL-SDBC code optional to *install*, but not optional to *compile*. Are we OK with that? Already fixing that, re-adding a --disable-postgresql-sdbc switch. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice