diff --git a/build/windows/jhbuild/build.jhbuildrc b/build/windows/jhbuild/build.jhbuildrc index cfc9ff7d99..bd51fe13ab 100644 --- a/build/windows/jhbuild/build.jhbuildrc +++ b/build/windows/jhbuild/build.jhbuildrc @@ -142,8 +142,7 @@ module_autogenargs['cairo'] = autogenargs + """ --enable-xlib=no \ --enable-xcb=no \ --enable-xcb-shm=no \ --enable-pthread=no \ - --enable-win32-font=yes \ - --disable-lto""" + --enable-win32-font=yes""" module_autogenargs['pixman'] = autogenargs + """ --enable-gtk=no""" @@ -238,6 +237,8 @@ module_extra_env.update ( {'PREFIX': prefix}, 'freetype2': {'LIBPNG_CFLAGS': ' ', 'LIBPNG_LDFLAGS': '-lpng'}, + 'cairo': + {'ax_cv_c_float_words_bigendian': 'no'}, # Ensure that gimp doesn't get the host machine's freetype-config 'gimp-dev': diff --git a/build/windows/jhbuild/gtk+.moduleset b/build/windows/jhbuild/gtk+.moduleset index 5616aa4536..a9fb10543c 100644 --- a/build/windows/jhbuild/gtk+.moduleset +++ b/build/windows/jhbuild/gtk+.moduleset @@ -20,11 +20,9 @@ href="http://download.icu-project.org/files/" /> - - - + diff --git a/build/windows/jhbuild/patches/cairo-disable-lto.patch b/build/windows/jhbuild/patches/cairo-disable-lto.patch deleted file mode 100644 index 3cf36f20b9..0000000000 --- a/build/windows/jhbuild/patches/cairo-disable-lto.patch +++ /dev/null @@ -1,51 +0,0 @@ -From c3645d97ebd24c6f7ad850785d585aebc706a11c Mon Sep 17 00:00:00 2001 -From: Bryce Harrington -Date: Tue, 08 Jul 2014 20:14:20 +0000 -Subject: configure.ac: Add a --disable-lto configure option - -Link-Time Optimization seems to be stable enough with gcc 4.8 and 4.9, -but has proven to be an issue in the past for many cairo users (webkit, -efl, ubuntu, opensuse, gentoo, arch...) who carry patches to disable it. - -Gentoo's patch[1] adds a --disable-lto option to leave it enabled by -default but give users the ability to work around lto related build -problems (c.f. fdo #77060). Patch appears to have been authored by -Alexandre Rostovtsev[2]. - -1: sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/cairo/files/cairo-1.12.16-lto-optional.patch -2: https://bugs.gentoo.org/show_bug.cgi?id=509552 - -Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=60852 -Signed-off-by: Bryce Harrington -Reviewed-by: Uli Schlachter ---- -diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings -index f984eb2..a72d948 100644 ---- a/build/configure.ac.warnings -+++ b/build/configure.ac.warnings -@@ -38,13 +38,18 @@ dnl options. Namely, the following: - - dnl -flto working really needs a test link, not just a compile - --safe_MAYBE_WARN="$MAYBE_WARN" --MAYBE_WARN="$MAYBE_WARN -flto" --AC_TRY_LINK([],[ -+AC_ARG_ENABLE(lto, -+ AS_HELP_STRING([--disable-lto], -+ [Do not try to use Link-Time Optimization])) -+if test "x$enable_lto" != "xno"; then -+ safe_MAYBE_WARN="$MAYBE_WARN" -+ MAYBE_WARN="$MAYBE_WARN -flto" -+ AC_TRY_LINK([],[ - int main(int argc, char **argv) { return 0; } --],[],[ -+ ],[],[ - MAYBE_WARN="$safe_MAYBE_WARN" --]) -+ ]) -+fi - - MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common" - --- -cgit v0.9.0.2-2-gbebe