[Libreoffice-commits] core.git: vcl/unx

[Stephan Bergmann (via logerrit)]

 vcl/unx/generic/fontmanager/fontconfig.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 25ba5f75a273540ce5e21fc0f14ea1a7b997888d
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Jun 18 14:45:19 2021 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Jun 18 22:13:12 2021 +0200

    Workaround only for GCC 10
    
    Change-Id: I7425dfd674149b33e069bf20c1ff6a4ca622db20
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117453
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Jenkins

diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 184f000c0a43..8194aef619d2 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -17,8 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if defined __GNUC__ && !defined __clang_ && __GNUC__ >= 10
-// gcc 10.2.0 gets unhappy about one of the OString inside PrintFont at line 656
+#if defined __GNUC__ && !defined __clang_ && __GNUC__ == 10
+// gcc 10.2.0 gets unhappy about one of the OString inside PrintFont at line 656 (while at least a
+// recent GCC 12 trunk is happy);
 // I have to turn it off here because the warning actually occurs inside rtl::OString
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif