From 7bf2b607f92de40fabf840e348d986509ef2c00a Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 13 Feb 2020 13:49:34 +0400 Subject: [PATCH] Return glib event loop in static builds. Regression was introduced in 3f5eaa8f0a. Fixes problem with GTK file dialog running as modal windows. Fixes #7186. --- .github/workflows/linux.yml | 3 +-- cmake | 2 +- docs/building-cmake.md | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index ef39c3a0fb..f437ba48f5 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -31,7 +31,7 @@ jobs: CMAKE_VER: "3.16.3" UPLOAD_ARTIFACT: "false" ONLY_CACHE: "false" - MANUAL_CACHING: "3" + MANUAL_CACHING: "4" DOC_PATH: "docs/building-cmake.md" steps: @@ -381,7 +381,6 @@ jobs: -system-freetype \ -fontconfig \ -no-opengl \ - -no-glib \ -no-gtk \ -static \ -openssl-linked \ diff --git a/cmake b/cmake index e86afe11f8..ba9eb09bc0 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit e86afe11f8a9d7fa5f137e3b90bad32366fbc916 +Subproject commit ba9eb09bc03ecb2b3c64ea1aa35ba534c8d3d5fe diff --git a/docs/building-cmake.md b/docs/building-cmake.md index d5ba75cd4b..aed14aff0f 100644 --- a/docs/building-cmake.md +++ b/docs/building-cmake.md @@ -256,7 +256,6 @@ Go to ***BuildPath*** and run -system-freetype \ -fontconfig \ -no-opengl \ - -no-glib \ -no-gtk \ -static \ -openssl-linked \