dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug 782676: require fontconfig 2.12.4 on Windows. 

Fontconfig has a new slowness issue, this time apparently because of
locked cache files, preventing a successful cache update.
See: https://bugs.freedesktop.org/show_bug.cgi?id=99360
Furthermore the slowness apparently happens at every GIMP startup, and
also even when GIMP closes according to various reports. So let's bump
Fontconfig version (for Win32 builds only).

Also let's not make it a recommendation anymore, but a requirement. That
makes quite a few Win32-specific fontconfig bugs which have been fixed,
and most are quite serious so this should not be considered as optional
anymore, I guess.
This commit is contained in:
Jehan 2018-02-25 03:16:00 +01:00
parent 653798146e
commit 36625e087b
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
configure.ac
View File

@ -54,7 +54,7 @@ m4_define([cairo_required_version], [1.12.2])
m4_define([cairo_pdf_required_version], [1.12.2]) m4_define([cairo_pdf_required_version], [1.12.2])
m4_define([pangocairo_required_version], [1.29.4]) m4_define([pangocairo_required_version], [1.29.4])
m4_define([fontconfig_required_version], [2.2.0]) m4_define([fontconfig_required_version], [2.2.0])
m4_define([fontconfig_win32_recommended_version], [2.11.1]) m4_define([fontconfig_win32_required_version], [2.12.4])
m4_define([freetype2_required_version], [2.1.7]) m4_define([freetype2_required_version], [2.1.7])
m4_define([harfbuzz_required_version], [0.9.19]) m4_define([harfbuzz_required_version], [0.9.19])
m4_define([gtkdoc_required_version], [1.0]) m4_define([gtkdoc_required_version], [1.0])
@ -150,7 +150,7 @@ LIBMYPAINT_REQUIRED_VERSION=libmypaint_required_version
PANGOCAIRO_REQUIRED_VERSION=pangocairo_required_version PANGOCAIRO_REQUIRED_VERSION=pangocairo_required_version
BABL_REQUIRED_VERSION=babl_required_version BABL_REQUIRED_VERSION=babl_required_version
FONTCONFIG_REQUIRED_VERSION=fontconfig_required_version FONTCONFIG_REQUIRED_VERSION=fontconfig_required_version
FONTCONFIG_WIN32_RECOMMENDED_VERSION=fontconfig_win32_recommended_version FONTCONFIG_WIN32_REQUIRED_VERSION=fontconfig_win32_required_version
FREETYPE2_REQUIRED_VERSION=freetype2_required_version FREETYPE2_REQUIRED_VERSION=freetype2_required_version
HARFBUZZ_REQUIRED_VERSION=harfbuzz_required_version HARFBUZZ_REQUIRED_VERSION=harfbuzz_required_version
WEBKIT_REQUIRED_VERSION=webkit_required_version WEBKIT_REQUIRED_VERSION=webkit_required_version
@ -820,25 +820,20 @@ PKG_CHECK_MODULES(PANGOCAIRO,
gimp_save_CFLAGS=$CFLAGS gimp_save_CFLAGS=$CFLAGS
CFLAGS="$PANGOCAIRO_CFLAGS $CFLAGS" CFLAGS="$PANGOCAIRO_CFLAGS $CFLAGS"
PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= fontconfig_required_version,,
[add_deps_error([fontconfig >= fontconfig_required_version])])
# Windows platform had a few bugs fixed in earlier fontconfig. # Windows platform had a few bugs fixed in earlier fontconfig.
# Display a warning when compiling with a flawed fontconfig. # The bugs are serious enough (for instance very slow startups at each
# See bugs 708110 and 703331. # GIMP start, but also slowness when closing, broken font features,
have_recommended_fontconfig="" # etc.) that we should bump the requirement for Win32.
# See bugs 708110 (fontconfig 2.11.0), 703331 (2.11.1) and 782676
# (2.12.4).
if test "x$platform_win32" = "xyes"; then if test "x$platform_win32" = "xyes"; then
PKG_CHECK_MODULES(RECOMMENDED_WIN32_FONTCONFIG, fontconfig >= fontconfig_win32_recommended_version, PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= fontconfig_win32_required_version,,
have_recommended_fontconfig="yes", have_recommended_fontconfig="no") [add_deps_error([fontconfig >= fontconfig_win32_required_version],
[The required fontconfig version under Windows is $FONTCONFIG_WIN32_REQUIRED_VERSION or over,
if test "x$have_recommended_fontconfig" = xno; then Older versions have partially broken font processing and broken cache update.])])
have_recommended_fontconfig=" else
WARNING: Your fontconfig version is `$PKG_CONFIG --modversion fontconfig`. PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= fontconfig_required_version,,
The recommended fontconfig version under Windows is $FONTCONFIG_WIN32_RECOMMENDED_VERSION or over. [add_deps_error([fontconfig >= fontconfig_required_version])])
If you continue without updating fontconfig, your build may have partially broken font processing."
else
have_recommended_fontconfig=""
fi
fi fi
AC_MSG_CHECKING([if Pango is version 1.32.0 or newer]) AC_MSG_CHECKING([if Pango is version 1.32.0 or newer])
@ -2770,7 +2765,7 @@ Optional Modules:
Tests: Tests:
Use xvfb-run $have_xvfb_run Use xvfb-run $have_xvfb_run
Test appdata $have_appstream_util Test appdata $have_appstream_util
$have_recommended_xgettext$have_recommended_fontconfig$have_recommended_gtk$warning_vector_icons_windows$warning_glib_networking$warning_gcc" $have_recommended_xgettext$have_recommended_gtk$warning_vector_icons_windows$warning_glib_networking$warning_gcc"
if test "x$required_deps" = "x"; then if test "x$required_deps" = "x"; then
AC_OUTPUT AC_OUTPUT