cairo-mingw32.patch

   1 --- cairo-1.12.0/util/cairo-missing/cairo-missing.h.orig        2012-02-02 01:48:15.000000000 +0100
   2 +++ cairo-1.12.0/util/cairo-missing/cairo-missing.h     2012-03-25 12:56:29.970335651 +0200
   3 @@ -37,7 +37,7 @@
   4  #include <string.h>
   5  #include <sys/types.h>
   6
   7 -#ifdef _WIN32
   8 +#if defined(_WIN32) && !defined(__MINGW32__)
   9  #define WIN32_LEAN_AND_MEAN
  10  #include <windows.h>
  11
  12 --- cairo-1.14.4/boilerplate/cairo-boilerplate-win32.c.orig     2015-10-27 22:04:22.000000000 +0100
  13 +++ cairo-1.14.4/boilerplate/cairo-boilerplate-win32.c  2015-10-30 17:16:38.317127499 +0100
  14 @@ -26,6 +26,7 @@
  15
  16  #include "cairo-boilerplate-private.h"
  17
  18 +#include <limits.h>
  19  #include <cairo-win32.h>
  20
  21  static const cairo_user_data_key_t win32_closure_key;
  22 --- cairo-1.14.12/src/cairo-compiler-private.h.orig     2017-12-04 23:24:46.000000000 +0100
  23 +++ cairo-1.14.12/src/cairo-compiler-private.h  2018-09-27 21:39:54.869047194 +0200
  24 @@ -195,7 +195,7 @@
  25  #define __attribute__(x)
  26  #endif
  27
  28 -#if (defined(__WIN32__) && !defined(__WINE__)) || defined(_MSC_VER)
  29 +#if (defined(__WIN32__) && !defined(__WINE__) && !defined(__MINGW32__)) || defined(_MSC_VER)
  30  #define access _access
  31  #define fdopen _fdopen
  32  #define hypot _hypot
  33 --- cairo-1.16.0/configure.ac.orig      2018-10-21 16:21:17.304355378 +0200
  34 +++ cairo-1.16.0/configure.ac   2018-10-21 17:09:07.484322608 +0200
  35 @@ -334,7 +334,11 @@
  36           AC_CHECK_HEADER(GL/gl.h,, [use_gl="no (gl.pc nor OpenGL headers not found)"])
  37           if test "x$use_gl" = "xyes"; then
  38               gl_NONPKGCONFIG_CFLAGS=
  39 +             if test "x$have_windows" = xyes; then
  40 +                     gl_NONPKGCONFIG_LIBS="-lopengl32"
  41 +             else
  42               gl_NONPKGCONFIG_LIBS="-lGL"
  43 +             fi
  44           fi])
  45
  46    if test "x$have_dl" = "xyes" -a "x$have_dlsym" = "xyes"; then
  47 --- cairo-1.16.0/test/Makefile.am.orig  2018-08-17 03:10:53.000000000 +0200
  48 +++ cairo-1.16.0/test/Makefile.am       2018-10-21 18:46:12.054256102 +0200
  49 @@ -17,8 +17,11 @@ endif
  50  endif
  51
  52  if CAIRO_HAS_GL_SURFACE
  53 +if CAIRO_HAS_XLIB_SURFACE
  54 +# gl_surface test relies on X11/GLX
  55  test_sources += $(gl_surface_test_sources)
  56  endif
  57 +endif
  58
  59  if CAIRO_HAS_EGL_FUNCTIONS
  60  test_sources += $(egl_surface_test_sources)
  61 --- cairo-1.16.0/boilerplate/cairo-boilerplate-wgl.c.orig       2018-08-17 03:10:53.000000000 +0200
  62 +++ cairo-1.16.0/boilerplate/cairo-boilerplate-wgl.c    2018-10-21 20:14:56.554195307 +0200
  63 @@ -35,6 +35,7 @@
  64
  65  #include "cairo-boilerplate-private.h"
  66
  67 +#include <GL/gl.h>
  68  #include <cairo-gl.h>
  69
  70  static const cairo_user_data_key_t gl_closure_key;