PATCH - change default KDE from 3 to 4

classic Classic list List threaded Threaded
10 messages Options
Wols Lists Wols Lists
Reply | Threaded
Open this post in threaded view
|

PATCH - change default KDE from 3 to 4

 With thanks to Rene Kjellerup ... your pointer was spot on.

This patch (in the top level build dir) makes the development system
compile with KDE4 switched on and KDE3 switched off.

How do I update the develop page on the web? There's a bunch of useful
stuff I'd like to document to make life easier for the next person who
wants to fix a "won't build" problem (whether a global default or a
personal setup).

Cheers,
Wol


diff --git a/distro-configs/LibreOfficeLinuxDevel.conf.in
b/distro-configs/LibreOfficeLinuxDevel.conf.in
index a8df1e0..58b9e8d 100644
--- a/distro-configs/LibreOfficeLinuxDevel.conf.in
+++ b/distro-configs/LibreOfficeLinuxDevel.conf.in
@@ -1,6 +1,6 @@
 --with-vendor=\"The Document Foundation\"
 --disable-dbus
---disable-kde4
+--enable-kde4
 --enable-cairo
 --without-system-cairo
 --enable-gstreamer
@@ -13,7 +13,7 @@
 --with-java-target-version=1.5
 --with-jdk-home=$JAVA_HOME
 --without-myspell-dicts
---enable-kde
+--disable-kde
 --without-system-mozilla
 --without-system-jpeg
 --without-system-libxml

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

Re: [PATCH] - change default KDE from 3 to 4

 Resubmit with brackets in subject - I think I need them for the
patchmeister to pick up?

On 22/10/10 23:29, Wols Lists wrote:

>  With thanks to Rene Kjellerup ... your pointer was spot on.
>
> This patch (in the top level build dir) makes the development system
> compile with KDE4 switched on and KDE3 switched off.
>
> How do I update the develop page on the web? There's a bunch of useful
> stuff I'd like to document to make life easier for the next person who
> wants to fix a "won't build" problem (whether a global default or a
> personal setup).
>
> Cheers,
> Wol
>
>
> diff --git a/distro-configs/LibreOfficeLinuxDevel.conf.in
> b/distro-configs/LibreOfficeLinuxDevel.conf.in
> index a8df1e0..58b9e8d 100644
> --- a/distro-configs/LibreOfficeLinuxDevel.conf.in
> +++ b/distro-configs/LibreOfficeLinuxDevel.conf.in
> @@ -1,6 +1,6 @@
>  --with-vendor=\"The Document Foundation\"
>  --disable-dbus
> ---disable-kde4
> +--enable-kde4
>  --enable-cairo
>  --without-system-cairo
>  --enable-gstreamer
> @@ -13,7 +13,7 @@
>  --with-java-target-version=1.5
>  --with-jdk-home=$JAVA_HOME
>  --without-myspell-dicts
> ---enable-kde
> +--disable-kde
>  --without-system-mozilla
>  --without-system-jpeg
>  --without-system-libxml
>
> _______________________________________________
> LibreOffice mailing list
> [hidden email]
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>

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

Re: PATCH - change default KDE from 3 to 4

In reply to this post by Wols Lists
Hi Wols,

On Fri, 2010-10-22 at 23:29 +0100, Wols Lists wrote:
> This patch (in the top level build dir) makes the development system
> compile with KDE4 switched on and KDE3 switched off.

        That sounds reasonable.

> How do I update the develop page on the web ? There's a bunch of useful
> stuff I'd like to document to make life easier for the next person who
> wants to fix a "won't build" problem (whether a global default or a
> personal setup).

        So - the 'develop' page is in the 'website' git repository (which is
un-necessarly huge last time I looked) - so I'll mail you a snapshot
separately.

        I would -really- like to avoid the develop page becoming huge and
bloated - so, some links for each section into an equivalent section of
the wiki - would be great. Particularly for transient build issues: the
website is not -that- easy to update, and the wiki is easier. Does that
make sense ? [ do add some links and send in a diff ].

> diff --git a/distro-configs/LibreOfficeLinuxDevel.conf.in
> b/distro-configs/LibreOfficeLinuxDevel.conf.in
> index a8df1e0..58b9e8d 100644
> --- a/distro-configs/LibreOfficeLinuxDevel.conf.in
> +++ b/distro-configs/LibreOfficeLinuxDevel.conf.in
> @@ -1,6 +1,6 @@
>  --with-vendor=\"The Document Foundation\"
>  --disable-dbus
> ---disable-kde4
> +--enable-kde4

        so - really I would like to avoid this.

        My ideal is to have neither an enable or disable flag for any of the
optional pieces: KDE3 / KDE4 / GNOME etc. - but have a default of
auto-detection, so we only build if they are there.

        This will need some code changes to configure.in [ not the one in
build/ but the one in bootstrap ], and a little autoconf knowledge.
However it should solve the problem for lots of people.

        Any chance you could look at that instead ?

        Thanks,

                Michael.

--
 [hidden email]  <><, Pseudo Engineer, itinerant idiot


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

Re: [PATCH] - change default KDE from 3 to 4

In reply to this post by Wols Lists
Wols Lists wrote:
>  Resubmit with brackets in subject - I think I need them for the
> patchmeister to pick up?
>
Thanks a lot for the fix, pushed!

-- Thorsten

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

attachment0 (205 bytes) Download Attachment
Rene Engelhard Rene Engelhard
Reply | Threaded
Open this post in threaded view
|

Re: PATCH - change default KDE from 3 to 4

In reply to this post by Michael Meeks
Hi,

On Mon, Oct 25, 2010 at 01:46:25PM +0100, Michael Meeks wrote:
> > This patch (in the top level build dir) makes the development system
> > compile with KDE4 switched on and KDE3 switched off.
>
> That sounds reasonable.

ACK.

> My ideal is to have neither an enable or disable flag for any of the
> optional pieces: KDE3 / KDE4 / GNOME etc. - but have a default of
> auto-detection, so we only build if they are there.

I disagree. Even if you had auto-detection you still need those
options to *explicitely* en/dissable the features. There's reasons
you want to build without that stuff even when present.

Everything auto-detected is a sure way to breake. should I just build-conflict
against kde so that I don't build kde stuff (assuming I wanted that)

> However it should solve the problem for lots of people.

It will cause more for distributions, though.

Grüße/Regards,

René
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Norbert Thiebaud Norbert Thiebaud
Reply | Threaded
Open this post in threaded view
|

Re: PATCH - change default KDE from 3 to 4

In reply to this post by Michael Meeks
On Mon, Oct 25, 2010 at 7:46 AM, Michael Meeks <[hidden email]> wrote:

> Hi Wols,
>
> On Fri, 2010-10-22 at 23:29 +0100, Wols Lists wrote:
>> This patch (in the top level build dir) makes the development system
>> compile with KDE4 switched on and KDE3 switched off.
>
>        That sounds reasonable.
>
>> How do I update the develop page on the web ? There's a bunch of useful
>> stuff I'd like to document to make life easier for the next person who
>> wants to fix a "won't build" problem (whether a global default or a
>> personal setup).
>
>        So - the 'develop' page is in the 'website' git repository (which is
> un-necessarly huge last time I looked) - so I'll mail you a snapshot
> separately.
>
>        I would -really- like to avoid the develop page becoming huge and
> bloated - so, some links for each section into an equivalent section of
> the wiki - would be great. Particularly for transient build issues: the
> website is not -that- easy to update, and the wiki is easier. Does that
> make sense ? [ do add some links and send in a diff ].
>
>> diff --git a/distro-configs/LibreOfficeLinuxDevel.conf.in
>> b/distro-configs/LibreOfficeLinuxDevel.conf.in
>> index a8df1e0..58b9e8d 100644
>> --- a/distro-configs/LibreOfficeLinuxDevel.conf.in
>> +++ b/distro-configs/LibreOfficeLinuxDevel.conf.in
>> @@ -1,6 +1,6 @@
>>  --with-vendor=\"The Document Foundation\"
>>  --disable-dbus
>> ---disable-kde4
>> +--enable-kde4
>
>        so - really I would like to avoid this.
>
>        My ideal is to have neither an enable or disable flag for any of the
> optional pieces: KDE3 / KDE4 / GNOME etc. - but have a default of
> auto-detection, so we only build if they are there.

humm... Just because it is available (or the build system _think_ it's
avaialable) on your build machine, doesn't mean your target will have
it.

I'd agree that the default should be to automatically pick-up what is
there... but at least the disable flag should stay.

Norbert

>
>        This will need some code changes to configure.in [ not the one in
> build/ but the one in bootstrap ], and a little autoconf knowledge.
> However it should solve the problem for lots of people.
>
>        Any chance you could look at that instead ?
>
>        Thanks,
>
>                Michael.
>
> --
>  [hidden email]  <><, Pseudo Engineer, itinerant idiot
>
>
> _______________________________________________
> LibreOffice mailing list
> [hidden email]
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Michael Meeks Michael Meeks
Reply | Threaded
Open this post in threaded view
|

Re: PATCH - change default KDE from 3 to 4

In reply to this post by Rene Engelhard

On Mon, 2010-10-25 at 15:37 +0200, Rene Engelhard wrote:
> > My ideal is to have neither an enable or disable flag for any of the
> > optional pieces: KDE3 / KDE4 / GNOME etc. - but have a default of
> > auto-detection, so we only build if they are there.
>
> I disagree. Even if you had auto-detection you still need those
> options to *explicitely* en/dissable the features. There's reasons
> you want to build without that stuff even when present.

        Ah ! you mistake me; for the developers profile (the default build) we
should simply pass no configure option - and the default there should be
to auto-detect.

> Everything auto-detected is a sure way to break

        Certainly - so packagers should explicitly pass --enable-foo or
--disable-foo depending on what they want, and if foo is not there it
should then break horribly :-)

        Surely that doesn't create problems for distros ? [ it is easy to add
the explicit flags to the distro configs ]

        HTH,

                Michael.

--
 [hidden email]  <><, Pseudo Engineer, itinerant idiot


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

Re: PATCH - change default KDE from 3 to 4

On 25/10/10 17:19, Michael Meeks wrote:

> On Mon, 2010-10-25 at 15:37 +0200, Rene Engelhard wrote:
>>> My ideal is to have neither an enable or disable flag for any of the
>>> optional pieces: KDE3 / KDE4 / GNOME etc. - but have a default of
>>> auto-detection, so we only build if they are there.
>> I disagree. Even if you had auto-detection you still need those
>> options to *explicitely* en/dissable the features. There's reasons
>> you want to build without that stuff even when present.
> Ah ! you mistake me; for the developers profile (the default build) we
> should simply pass no configure option - and the default there should be
> to auto-detect.

So. I'll try and improve my autoconf-fu :-)

First thing to check - I presume if no config is specified then the
variables get set to null, so I need to check for three states ie yes,
no and null.

If no, it gets left out.
If yes, it gets compiled in.
If null, it is autodetected and compiled if it's there.

>> Everything auto-detected is a sure way to break
> Certainly - so packagers should explicitly pass --enable-foo or
> --disable-foo depending on what they want, and if foo is not there it
> should then break horribly :-)

So if it's yes but not there, then die like at present :-)

> Surely that doesn't create problems for distros ? [ it is easy to add
> the explicit flags to the distro configs ]

Yup.

> HTH,
>
> Michael.
>

I will accept the mission :-) I may be a long time ... (and I'll try and
document what I learn on the wiki build page :-)

Cheers,
Wol
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Michael Meeks Michael Meeks
Reply | Threaded
Open this post in threaded view
|

Re: PATCH - change default KDE from 3 to 4

Hi Wols,

On Mon, 2010-10-25 at 18:50 +0100, Wols Lists wrote:
> So. I'll try and improve my autoconf-fu :-)

        cool :-) thanks.

> First thing to check - I presume if no config is specified then the
> variables get set to null, so I need to check for three states ie yes,
> no and null.

        Right - I think if it is not set; you can specify the value in the
macro thus:

AC_ARG_ENABLE(mozilla,
[  --disable-mozilla       OO.o usually includes a strangely hacked up mozilla
                          binary for your platform, to build without this
                          version, use this option.
],,enable_mozilla="yes")

        in this case you'd want enable_foo="auto" or something, and then detect
and work out what auto should be for that system.

> If no, it gets left out.
> If yes, it gets compiled in.
> If null, it is autodetected and compiled if it's there.

        Correct - that's what we want ;-)

> So if it's yes but not there, then die like at present :-)

        Quite ! :-) that is important for packagers to stay sane.

> I will accept the mission :-) I may be a long time ... (and I'll
> try and document what I learn on the wiki build page :-)

        Good work !

        Many thanks,

                Michael.

--
 [hidden email]  <><, Pseudo Engineer, itinerant idiot


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

Re: PATCH - change default KDE from 3 to 4

In reply to this post by Michael Meeks
On Mon, 25 Oct 2010 13:46:25 +0100, Michael Meeks  wrote:
> > ---disable-kde4
> > +--enable-kde4
>
> so - really I would like to avoid this.

This fix is better than nothing. Defaulting to qt3 confused many (who
rightfully think they have kde-dev installed).

I agree that auto-detection is the way to go. Enable things if the
headers/pkgs are detected, and disable it when not. Other apps output a
nice summary at the end of 'configure' as to what has been
enabled/disabled. Something like that would be more useful than the
icecream blurb that I am currently seeing every time :).

As for the concerns that René and Norbert voiced, I don't think its an
issue. Automatically disabling things when the required libs are missing
should be done anyway (as it would not build anyway). And the option to
manually --enable/--disable should not be taken away either (so builders
and Gentooers can configure in support as they want), just the defaults
would be set according to autodetect. Another Easy Hack? My auto-foo is
too limited for that task, unfortunately.

Sebastian

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

attachment0 (203 bytes) Download Attachment