Re: [Libreoffice-commits] core.git: Fix CustomTarget_postprocess/check_dynamic_objects for --enable-qt5

classic Classic list List threaded Threaded
4 messages Options
sberg sberg
Reply | Threaded
Open this post in threaded view
|

Re: [Libreoffice-commits] core.git: Fix CustomTarget_postprocess/check_dynamic_objects for --enable-qt5

On 07.02.2018 09:33, Stephan Bergmann wrote:

> commit bf23fe3a4a3eebe3d08fa26341a486b83d80c1c7
> Author: Stephan Bergmann <[hidden email]>
> Date:   Wed Feb 7 09:11:35 2018 +0100
>
>      Fix CustomTarget_postprocess/check_dynamic_objects for --enable-qt5
>      
>      The dependency of Library_vcl on qt5 libraries (via vcl/qt5/Qt5Font.cxx) is
>      there ever since b66a7cbd8491fe436126e11975c360f47ae346ed "QT5 first stab on
>      implementing CommonSalLayout", but no idea whether that is by design or is a
>      hack that should eventually be cleaned up.

Any thoughts on the above?  It might e.g. by undesirable for distros
that do --enable-qt5 but split libvclplug_qt5lo.so into a Qt5-dependent
package of its own (and don't want the base vcl package to depend on Qt5).

>      Change-Id: I4cec702709b37069987ec68c035628b5172b3543
>
> diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
> index 93fcfa6cc098..1259718b7739 100755
> --- a/bin/check-elf-dynamic-objects
> +++ b/bin/check-elf-dynamic-objects
> @@ -71,6 +71,7 @@ gstreamerwhitelist="libgstpbutils-1.0.so.0 libgstvideo-1.0.so.0 libgstbase-1.0.s
>   gtk2whitelist="libgtk-x11-2.0.so.0 libgdk-x11-2.0.so.0 libpangocairo-1.0.so.0 libatk-1.0.so.0 libcairo.so.2 libgio-2.0.so.0 libpangoft2-1.0.so.0 libpango-1.0.so.0 libfontconfig.so.1 libfreetype.so.6 libgdk_pixbuf-2.0.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3"
>   gtk3whitelist="libgtk-3.so.0 libgdk-3.so.0 libcairo-gobject.so.2 libpangocairo-1.0.so.0 libatk-1.0.so.0 libcairo.so.2 libgio-2.0.so.0 libpangoft2-1.0.so.0 libpango-1.0.so.0 libfontconfig.so.1 libfreetype.so.6 libgdk_pixbuf-2.0.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3"
>   kde4whitelist="libkio.so.5 libkfile.so.4 libkdeui.so.5 libkdecore.so.5 libQtNetwork.so.4 libQtGui.so.4 libQtCore.so.4 libglib-2.0.so.0"
> +qt5whitelist="libQt5Core.so.5 libQt5Gui.so.5 libQt5Network.so.5 libQt5Widgets.so.5 libcairo.so.2 libglib-2.0.so.0"
>   avahiwhitelist="libdbus-glib-1.so.2 libdbus-1.so.3 libgobject-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libglib-2.0.so.0 libavahi-common.so.3 libavahi-client.so.3"
>   kerberoswhitelist="libgssapi_krb5.so.2 libcom_err.so.2 libkrb5.so.3"
>   dconfwhitelist="libdconf.so.1 libgio-2.0.so.0 libglib-2.0.so.0 libgobject-2.0.so.0"
> @@ -107,13 +108,25 @@ local file="$1"
>           */libvclplug_gtk3lo.so)
>               whitelist="${whitelist} ${x11whitelist} ${gtk3whitelist}"
>           ;;
> +        */libvclplug_qt5lo.so)
> +            if [ "$ENABLE_QT5" = TRUE ]; then
> +                whitelist="${whitelist} ${qt5whitelist}"
> +            fi
> +        ;;
>           */libdesktop_detectorlo.so|*/ui-previewer|*/oosplash|*/gengal.bin)
>               whitelist="${whitelist} ${x11whitelist}"
>           ;;
>           */libvclplug_genlo.so|*/libchartcorelo.so|*/libavmediaogl.so|*/libOGLTranslo.so|*/liboglcanvaslo.so|*/libchartopengllo.so)
>               whitelist="${whitelist} ${x11whitelist} ${openglwhitelist}"
>           ;;
> -        */libvcllo.so|*/libsofficeapp.so)
> +        */libvcllo.so)
> +            whitelist="${whitelist} ${x11whitelist} ${openglwhitelist} ${giowhitelist} libcups.so.2"
> +            if [ "$ENABLE_QT5" = TRUE ]; then
> +                #TOOD: is inclusion of vcl/qt5/Qt5Font.cxx in Library_vcl really wanted?
> +                whitelist="${whitelist} ${qt5whitelist}"
> +            fi
> +        ;;
> +        */libsofficeapp.so)
>               whitelist="${whitelist} ${x11whitelist} ${openglwhitelist} ${giowhitelist} libcups.so.2"
>           ;;
>           */liblibreofficekitgtk.so)
_______________________________________________
LibreOffice mailing list
[hidden email]
https://lists.freedesktop.org/mailman/listinfo/libreoffice
Rene Engelhard Rene Engelhard
Reply | Threaded
Open this post in threaded view
|

