[gnome-build-meta/jjardon/wayland_only: 51/62] elements/sdk/gtk+-3.bst: Add patch to fix compilation on wayland



commit d82d333d58711aaf3c50225511cebfd6bfce9219
Author: Javier Jardón <jjardon gnome org>
Date:   Sat Nov 23 23:45:55 2019 +0900

    elements/sdk/gtk+-3.bst: Add patch to fix compilation on wayland

 elements/sdk/gtk+-3.bst                            |  2 ++
 ...gtkstatusicon.c-Add-a-case-for-others-way.patch | 38 ++++++++++++++++++++++
 2 files changed, 40 insertions(+)
---
diff --git a/elements/sdk/gtk+-3.bst b/elements/sdk/gtk+-3.bst
index 95c965db..f4f5e07e 100644
--- a/elements/sdk/gtk+-3.bst
+++ b/elements/sdk/gtk+-3.bst
@@ -3,6 +3,8 @@ sources:
 - kind: git_tag
   url: gitlab_gnome_org:GNOME/gtk.git
   track: gtk-3-24
+- kind: patch
+  path: files/gtk/0001-deprecated-gtkstatusicon.c-Add-a-case-for-others-way.patch
 build-depends:
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/files/gtk/0001-deprecated-gtkstatusicon.c-Add-a-case-for-others-way.patch 
b/files/gtk/0001-deprecated-gtkstatusicon.c-Add-a-case-for-others-way.patch
new file mode 100644
index 00000000..4bcee2af
--- /dev/null
+++ b/files/gtk/0001-deprecated-gtkstatusicon.c-Add-a-case-for-others-way.patch
@@ -0,0 +1,38 @@
+From c6792a41ab00086ac6f13b06075d8b4d08ba5cf9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon gnome org>
+Date: Sat, 23 Nov 2019 23:43:32 +0900
+Subject: [PATCH] deprecated/gtkstatusicon.c: Fix compilation in wayland
+
+Without this compilation in a wayland-only system fails
+---
+ gtk/deprecated/gtkstatusicon.c | 11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/gtk/deprecated/gtkstatusicon.c b/gtk/deprecated/gtkstatusicon.c
+index 0c9dae62e6..52239b11cc 100644
+--- a/gtk/deprecated/gtkstatusicon.c
++++ b/gtk/deprecated/gtkstatusicon.c
+@@ -2272,18 +2272,11 @@ gtk_status_icon_is_embedded (GtkStatusIcon *status_icon)
+   g_return_val_if_fail (GTK_IS_STATUS_ICON (status_icon), FALSE);
+ 
+ #ifdef GDK_WINDOWING_X11
+-  if (status_icon->priv->tray_icon &&
+-      gtk_plug_get_embedded (GTK_PLUG (status_icon->priv->tray_icon)))
+-    return TRUE;
+-  else
++  if (status_icon->priv->tray_icon == NULL ||
++      !gtk_plug_get_embedded (GTK_PLUG (status_icon->priv->tray_icon)))
+     return FALSE;
+ #endif
+-#ifdef GDK_WINDOWING_WIN32
+   return TRUE;
+-#endif
+-#ifdef GDK_WINDOWING_QUARTZ
+-  return TRUE;
+-#endif
+ }
+ 
+ /**
+-- 
+2.23.0
+


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]