Re: [Buildroot] [PATCH 1/1] package/libgtk3: Remove atk-bridge from .pc file

From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Stefan Ott <stefan@ott.net>, Adrian Perez de Castro <aperez@igalia.com>
Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>, buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 1/1] package/libgtk3: Remove atk-bridge from .pc file
Date: Sat, 15 Apr 2023 17:16:33 +0200	[thread overview]
Message-ID: <20230415151633.GM2819@scaer> (raw)
In-Reply-To: <20230412222640.109345-1-stefan@ott.net>

Stefan, All,

Adrián, question below also for you. ;-)

On 2023-04-13 00:26 +0200, Stefan Ott via buildroot spake thusly:
> The dependency is supposed to be optional but it always ends up in the
> .pc file. This leads to issues when building packages that depend on
> libgtk3 and are unable to find atk-bridge:
> 
> > output/build/gcr-3.40.0/meson.build:57:2: ERROR: Dependency lookup for gtk+-3.0 with method 'pkgconfig' failed: Could not generate cargs for gtk+-3.0:
> > Package atk-bridge-2.0 was not found in the pkg-config search path.
> > Perhaps you should add the directory containing `atk-bridge-2.0.pc'
> > to the PKG_CONFIG_PATH environment variable
> > Package 'atk-bridge-2.0', required by 'gtk+-3.0', not found
> 
> This change modifies the original patch so that the dependency is only
> added to the .pc file if atk-bridge is present.
> 
> Signed-off-by: Stefan Ott <stefan@ott.net>
> ---
>  package/libgtk3/0001-disable-atk-bridge.patch | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/package/libgtk3/0001-disable-atk-bridge.patch b/package/libgtk3/0001-disable-atk-bridge.patch
> index f3e9bff2ba..8127b97253 100644
> --- a/package/libgtk3/0001-disable-atk-bridge.patch
> +++ b/package/libgtk3/0001-disable-atk-bridge.patch

Since you are modifying that patch, you need to add your SoB line to it
too, something along the lines of:

    Signed-off-by: Hadrien Boutteville <hadrien.boutteville@gmail.com>
    [stefan@ott.net: conditionally add it to .pc]
    Signed-off-by: You

I can't add a sob on your behalf, so could you please respin?

To be noted, but that is totally orthogonal to this patch of yours: the
commit log for the patch mentions that atk-bridge requires at-spi2-core
and at-spi2-atk, which were not packaged in Buildroot back in the time.

However, we now have both. So: should we drop this patch, and add the
dependency onto at-spi2-atk (and thus at-spi2-core), now?

Regards,
Yann E. MORIN.

> @@ -39,3 +39,14 @@ Signed-off-by: Hadrien Boutteville <hadrien.boutteville@gmail.com>
>   
>     backend_immodules += ['xim']
>   
> +@@ -588,7 +588,9 @@
> +     x11_pkgs += ['xdamage']
> +   endif
> +
> +-  atk_pkgs += ['atk-bridge-2.0']
> ++  if atkbridge_dep.found()
> ++    atk_pkgs += ['atk-bridge-2.0']
> ++  endif
> +
> +   cdata.set('HAVE_XDAMAGE', xdamage_dep.found() ? 1 : false)
> +   cdata.set('HAVE_XCURSOR', xcursor_dep.found() ? 1 : false)
> -- 
> 2.40.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot