From fe1dfc20fba9bf9fcc7056129439fe85108cda77 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Oct 15 2019 14:38:45 +0000 Subject: more checks for tdf#124729 --- diff --git a/0001-Related-tdf-124729-check-for-gtk_gl_area_get_error-b.patch b/0001-Related-tdf-124729-check-for-gtk_gl_area_get_error-b.patch new file mode 100644 index 0000000..bc924b7 --- /dev/null +++ b/0001-Related-tdf-124729-check-for-gtk_gl_area_get_error-b.patch @@ -0,0 +1,29 @@ +From 713d7f9139e17ba7eafe42b7447272d9f2baf26b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Tue, 15 Oct 2019 14:06:51 +0100 +Subject: [PATCH] Related: tdf#124729 check for gtk_gl_area_get_error before + continuing + +Change-Id: Ib87f32c2fa8c561981920ea688ea723c8e59bead +--- + vcl/unx/gtk3/gtk3gtkinst.cxx | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx +index b8ceadda4e0c..f1de1bbfbacb 100644 +--- a/vcl/unx/gtk3/gtk3gtkinst.cxx ++++ b/vcl/unx/gtk3/gtk3gtkinst.cxx +@@ -1475,6 +1475,10 @@ private: + gtk_widget_show_all(pParent); + + gtk_gl_area_make_current(GTK_GL_AREA(m_pGLArea)); ++ ++ if (gtk_gl_area_get_error(GTK_GL_AREA(m_pGLArea))) ++ return false; ++ + gtk_gl_area_attach_buffers(GTK_GL_AREA(m_pGLArea)); + glGenFramebuffersEXT(1, &m_nAreaFrameBuffer); + +-- +2.20.1 + diff --git a/libreoffice.spec b/libreoffice.spec index d939ea3..015f1ef 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -245,6 +245,7 @@ Patch1: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch Patch2: 0001-rhbz-1690732-basic-font-variation-support.patch Patch3: 0001-tdf-128138-sw_redlinehide-fix-infinite-loop-in-FindA.patch Patch4: 0001-Related-tdf-124729-check-error-status-before-continu.patch +Patch5: 0001-Related-tdf-124729-check-for-gtk_gl_area_get_error-b.patch %if 0%{?rhel} # not upstreamed @@ -2139,7 +2140,7 @@ done %{_includedir}/LibreOfficeKit %changelog -* Mon Oct 14 2019 Caolán McNamara - 1:6.2.8.2-2 +* Tue Oct 15 2019 Caolán McNamara - 1:6.2.8.2-2 - rhbz#1761199 infinite loop in attributes search - tdf#124729 check error status before continuing