Re: [Libreoffice-commits] core.git: Fix CustomTarget_postprocess/check_dynamic_objects for --enable-qt5

Hi,

On Wed, Feb 07, 2018 at 09:57:46AM +0100, Stephan Bergmann wrote:

> On 07.02.2018 09:33, Stephan Bergmann wrote:
> > commit bf23fe3a4a3eebe3d08fa26341a486b83d80c1c7
> > Author: Stephan Bergmann <[hidden email]>
> > Date:   Wed Feb 7 09:11:35 2018 +0100
> >
> >      Fix CustomTarget_postprocess/check_dynamic_objects for --enable-qt5
> >      The dependency of Library_vcl on qt5 libraries (via vcl/qt5/Qt5Font.cxx) is
> >      there ever since b66a7cbd8491fe436126e11975c360f47ae346ed "QT5 first stab on
> >      implementing CommonSalLayout", but no idea whether that is by design or is a
> >      hack that should eventually be cleaned up.
>
> Any thoughts on the above?  It might e.g. by undesirable for distros that do
> --enable-qt5 but split libvclplug_qt5lo.so into a Qt5-dependent package of
> its own (and don't want the base vcl package to depend on Qt5).

Yes, I already "complained" about this, jmux had a look/wanted to have
a look. This is a blocker for me enabling qt5. I am so not making -core
depending on qt5.

(Or I unmerge it and do some dpkg-divert hacks.
That is awful and error-prone, though and doesn't scale...)

Regards,

Rene
_______________________________________________
LibreOffice mailing list
[hidden email]
https://lists.freedesktop.org/mailman/listinfo/libreoffice
sberg sberg
Reply | Threaded
Open this post in threaded view
|

Re: [Libreoffice-commits] core.git: Fix CustomTarget_postprocess/check_dynamic_objects for --enable-qt5

On 07.02.2018 11:46, Rene Engelhard wrote:

> On Wed, Feb 07, 2018 at 09:57:46AM +0100, Stephan Bergmann wrote:
>> On 07.02.2018 09:33, Stephan Bergmann wrote:
>>> commit bf23fe3a4a3eebe3d08fa26341a486b83d80c1c7
>>> Author: Stephan Bergmann <[hidden email]>
>>> Date:   Wed Feb 7 09:11:35 2018 +0100
>>>
>>>       Fix CustomTarget_postprocess/check_dynamic_objects for --enable-qt5
>>>       The dependency of Library_vcl on qt5 libraries (via vcl/qt5/Qt5Font.cxx) is
>>>       there ever since b66a7cbd8491fe436126e11975c360f47ae346ed "QT5 first stab on
>>>       implementing CommonSalLayout", but no idea whether that is by design or is a
>>>       hack that should eventually be cleaned up.
>>
>> Any thoughts on the above?  It might e.g. by undesirable for distros that do
>> --enable-qt5 but split libvclplug_qt5lo.so into a Qt5-dependent package of
>> its own (and don't want the base vcl package to depend on Qt5).
>
> Yes, I already "complained" about this, jmux had a look/wanted to have
> a look. This is a blocker for me enabling qt5. I am so not making -core
> depending on qt5.

So whoever will eventually fix that, please remember to revert the
relevant part of this bf23fe3a4a3eebe3d08fa26341a486b83d80c1c7, too.
_______________________________________________
LibreOffice mailing list
[hidden email]
https://lists.freedesktop.org/mailman/listinfo/libreoffice
Jan-Marek Glogowski Jan-Marek Glogowski
Reply | Threaded
Open this post in threaded view
|

Re: [Libreoffice-commits] core.git: Fix CustomTarget_postprocess/check_dynamic_objects for --enable-qt5

Am 07.02.2018 um 14:21 schrieb Stephan Bergmann:

> On 07.02.2018 11:46, Rene Engelhard wrote:
>> On Wed, Feb 07, 2018 at 09:57:46AM +0100, Stephan Bergmann wrote:
>>> On 07.02.2018 09:33, Stephan Bergmann wrote:
>>>> commit bf23fe3a4a3eebe3d08fa26341a486b83d80c1c7
>>>> Author: Stephan Bergmann <[hidden email]>
>>>> Date:   Wed Feb 7 09:11:35 2018 +0100
>>>>
>>>>       Fix CustomTarget_postprocess/check_dynamic_objects for
>>>> --enable-qt5
>>>>       The dependency of Library_vcl on qt5 libraries (via
>>>> vcl/qt5/Qt5Font.cxx) is
>>>>       there ever since b66a7cbd8491fe436126e11975c360f47ae346ed "QT5
>>>> first stab on
>>>>       implementing CommonSalLayout", but no idea whether that is by
>>>> design or is a
>>>>       hack that should eventually be cleaned up.
>>>
>>> Any thoughts on the above?  It might e.g. by undesirable for distros
>>> that do
>>> --enable-qt5 but split libvclplug_qt5lo.so into a Qt5-dependent
>>> package of
>>> its own (and don't want the base vcl package to depend on Qt5).
>>
>> Yes, I already "complained" about this, jmux had a look/wanted to have
>> a look. This is a blocker for me enabling qt5. I am so not making -core
>> depending on qt5.
>
> So whoever will eventually fix that, please remember to revert the
> relevant part of this bf23fe3a4a3eebe3d08fa26341a486b83d80c1c7, too.

There are two commits to fix this:

https://gerrit.libreoffice.org/#/c/47279/
https://gerrit.libreoffice.org/#/c/47408/

I simply didn't have enough time to test these. They compile and "work
for me". But this eventually breaks embedded font handling and some code
I changed didn't made much sense. There were some reinterpret_cast stuff
to fit those embedded font handling into the normal font handling in
some obscure way, I don't yet grok. Then there is the hb_font handling
on Windows, which - I guess for some resource handling - is places in
the PhysicalFontFace instead of the LogicalFontInstance.

But currently I don't have time to test this with all the stuff (AKA a
Windows and Mac build, embedded font handling).

Probably it would be easier to just move the Qt5 stuff; but then I
wanted to clean this up and move the platform specific code into their
respective VCL modules. I also started writing documentation, about the
way the font handling works / should work.

Fact is I'm currently overwhelmed by non-LO work. If someone else has
some time do the testing I would be happy. I can push this, but don't
have time to fix regressions.

And I would like to mentor some Qt5 GSoC, which I have to replace the
KDE stuff on the ideas page.

And I have rebased patches, if that helps.

Jan-Marek
_______________________________________________
LibreOffice mailing list
[hidden email]
https://lists.freedesktop.org/mailman/listinfo/libreoffice