diff mbox series

[kirkstone,05/19] gtk+3: add PACKAGECONFIG for libcloudservice and tracker; fix cups backend

Message ID b39886c6d1d39e893e639a60e368249ffc95941f.1762157680.git.joerg.sommer@navimatix.de
State New
Headers show
Series [kirkstone,01/19] gtk+3: upgrade 3.24.34 -> 3.24.35 | expand

Commit Message

Jörg Sommer Nov. 3, 2025, 8:21 a.m. UTC
From: Markus Volk <f_l_k@t-online.de>

Add options to enable support for libcloudprovider and tracker

If the cups backend is enabled, the mandatory file backend gets disabled and
thus configure fails. Fix it by not defining the print-backend and just include cups
as a dependency. Additionally add it as a runtime dependency.

Now, if cups gets enabled, it should include the following print-backends
by default: cups,lpr,file

(From OE-Core rev: 5ac88d032968f4d005a61fc34f7e3e6e55426ccd)

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Cherry-pick-of: 2725d99b79b4caa9b301d206a2b1a7851d2b74cc
Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
---
 meta/recipes-gnome/gtk+/gtk+3.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Gyorgy Sarvari Nov. 3, 2025, 10:29 a.m. UTC | #1
Note that libcloudproviders doesn't exist in Kirkstone meta-oe.

I guess it's a matter of taste, but in general I think changing
packageconfigs in a stable branch can be dicey.
(I get that these are cherry-picks, but maybe adding custom patches to
update would be less invasive)

On 11/3/25 09:21, Jörg Sommer via lists.openembedded.org wrote:
> From: Markus Volk <f_l_k@t-online.de>
>
> Add options to enable support for libcloudprovider and tracker
>
> If the cups backend is enabled, the mandatory file backend gets disabled and
> thus configure fails. Fix it by not defining the print-backend and just include cups
> as a dependency. Additionally add it as a runtime dependency.
>
> Now, if cups gets enabled, it should include the following print-backends
> by default: cups,lpr,file
>
> (From OE-Core rev: 5ac88d032968f4d005a61fc34f7e3e6e55426ccd)
>
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> Cherry-pick-of: 2725d99b79b4caa9b301d206a2b1a7851d2b74cc
> Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
> ---
>  meta/recipes-gnome/gtk+/gtk+3.inc | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
> index 1d726b5696..8d01e6077f 100644
> --- a/meta/recipes-gnome/gtk+/gtk+3.inc
> +++ b/meta/recipes-gnome/gtk+/gtk+3.inc
> @@ -41,8 +41,10 @@ PACKAGECONFIG[x11] = "-Dx11_backend=true,-Dx11_backend=false,at-spi2-atk fontcon
>  # this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build
>  PACKAGECONFIG[opengl] = "-Dopengl=true,-Dopengl=false,libepoxy"
>  PACKAGECONFIG[wayland] = "-Dwayland_backend=true,-Dwayland_backend=false,wayland wayland-protocols libxkbcommon virtual/egl virtual/libgles2 wayland-native"
> -PACKAGECONFIG[cups] = "-Dprint_backends=cups,-Dprint_backends=file,cups"
> +PACKAGECONFIG[cups] = ",,cups,cups"
>  PACKAGECONFIG[colord] = "-Dcolord=yes,-Dcolord=no,colord"
> +PACKAGECONFIG[cloudproviders] = "-Dcloudproviders=true,-Dcloudproviders=false,libcloudproviders"
> +PACKAGECONFIG[tracker3] = "-Dtracker3=true,-Dtracker3=false,tracker,tracker-miners"
>  
>  prepare_gtk_scripts() {
>      mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-3.0
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#225619): https://lists.openembedded.org/g/openembedded-core/message/225619
> Mute This Topic: https://lists.openembedded.org/mt/116094469/6084445
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [skandigraun@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
index 1d726b5696..8d01e6077f 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -41,8 +41,10 @@  PACKAGECONFIG[x11] = "-Dx11_backend=true,-Dx11_backend=false,at-spi2-atk fontcon
 # this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build
 PACKAGECONFIG[opengl] = "-Dopengl=true,-Dopengl=false,libepoxy"
 PACKAGECONFIG[wayland] = "-Dwayland_backend=true,-Dwayland_backend=false,wayland wayland-protocols libxkbcommon virtual/egl virtual/libgles2 wayland-native"
-PACKAGECONFIG[cups] = "-Dprint_backends=cups,-Dprint_backends=file,cups"
+PACKAGECONFIG[cups] = ",,cups,cups"
 PACKAGECONFIG[colord] = "-Dcolord=yes,-Dcolord=no,colord"
+PACKAGECONFIG[cloudproviders] = "-Dcloudproviders=true,-Dcloudproviders=false,libcloudproviders"
+PACKAGECONFIG[tracker3] = "-Dtracker3=true,-Dtracker3=false,tracker,tracker-miners"
 
 prepare_gtk_scripts() {
     mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-3.0