| Message ID | 20180409082323.29575-1-peterx@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | configure: don't warn GTK if disabled | expand |
On Mon, Apr 09, 2018 at 04:23:23PM +0800, Peter Xu wrote: > We don't need to detect GTK ABI if GTK is disabled in general. > Otherwise we could get this warning (when host is installed with GTK ABI > version 2) even when configure with "--disable-gtk": > > WARNING: Use of GTK 2.0 is deprecated and will be removed in > WARNING: future releases. Please switch to using GTK 3.0 > > CC: Paolo Bonzini <pbonzini@redhat.com> > CC: Gerd Hoffmann <kraxel@redhat.com> > CC: Peter Maydell <peter.maydell@linaro.org> > CC: Fam Zheng <famz@redhat.com> > CC: "Philippe Mathieu-Daudé" <f4bug@amsat.org> > Signed-off-by: Peter Xu <peterx@redhat.com> > --- > configure | 23 +++++++++++------------ > 1 file changed, 11 insertions(+), 12 deletions(-) > > diff --git a/configure b/configure > index 4d0e92c96c..ce67ad050e 100755 > --- a/configure > +++ b/configure > @@ -2537,19 +2537,18 @@ fi > ########################################## > # GTK probe > > -if test "$gtkabi" = ""; then > - # The GTK ABI was not specified explicitly, so try whether 3.0 is available. > - # Use 2.0 as a fallback if that is available. > - if $pkg_config --exists "gtk+-3.0 >= 3.0.0"; then > - gtkabi=3.0 > - elif $pkg_config --exists "gtk+-2.0 >= 2.18.0"; then > - gtkabi=2.0 > - else > - gtkabi=3.0 > - fi > -fi > - > if test "$gtk" != "no"; then > + if test "$gtkabi" = ""; then > + # The GTK ABI was not specified explicitly, so try whether 3.0 is available. > + # Use 2.0 as a fallback if that is available. > + if $pkg_config --exists "gtk+-3.0 >= 3.0.0"; then > + gtkabi=3.0 > + elif $pkg_config --exists "gtk+-2.0 >= 2.18.0"; then > + gtkabi=2.0 > + else > + gtkabi=3.0 > + fi > + fi Feels to me that since we've deprecated 2.0, we could just *never* auto detect - just do test -z "$gtkabi" && gtkabi=3.0 Anyone who wants gtk2 should have to use an explicit --with-gtkabi=2.0 > gtkpackage="gtk+-$gtkabi" > gtkx11package="gtk+-x11-$gtkabi" > if test "$gtkabi" = "3.0" ; then BTW, this same problem you're fixing exists for SDL too I expect Regards, Daniel
On 9 April 2018 at 09:31, Daniel P. Berrangé <berrange@redhat.com> wrote: > Feels to me that since we've deprecated 2.0, we could just *never* auto > detect - just do test -z "$gtkabi" && gtkabi=3.0 > > Anyone who wants gtk2 should have to use an explicit --with-gtkabi=2.0 I think if we still work with gtk2 then we should go ahead and warn-but-use it. thanks -- PMM
On 09/04/2018 11:24, Peter Maydell wrote: > On 9 April 2018 at 09:31, Daniel P. Berrangé <berrange@redhat.com> wrote: >> Feels to me that since we've deprecated 2.0, we could just *never* auto >> detect - just do test -z "$gtkabi" && gtkabi=3.0 >> >> Anyone who wants gtk2 should have to use an explicit --with-gtkabi=2.0 > > I think if we still work with gtk2 then we should go ahead and > warn-but-use it. Both are valid choices of course. Since we have Peter (Xu)'s patch, I think we should go for that and revisit in 2.13 whether to remove GTK+ 2.0 support altogether, require an explicit configure argument, or leave things as they are. Paolo
On Mon, Apr 09, 2018 at 07:37:11PM +0200, Paolo Bonzini wrote: > On 09/04/2018 11:24, Peter Maydell wrote: > > On 9 April 2018 at 09:31, Daniel P. Berrangé <berrange@redhat.com> wrote: > >> Feels to me that since we've deprecated 2.0, we could just *never* auto > >> detect - just do test -z "$gtkabi" && gtkabi=3.0 > >> > >> Anyone who wants gtk2 should have to use an explicit --with-gtkabi=2.0 > > > > I think if we still work with gtk2 then we should go ahead and > > warn-but-use it. > > Both are valid choices of course. Since we have Peter (Xu)'s patch, I > think we should go for that and revisit in 2.13 whether to remove GTK+ > 2.0 support altogether, require an explicit configure argument, or leave > things as they are. Thanks all. Please anyone let me know if a repost is needed. Otherwise I'll keep it as is and I can try to post a similar one for SDL.
On Mon, Apr 09, 2018 at 04:23:23PM +0800, Peter Xu wrote: > We don't need to detect GTK ABI if GTK is disabled in general. > Otherwise we could get this warning (when host is installed with GTK ABI > version 2) even when configure with "--disable-gtk": > > WARNING: Use of GTK 2.0 is deprecated and will be removed in > WARNING: future releases. Please switch to using GTK 3.0 > > CC: Paolo Bonzini <pbonzini@redhat.com> > CC: Gerd Hoffmann <kraxel@redhat.com> > CC: Peter Maydell <peter.maydell@linaro.org> > CC: Fam Zheng <famz@redhat.com> > CC: "Philippe Mathieu-Daudé" <f4bug@amsat.org> > Signed-off-by: Peter Xu <peterx@redhat.com> > --- Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel
diff --git a/configure b/configure index 4d0e92c96c..ce67ad050e 100755 --- a/configure +++ b/configure @@ -2537,19 +2537,18 @@ fi ########################################## # GTK probe -if test "$gtkabi" = ""; then - # The GTK ABI was not specified explicitly, so try whether 3.0 is available. - # Use 2.0 as a fallback if that is available. - if $pkg_config --exists "gtk+-3.0 >= 3.0.0"; then - gtkabi=3.0 - elif $pkg_config --exists "gtk+-2.0 >= 2.18.0"; then - gtkabi=2.0 - else - gtkabi=3.0 - fi -fi - if test "$gtk" != "no"; then + if test "$gtkabi" = ""; then + # The GTK ABI was not specified explicitly, so try whether 3.0 is available. + # Use 2.0 as a fallback if that is available. + if $pkg_config --exists "gtk+-3.0 >= 3.0.0"; then + gtkabi=3.0 + elif $pkg_config --exists "gtk+-2.0 >= 2.18.0"; then + gtkabi=2.0 + else + gtkabi=3.0 + fi + fi gtkpackage="gtk+-$gtkabi" gtkx11package="gtk+-x11-$gtkabi" if test "$gtkabi" = "3.0" ; then
We don't need to detect GTK ABI if GTK is disabled in general. Otherwise we could get this warning (when host is installed with GTK ABI version 2) even when configure with "--disable-gtk": WARNING: Use of GTK 2.0 is deprecated and will be removed in WARNING: future releases. Please switch to using GTK 3.0 CC: Paolo Bonzini <pbonzini@redhat.com> CC: Gerd Hoffmann <kraxel@redhat.com> CC: Peter Maydell <peter.maydell@linaro.org> CC: Fam Zheng <famz@redhat.com> CC: "Philippe Mathieu-Daudé" <f4bug@amsat.org> Signed-off-by: Peter Xu <peterx@redhat.com> --- configure | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)