f41
David Tardon 10 years ago
parent d7ff6f0c1d
commit 10328e0b6b

@ -0,0 +1,30 @@
From 63c29ff0adfc3893adf8bcb8934720312aaf11e8 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Mon, 20 Jul 2015 10:55:59 +0200
Subject: [PATCH] fix linux buildbot
the GTK3 version check for the GDK_IS_X11_DISPLAY macro
does not appear to work well on all the machines
Change-Id: I7020afdca1b270f89910753737c2c70b61453b34
---
vcl/unx/gtk/window/gtksalframe.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 2abc94f..2cb31bc 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -105,8 +105,8 @@
#define IS_WIDGET_MAPPED GTK_WIDGET_MAPPED
#endif
-#if !GTK_CHECK_VERSION(3,10,0)
#define GDK_WINDOWING_X11
+#ifndef GDK_IS_X11_DISPLAY
#define GDK_IS_X11_DISPLAY(foo) (true)
#endif
--
2.1.0

@ -0,0 +1,31 @@
From d9b2105e14b7f84c24ced4faea1795e32d8e21d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Fri, 17 Jul 2015 13:51:16 +0100
Subject: [PATCH] wayland: actually show something
Change-Id: Icd081c38de1374c6bfd6fb04d7765e07ff5d1aff
---
vcl/unx/gtk/app/gtkdata.cxx | 2 +-
vcl/unx/gtk/window/gtksalframe.cxx | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 3bedf78..bdb360a 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -105,6 +105,12 @@
#define IS_WIDGET_MAPPED GTK_WIDGET_MAPPED
#endif
+#if !GTK_CHECK_VERSION(3,10,0)
+#define GDK_WINDOWING_X11
+#define GDK_IS_X11_DISPLAY(foo) (true)
+#endif
+
+
using namespace com::sun::star;
int GtkSalFrame::m_nFloats = 0;
--
2.1.0

@ -329,7 +329,9 @@ Patch19: 0001-rhbz-1233420-handle-inexistent-cond.-format.patch
Patch20: 0001-allow-slide-design-to-affect-multiple-standard-pages.patch
Patch21: 0001-implement-equalize-width-and-height-for-impress-draw.patch
Patch22: 0001-f22-openjdk-for-ppc64le-has-both-these-dirs-but-jawt.patch
Patch25: 0001-gtk3-draw-paint-to-the-fixed-container.patch
Patch23: 0001-gtk3-draw-paint-to-the-fixed-container.patch
Patch24: 0001-wayland-actually-show-something.patch
Patch25: 0001-fix-linux-buildbot.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice

Loading…
Cancel
Save