[Win32] Update some of the libraries to more recent versions

2015-07-12 20:02:09 +02:00
parent ead7b0b20f
commit 0f9663749b
11 changed files with 1027 additions and 1520 deletions
--- a/win32/Makefile
+++ b/win32/Makefile
@ -30,7 +30,7 @@ evo: evolution
 ews: evolution-ews
 rss: evolution-rss

-dependencies: core-tools zlib fake-gtk-doc gnome-common dbus glib gtk librsvg2 icon-themes gsettings-desktop-schemas shared-mime-info libsoup nss liboauth libgdata libgweather openldap libical iso-codes enchant gtkspell gcr webkitgtk gtkhtml
+dependencies: core-tools zlib fake-gtk-doc gnome-common dbus glib gtk librsvg2 icon-themes gsettings-desktop-schemas shared-mime-info libsoup nss liboauth libgdata libgweather openldap libical iso-codes enchant gtkspell gcr webkitgtk
 addons: evolution-ews evolution-rss
 evolution-data-server: dependencies evolution-data-server$(EVO_BUILD_SUFFIX)
 evolution: evolution$(EVO_BUILD_SUFFIX)
@ -67,7 +67,7 @@ $(BUILD_ROOT_EVO)/lib/pkgconfig/evolution-shell-3.0.pc:
 	@if test ! -f "../../evolution/gtk-doc.make" ; then \
 		cp "patches/gtk-doc.make" "../../evolution/"; \
 	fi
-	@./build acmmi "$(BUILD_ROOT_EVO)" ../../../evolution "" "--enable-plugins=all --enable-weather --disable-canberra --disable-contact-maps --disable-goa --disable-libcryptui --disable-bogofilter --disable-spamassassin --disable-text-highlight --disable-pst-import --disable-gnome-desktop --disable-autoar --without-clutter --without-help $(DISABLE_GTK_DOC)" $(VERBOSE)
+	@./build acmmi "$(BUILD_ROOT_EVO)" ../../../evolution "" "--enable-plugins=all --enable-weather --disable-canberra --disable-contact-maps --disable-goa --disable-libcryptui --without-bogofilter --without-spamassassin --disable-text-highlight --disable-pst-import --disable-gnome-desktop --disable-autoar --without-clutter --without-help $(DISABLE_GTK_DOC)" $(VERBOSE)

 evolution-ews-master: env evolution-master $(BUILD_ROOT_EVO)/lib/evolution-data-server/libeews-1.2.dll.a

@ -80,7 +80,6 @@ $(BUILD_ROOT_EVO)/lib/evolution-data-server/libeews-1.2.dll.a:
 		cp "patches/gtk-doc.make" "../../evolution-ews/"; \
 	fi
 	@./build acmmi "$(BUILD_ROOT_EVO)" ../../../evolution-ews "" "--with-internal-lzx" $(VERBOSE)
-	@mv $(BUILD_ROOT_EVO)/lib/bin/* $(BUILD_ROOT_EVO)/bin/

 evolution-rss-master: env evolution-master $(BUILD_ROOT_EVO)/share/glib-2.0/schemas/org.gnome.evolution.plugin.evolution-rss.gschema.xml

@ -97,8 +96,8 @@ $(BUILD_ROOT_EVO)/share/glib-2.0/schemas/org.gnome.evolution.plugin.evolution-rs
 gcr: env gtk dbus $(BUILD_ROOT_DEPS)/lib/pkgconfig/gcr-3.pc

 $(BUILD_ROOT_DEPS)/lib/pkgconfig/gcr-3.pc:
-	@./get-src https://download.gnome.org/sources/gcr/3.10 gcr-3.10.1.tar.xz
-	@./build acmmi "$(BUILD_ROOT_DEPS)" gcr-3.10.1 "gcr.patch" "$(DISABLE_GTK_DOC)" $(VERBOSE)
+	@./get-src https://download.gnome.org/sources/gcr/3.16 gcr-3.16.0.tar.xz
+	@./build acmmi "$(BUILD_ROOT_DEPS)" gcr-3.16.0 "gcr.patch" "$(DISABLE_GTK_DOC)" $(VERBOSE)

 shared-mime-info: env $(BUILD_ROOT_DEPS)/share/pkgconfig/shared-mime-info.pc

@ -109,14 +108,14 @@ $(BUILD_ROOT_DEPS)/share/pkgconfig/shared-mime-info.pc:
 glib: env zlib libxml2 libffi fake-gtk-doc $(BUILD_ROOT_DEPS)/lib/pkgconfig/glib-2.0.pc

 $(BUILD_ROOT_DEPS)/lib/pkgconfig/glib-2.0.pc:
-	@./get-src https://download.gnome.org/sources/glib/2.40 glib-2.40.0.tar.xz
-	@./build cmmi "$(BUILD_ROOT_DEPS)" glib-2.40.0 "" "--disable-static" $(VERBOSE)
+	@./get-src https://download.gnome.org/sources/glib/2.44 glib-2.44.1.tar.xz
+	@./build cmmi "$(BUILD_ROOT_DEPS)" glib-2.44.1 "" "--disable-static" $(VERBOSE)

 glib-networking: env glib gnutls $(BUILD_ROOT_DEPS)/lib/gio/modules/libgiognutls.la

 $(BUILD_ROOT_DEPS)/lib/gio/modules/libgiognutls.la:
-	@./get-src https://download.gnome.org/sources/glib-networking/2.40 glib-networking-2.40.1.tar.xz
-	@./build cmmi "$(BUILD_ROOT_DEPS)" glib-networking-2.40.1 "" "--without-ca-certificates" $(VERBOSE)
+	@./get-src https://download.gnome.org/sources/glib-networking/2.44 glib-networking-2.44.0.tar.xz
+	@./build cmmi "$(BUILD_ROOT_DEPS)" glib-networking-2.44.0 "" "--without-ca-certificates" $(VERBOSE)

 libmspack: env $(BUILD_ROOT_DEPS)/lib/pkgconfig/libmspack.pc

@ -127,16 +126,16 @@ $(BUILD_ROOT_DEPS)/lib/pkgconfig/libmspack.pc:
 libsoup: env glib-networking sqlite $(BUILD_ROOT_DEPS)/lib/pkgconfig/libsoup-2.4.pc

 $(BUILD_ROOT_DEPS)/lib/pkgconfig/libsoup-2.4.pc:
-	@./get-src https://download.gnome.org/sources/libsoup/2.44 libsoup-2.44.2.tar.xz
-	@./build cmmi "$(BUILD_ROOT_DEPS)" libsoup-2.44.2 "" "--disable-tls-check $(DISABLE_GTK_DOC)" $(VERBOSE)
+	@./get-src https://download.gnome.org/sources/libsoup/2.50 libsoup-2.50.0.tar.xz
+	@./build cmmi "$(BUILD_ROOT_DEPS)" libsoup-2.50.0 "" "--disable-tls-check $(DISABLE_GTK_DOC)" $(VERBOSE)

 libical: env tzdata cmake $(BUILD_ROOT_DEPS)/lib/pkgconfig/libical.pc

 $(BUILD_ROOT_DEPS)/lib/pkgconfig/libical.pc:
-	@./get-src "http://downloads.sourceforge.net/project/freeassociation/libical/libical-1.0/libical-1.0.tar.gz?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Ffreeassociation%2Ffiles%2Flibical%2Flibical-1.0%2F&ts=1395872482&use_mirror=cznic" "0" libical-1.0.tar.gz
-	@cd src/libical-1.0 && \
+	@./get-src "https://github.com/libical/libical/archive/v1.0.1/libical-1.0.1.tar.gz" "0" libical-1.0.1.tar.gz || (mv downloads/v1.0.1 downloads/libical-1.0.1.tar.gz && (tar -xf downloads/libical-1.0.1.tar.gz --directory=src/ || echo "Error ignored."))
+	@cd src/libical-1.0.1 && \
 	cmake -G "MSYS Makefiles" -DCMAKE_PREFIX_PATH=$(BUILD_ROOT_DEPS) -DCMAKE_INSTALL_PREFIX=$(BUILD_ROOT_DEPS) .
-	@./build mmi "$(BUILD_ROOT_DEPS)" libical-1.0 "libical.patch" "" $(VERBOSE)
+	@./build mmi "$(BUILD_ROOT_DEPS)" libical-1.0.1 "libical.patch" "" $(VERBOSE)

 libgweather: env libsoup tzdata $(BUILD_ROOT_DEPS)/lib/pkgconfig/gweather-3.0.pc

@ -197,8 +196,8 @@ $(BUILD_ROOT_DEPS)/bin/nsinstall.exe:
 gnutls: env zlib gmp nettle p11-kit $(BUILD_ROOT_DEPS)/lib/pkgconfig/gnutls.pc

 $(BUILD_ROOT_DEPS)/lib/pkgconfig/gnutls.pc:
-	@./get-src ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2 gnutls-3.2.12.1.tar.xz "" "" "gnutls-3.2.12"
-	@./build cmmi "$(BUILD_ROOT_DEPS)" gnutls-3.2.12 "@gnutls.patch" "--disable-guile --disable-doc --disable-libdane --disable-crywrap" $(VERBOSE)
+	@./get-src ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4 gnutls-3.4.2.tar.xz "" "" "gnutls-3.4.2"
+	@./build cmmi "$(BUILD_ROOT_DEPS)" gnutls-3.4.2 "@gnutls.patch" "--disable-guile --disable-doc --disable-libdane --disable-crywrap" $(VERBOSE)

 gnupg: env gnutls pth libassuan libksba $(BUILD_ROOT_DEPS)/bin/gpg2.exe

@ -245,8 +244,8 @@ $(BUILD_ROOT_DEPS)/lib/pkgconfig/sqlite3.pc:
 nettle: env $(BUILD_ROOT_DEPS)/lib/pkgconfig/nettle.pc

 $(BUILD_ROOT_DEPS)/lib/pkgconfig/nettle.pc:
-	@./get-src http://www.lysator.liu.se/~nisse/archive nettle-2.7.1.tar.gz
-	@./build cmmi "$(BUILD_ROOT_DEPS)" nettle-2.7.1 "" "" $(VERBOSE)
+	@./get-src http://www.lysator.liu.se/~nisse/archive nettle-3.1.tar.gz
+	@./build cmmi "$(BUILD_ROOT_DEPS)" nettle-3.1 "nettle.patch" "" $(VERBOSE)

 gmp: env $(BUILD_ROOT_DEPS)/lib/libgmp.la

@ -257,8 +256,8 @@ $(BUILD_ROOT_DEPS)/lib/libgmp.la:
 p11-kit: env libtasn1 $(BUILD_ROOT_DEPS)/lib/pkgconfig/p11-kit-1.pc

 $(BUILD_ROOT_DEPS)/lib/pkgconfig/p11-kit-1.pc:
-	@./get-src http://cgit.freedesktop.org/p11-glue/p11-kit/snapshot p11-kit-98292d6bbc.tar.gz
-	@./build acmmi "$(BUILD_ROOT_DEPS)" p11-kit-98292d6bbc "p11-kit.patch" "--disable-rpath --disable-trust-module --without-trust-paths" $(VERBOSE)
+	@./get-src http://cgit.freedesktop.org/p11-glue/p11-kit/snapshot p11-kit-ec9e2450ba.tar.gz
+	@./build acmmi "$(BUILD_ROOT_DEPS)" p11-kit-ec9e2450ba "p11-kit.patch" "--disable-rpath --disable-trust-module --without-trust-paths" $(VERBOSE)

 trousers: env openssl $(BUILD_ROOT_DEPS)/lib/pkgconfig/trousers.pc

@ -308,8 +307,8 @@ $(BUILD_ROOT_DEPS)/lib/libncurses.a:
 openldap: env regex gnutls libgpg-error libgcrypt $(BUILD_ROOT_DEPS)/lib/libldap.la

 $(BUILD_ROOT_DEPS)/lib/libldap.la:
-	@./get-src ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release openldap-2.4.9.tgz
-	@./build cmmi "$(BUILD_ROOT_DEPS)" openldap-2.4.9 "@openldap.patch" "--disable-backends --disable-overlays --disable-slapd --disable-debug --enable-dynamic --without-threads --with-tls=gnutls" $(VERBOSE)
+	@./get-src ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release openldap-2.4.39.tgz
+	@./build cmmi "$(BUILD_ROOT_DEPS)" openldap-2.4.39 "@openldap.patch" "--disable-backends --disable-overlays --disable-slapd --disable-debug --enable-dynamic --without-threads --with-tls=gnutls" $(VERBOSE)

 libgpg-error: env gnutls $(BUILD_ROOT_DEPS)/lib/libgpg-error.la

@ -361,12 +360,6 @@ $(BUILD_ROOT_DEPS)/lib/pkgconfig/gtkspell3-3.0.pc:
 	@./get-src "http://downloads.sourceforge.net/project/gtkspell/3.0.4/gtkspell3-3.0.4.tar.gz?r=http%3A%2F%2Fgtkspell.sourceforge.net%2F&ts=1395867752&use_mirror=skylink" "0" gtkspell3-3.0.4.tar.gz
 	@./build cmmi "$(BUILD_ROOT_DEPS)" gtkspell3-3.0.4 "" "$(DISABLE_GTK_DOC)" $(VERBOSE)

-gtkhtml: env $(BUILD_ROOT_DEPS)/lib/pkgconfig/libgtkhtml-4.0.pc
-
-$(BUILD_ROOT_DEPS)/lib/pkgconfig/libgtkhtml-4.0.pc:
-	@./get-src https://download.gnome.org/sources/gtkhtml/4.8 gtkhtml-4.8.0.tar.xz
-	@./build cmmi "$(BUILD_ROOT_DEPS)" gtkhtml-4.8.0 "" "$(DISABLE_GTK_DOC)" $(VERBOSE)
-
 gnome-common: env $(BUILD_ROOT_DEPS)/share/aclocal/gnome-common.m4

 $(BUILD_ROOT_DEPS)/share/aclocal/gnome-common.m4:
@ -376,8 +369,8 @@ $(BUILD_ROOT_DEPS)/share/aclocal/gnome-common.m4:
 webkitgtk: env gtk enchant libsoup ruby gperf libwebp icu libsecret libxslt $(BUILD_ROOT_DEPS)/lib/pkgconfig/webkitgtk-3.0.pc

 $(BUILD_ROOT_DEPS)/lib/pkgconfig/webkitgtk-3.0.pc:
-	@./get-src http://webkitgtk.org/releases webkitgtk-2.4.4.tar.xz
-	@./build cmmi "$(BUILD_ROOT_DEPS)" webkitgtk-2.4.4 "webkitgtk.patch" "--enable-win32-target --enable-spellcheck --enable-jit --disable-geolocation --disable-video --disable-web-audio --disable-webgl --disable-accelerated-compositing --disable-glx --disable-egl --disable-gles2 --disable-webkit2 $(DISABLE_GTK_DOC)" $(VERBOSE)
+	@./get-src http://webkitgtk.org/releases webkitgtk-2.4.9.tar.xz
+	@./build cmmi "$(BUILD_ROOT_DEPS)" webkitgtk-2.4.9 "" "--enable-win32-target --enable-spellcheck --enable-jit --disable-geolocation --disable-video --disable-web-audio --disable-webgl --disable-accelerated-compositing --disable-glx --disable-egl --disable-gles2 --disable-webkit2 $(DISABLE_GTK_DOC)" $(VERBOSE)

 ruby: env 7zip $(BUILD_ROOT_DEPS)/bin/ruby.exe

@ -463,8 +456,8 @@ $(BUILD_ROOT_DEPS)/lib/pkgconfig/libunistring.pc:
 libtasn1: env $(BUILD_ROOT_DEPS)/lib/pkgconfig/libtasn1.pc

 $(BUILD_ROOT_DEPS)/lib/pkgconfig/libtasn1.pc:
-	@./get-src http://ftp.gnu.org/gnu/libtasn1 libtasn1-3.4.tar.gz
-	@./build cmmi "$(BUILD_ROOT_DEPS)" libtasn1-3.4 "@libtasn1.patch" "" $(VERBOSE)
+	@./get-src http://ftp.gnu.org/gnu/libtasn1 libtasn1-4.5.tar.gz
+	@./build cmmi "$(BUILD_ROOT_DEPS)" libtasn1-4.5 "" "" $(VERBOSE)

 openssl: env $(BUILD_ROOT_DEPS)/lib/pkgconfig/openssl.pc

@ -472,29 +465,35 @@ $(BUILD_ROOT_DEPS)/lib/pkgconfig/openssl.pc:
 	@./get-src http://www.openssl.org/source openssl-1.0.1g.tar.gz
 	@./build cmmi "$(BUILD_ROOT_DEPS)" openssl-1.0.1g "" "mingw" $(VERBOSE)

-gtk: env glib intltool atk gdk-pixbuf cairo pango $(BUILD_ROOT_DEPS)/lib/pkgconfig/gtk+-3.0.pc
+gtk: env glib intltool atk gdk-pixbuf cairo pango libepoxy $(BUILD_ROOT_DEPS)/lib/pkgconfig/gtk+-3.0.pc

 $(BUILD_ROOT_DEPS)/lib/pkgconfig/gtk+-3.0.pc:
-	@./get-src https://download.gnome.org/sources/gtk+/3.10 gtk+-3.10.6.tar.xz
-	@./build cmmi "$(BUILD_ROOT_DEPS)" gtk+-3.10.6 "gtk.patch" "--disable-static $(DISABLE_GTK_DOC) --disable-man" $(VERBOSE)
+	@./get-src https://download.gnome.org/sources/gtk+/3.16 gtk+-3.16.4.tar.xz
+	@./build cmmi "$(BUILD_ROOT_DEPS)" gtk+-3.16.4 "gtk.patch" "--disable-static $(DISABLE_GTK_DOC) --disable-man" $(VERBOSE)
+
+libepoxy: env glib intltool cairo pango $(BUILD_ROOT_DEPS)/lib/pkgconfig/epoxy.pc
+
+$(BUILD_ROOT_DEPS)/lib/pkgconfig/epoxy.pc:
+	@./get-src https://github.com/anholt/libepoxy/archive/v1.2.tar.gz "0" "libepoxy-1.2.tar.gz" || (mv downloads/v1.2 downloads/libepoxy-1.2.tar.gz && tar -xf downloads/libepoxy-1.2.tar.gz --directory=src/)
+	@./build acmmi "$(BUILD_ROOT_DEPS)" libepoxy-1.2 "libepoxy.patch" "" $(VERBOSE)

 atk: env glib $(BUILD_ROOT_DEPS)/lib/pkgconfig/atk.pc

 $(BUILD_ROOT_DEPS)/lib/pkgconfig/atk.pc:
-	@./get-src https://download.gnome.org/sources/atk/2.10 atk-2.10.0.tar.xz
-	@./build cmmi "$(BUILD_ROOT_DEPS)" atk-2.10.0 "atk.patch" "--disable-static" $(VERBOSE)
+	@./get-src https://download.gnome.org/sources/atk/2.16 atk-2.16.0.tar.xz
+	@./build cmmi "$(BUILD_ROOT_DEPS)" atk-2.16.0 "atk.patch" "--disable-static" $(VERBOSE)

 cairo: env glib pixman libpng freetype fontconfig $(BUILD_ROOT_DEPS)/lib/pkgconfig/cairo.pc

 $(BUILD_ROOT_DEPS)/lib/pkgconfig/cairo.pc:
-	@./get-src http://cairographics.org/releases cairo-1.12.16.tar.xz
-	@./build cmmi "$(BUILD_ROOT_DEPS)" cairo-1.12.16 "" "--disable-static $(DISABLE_GTK_DOC)" $(VERBOSE)
+	@./get-src http://cairographics.org/releases cairo-1.14.2.tar.xz
+	@./build cmmi "$(BUILD_ROOT_DEPS)" cairo-1.14.2 "" "--disable-static $(DISABLE_GTK_DOC)" $(VERBOSE)

 pixman: env $(BUILD_ROOT_DEPS)/lib/pkgconfig/pixman-1.pc

 $(BUILD_ROOT_DEPS)/lib/pkgconfig/pixman-1.pc:
-	@./get-src http://cairographics.org/releases pixman-0.32.4.tar.gz
-	@./build cmmi "$(BUILD_ROOT_DEPS)" pixman-0.32.4 "" "--disable-static" $(VERBOSE)
+	@./get-src http://cairographics.org/releases pixman-0.32.6.tar.gz
+	@./build cmmi "$(BUILD_ROOT_DEPS)" pixman-0.32.6 "" "--disable-static" $(VERBOSE)

 libpng: env zlib $(BUILD_ROOT_DEPS)/lib/pkgconfig/libpng.pc

@ -531,10 +530,10 @@ $(BUILD_ROOT_DEPS)/lib/pkgconfig/librsvg-2.0.pc:
 pango: env glib cairo fontconfig freetype harfbuzz $(BUILD_ROOT_DEPS)/lib/pkgconfig/pango.pc

 $(BUILD_ROOT_DEPS)/lib/pkgconfig/pango.pc:
-	@./get-src http://ftp.gnome.org/pub/GNOME/sources/pango/1.36 pango-1.36.1.tar.xz
-	@./build cmmi "$(BUILD_ROOT_DEPS)" pango-1.36.1 "" "" $(VERBOSE)
+	@./get-src http://ftp.gnome.org/pub/GNOME/sources/pango/1.36 pango-1.36.8.tar.xz
+	@./build cmmi "$(BUILD_ROOT_DEPS)" pango-1.36.8 "" "" $(VERBOSE)

-icon-themes: hicolor-icon-theme icon-naming-utils gnome-icon-theme gnome-icon-theme-symbolic
+icon-themes: hicolor-icon-theme icon-naming-utils adwaita-icon-theme

 hicolor-icon-theme: env $(BUILD_ROOT_DEPS)/share/icons/hicolor/index.theme

@ -554,23 +553,17 @@ $(BUILD_ROOT_DEPS)/share/pkgconfig/icon-naming-utils.pc:
 	@./get-src http://tango.freedesktop.org/releases icon-naming-utils-0.8.90.tar.gz
 	@./build cmmi "$(BUILD_ROOT_DEPS)" icon-naming-utils-0.8.90 "" "" $(VERBOSE)

-gnome-icon-theme: env icon-naming-utils gtk $(BUILD_ROOT_DEPS)/share/pkgconfig/gnome-icon-theme.pc
+adwaita-icon-theme: env icon-naming-utils gtk $(BUILD_ROOT_DEPS)/share/pkgconfig/adwaita-icon-theme.pc

-$(BUILD_ROOT_DEPS)/share/pkgconfig/gnome-icon-theme.pc:
-	@./get-src https://download.gnome.org/sources/gnome-icon-theme/3.10 gnome-icon-theme-3.10.0.tar.xz
-	@./build cmmi "$(BUILD_ROOT_DEPS)" gnome-icon-theme-3.10.0 "" "" $(VERBOSE)
-
-gnome-icon-theme-symbolic: env gnome-icon-theme $(BUILD_ROOT_DEPS)/share/pkgconfig/gnome-icon-theme-symbolic.pc
-
-$(BUILD_ROOT_DEPS)/share/pkgconfig/gnome-icon-theme-symbolic.pc:
-	@./get-src https://download.gnome.org/sources/gnome-icon-theme-symbolic/3.10 gnome-icon-theme-symbolic-3.10.1.tar.xz
-	@./build cmmi "$(BUILD_ROOT_DEPS)" gnome-icon-theme-symbolic-3.10.1 "" "" $(VERBOSE)
+$(BUILD_ROOT_DEPS)/share/pkgconfig/adwaita-icon-theme.pc:
+	@./get-src https://download.gnome.org/sources/adwaita-icon-theme/3.16 adwaita-icon-theme-3.16.2.tar.xz
+	@./build cmmi "$(BUILD_ROOT_DEPS)" adwaita-icon-theme-3.16.2 "" "" $(VERBOSE)

 gdk-pixbuf: env giflib libpng libjpeg libtiff jasper glib $(BUILD_ROOT_DEPS)/lib/pkgconfig/gdk-pixbuf-2.0.pc

 $(BUILD_ROOT_DEPS)/lib/pkgconfig/gdk-pixbuf-2.0.pc:
-	@./get-src https://download.gnome.org/sources/gdk-pixbuf/2.30 gdk-pixbuf-2.30.2.tar.xz
-	@./build cmmi "$(BUILD_ROOT_DEPS)" gdk-pixbuf-2.30.2 "" "--disable-static --with-libjasper" $(VERBOSE)
+	@./get-src https://download.gnome.org/sources/gdk-pixbuf/2.30 gdk-pixbuf-2.30.8.tar.xz
+	@./build cmmi "$(BUILD_ROOT_DEPS)" gdk-pixbuf-2.30.8 "" "--disable-static --with-libjasper" $(VERBOSE)

 libcroco: env glib $(BUILD_ROOT_DEPS)/lib/pkgconfig/libcroco-0.6.pc

@ -704,8 +697,8 @@ $(BUILD_ROOT_DEPS)/bin/iconv.exe:
 gettext: env $(BUILD_ROOT_DEPS)/bin/gettext.exe

 $(BUILD_ROOT_DEPS)/bin/gettext.exe:
-	@./get-src http://ftp.gnu.org/pub/gnu/gettext gettext-0.18.3.1.tar.gz
-	@./build cmmi "$(BUILD_ROOT_DEPS)" gettext-0.18.3.1 "@gettext.patch" "" $(VERBOSE)
+	@./get-src http://ftp.gnu.org/pub/gnu/gettext gettext-0.19.4.tar.gz
+	@./build cmmi "$(BUILD_ROOT_DEPS)" gettext-0.19.4 "@gettext.patch" "" $(VERBOSE)

 bison: env $(BUILD_ROOT_DEPS)/bin/bison.exe

--- a/win32/patches/atk.patch
+++ b/win32/patches/atk.patch
@ -1,11 +0,0 @@
-diff -upr -x .deps -x .libs -x '*.la' atk-2.10.0.old/atk/atk.symbols atk-2.10.0/atk/atk.symbols
--- atk-2.10.0.old/atk/atk.symbols	2013-09-13 15:00:44 +0000
-+++ atk-2.10.0/atk/atk.symbols	2014-05-17 16:34:24 +0000
-@@ -107,6 +107,7 @@
- 	atk_object_get_n_accessible_children
- 	atk_object_get_name
- 	atk_object_get_parent
-+	atk_object_get_object_locale
- 	atk_object_get_role
- 	atk_object_get_type
- 	atk_object_initialize
--- a/win32/patches/gcr.patch
+++ b/win32/patches/gcr.patch
--- a/win32/patches/gtk.patch
+++ b/win32/patches/gtk.patch
@ -1,44 +1,7 @@
-diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' gtk+-3.10.6.old/gdk/Makefile.in gtk+-3.10.6/gdk/Makefile.in
--- gtk+-3.10.6.old/gdk/Makefile.in	2014-09-30 17:02:46 +0000
-+++ gtk+-3.10.6/gdk/Makefile.in	2014-09-30 17:00:04 +0000
-@@ -94,7 +94,7 @@ DIST_COMMON = $(top_srcdir)/Makefile.dec
- @USE_WIN32_FALSE@	$(am__append_1) $(am__append_3) \
- @USE_WIN32_FALSE@	$(am__append_5) $(am__append_7) \
- @USE_WIN32_FALSE@	$(am__append_8)
-@USE_WIN32_TRUE@am__append_6 = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def
-+@USE_WIN32_TRUE@am__append_6 = -Wl,win32/rc/gdk-win32-res.o
- @USE_BROADWAY_TRUE@am__append_7 = broadway/libgdk-broadway.la
- @USE_WAYLAND_TRUE@am__append_8 = wayland/libgdk-wayland.la
- @HAVE_INTROSPECTION_TRUE@am__append_9 = Gdk-3.0.gir
-@@ -737,7 +737,7 @@ libgdk_3_la_CFLAGS = $(AM_CFLAGS) $(GDK_
- libgdk_3_la_LIBADD = $(GDK_DEP_LIBS) $(am__append_1) $(am__append_3) \
- 	$(am__append_5) $(am__append_7) $(am__append_8)
- libgdk_3_la_LDFLAGS = $(LDADD) $(am__append_6)
-@USE_WIN32_TRUE@libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
-+@USE_WIN32_TRUE@libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o
- @HAVE_INTROSPECTION_TRUE@introspection_files = \
- @HAVE_INTROSPECTION_TRUE@	$(filter-out gdkkeysyms-compat.h, $(gdk_public_h_sources))	\
- @HAVE_INTROSPECTION_TRUE@	$(gdk_c_sources)	\
-@@ -1625,16 +1625,8 @@ check-local: test-cwd
- 
- @HAVE_INTROSPECTION_TRUE@@USE_X11_TRUE@GdkX11-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile
- 
-@OS_WIN32_TRUE@install-def-file: gdk.def
-@OS_WIN32_TRUE@	mkdir -p $(DESTDIR)$(libdir)
-@OS_WIN32_TRUE@	$(INSTALL) $(srcdir)/gdk.def $(DESTDIR)$(libdir)/gdk-win32-3.0.def
-@OS_WIN32_TRUE@uninstall-def-file:
-@OS_WIN32_TRUE@	-rm $(DESTDIR)$(libdir)/gdk-win32-3.0.def
-@OS_WIN32_FALSE@install-def-file:
-@OS_WIN32_FALSE@uninstall-def-file:
-
-@MS_LIB_AVAILABLE_TRUE@gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la gdk.def
-@MS_LIB_AVAILABLE_TRUE@	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@
-+@MS_LIB_AVAILABLE_TRUE@gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la
-+@MS_LIB_AVAILABLE_TRUE@	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -out:$@
- 
- @MS_LIB_AVAILABLE_TRUE@install-ms-lib:
- @MS_LIB_AVAILABLE_TRUE@	mkdir -p $(DESTDIR)$(libdir)
-@@ -1714,9 +1706,9 @@ dist-hook: ../build/win32/vs9/gdk.vcproj
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' gtk+-3.16.4.old/gdk/Makefile.in gtk+-3.16.4/gdk/Makefile.in
+--- gtk+-3.16.4.old/gdk/Makefile.in	2015-06-10 14:48:08 +0000
+++ gtk+-3.16.4/gdk/Makefile.in	2015-07-12 16:34:22 +0000
+@@ -1841,9 +1841,9 @@ dist-hook: ../build/win32/vs9/gdk.vcproj
 	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/gdk.vcxproj.filtersin >$@
 	rm libgdk.vs10.sourcefiles.filters
 
@ -50,74 +13,10 @@ diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' gtk+-3.10.6.old/gdk/Makefile.in
 	rm -f $(DESTDIR)$(configexecincludedir)/gdkconfig.h
 
 # if srcdir!=builddir, clean out maintainer-clean files from builddir
-diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' gtk+-3.10.6.old/gtk/Makefile.in gtk+-3.10.6/gtk/Makefile.in
--- gtk+-3.10.6.old/gtk/Makefile.in	2014-09-30 17:02:46 +0000
-+++ gtk+-3.10.6/gtk/Makefile.in	2014-09-30 17:00:04 +0000
-@@ -111,7 +111,7 @@ DIST_COMMON = $(top_srcdir)/Makefile.dec
- @USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_13 = $(gtk_use_stub_c_sources)
- @USE_WIN32_TRUE@am__append_14 = -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
- @USE_WIN32_TRUE@am__append_15 = -Wl,-luuid
-@USE_WIN32_TRUE@am__append_16 = $(gtk_def) $(gtk_win32_res) $(deps)
-+@USE_WIN32_TRUE@am__append_16 = $(gtk_win32_res) $(deps)
- 
- # And include the regular ones:
- @HAVE_INTROSPECTION_TRUE@@USE_QUARTZ_TRUE@am__append_17 = \
-@@ -1047,8 +1047,6 @@ AM_CPPFLAGS = \
- 	$(INCLUDED_IMMODULE_DEFINE)
- 
- @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
-@OS_WIN32_TRUE@gtk_def = gtk.def
-@OS_WIN32_TRUE@gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def
- @OS_WIN32_TRUE@gtk_win32_res = gtk-win32-res.o
- @OS_WIN32_TRUE@gtk_win32_res_ldflag = -Wl,gtk-win32-res.o
- @MS_LIB_AVAILABLE_TRUE@noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib
-@@ -1959,7 +1957,7 @@ libgtk_3_la_SOURCES = $(gtk_c_sources)
- libgtk_3_la_LDFLAGS = $(libtool_opts) $(am__append_15)
- libgtk_3_la_LIBADD = $(libadd) $(am__append_14)
- libgtk_3_la_DEPENDENCIES = $(deps) $(am__append_16)
-@USE_WIN32_TRUE@libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
-+@USE_WIN32_TRUE@libgtk_target_ldflags = $(gtk_win32_res_ldflag)
- DEPS = libgtk-3.la $(top_builddir)/gdk/libgdk-3.la
- TEST_DEPS = $(DEPS) immodules.cache
- LDADDS = \
-@@ -5912,15 +5910,8 @@ check-local: test-cwd
- @OS_WIN32_TRUE@gtk-win32-res.o : gtk-win32.rc
- @OS_WIN32_TRUE@	$(WINDRES) gtk-win32.rc $@
- 
-@OS_WIN32_TRUE@install-def-file: gtk.def
-@OS_WIN32_TRUE@	$(INSTALL) $(srcdir)/gtk.def $(DESTDIR)$(libdir)/gtk-win32-3.0.def
-@OS_WIN32_TRUE@uninstall-def-file:
-@OS_WIN32_TRUE@	-rm $(DESTDIR)$(libdir)/gtk-win32-3.0.def
-@OS_WIN32_FALSE@install-def-file:
-@OS_WIN32_FALSE@uninstall-def-file:
-
-@MS_LIB_AVAILABLE_TRUE@gtk-win32-$(GTK_API_VERSION).lib: libgtk-win32-$(GTK_API_VERSION).la gtk.def
-@MS_LIB_AVAILABLE_TRUE@	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgtk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gtk.def -out:$@
-+@MS_LIB_AVAILABLE_TRUE@gtk-win32-$(GTK_API_VERSION).lib: libgtk-win32-$(GTK_API_VERSION).la
-+@MS_LIB_AVAILABLE_TRUE@	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgtk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -out:$@
- 
- @MS_LIB_AVAILABLE_TRUE@install-ms-lib:
- @MS_LIB_AVAILABLE_TRUE@	$(INSTALL) gtk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
-@@ -6055,13 +6046,13 @@ dist-hook: ../build/win32/vs9/gtk.vcproj
- 	rm libgtk.vs10.sourcefiles.filters
- 
- # Install a RC file for the default GTK+ theme, and key themes
-install-data-local: install-ms-lib install-def-file install-mac-key-theme
-+install-data-local: install-ms-lib install-mac-key-theme
- 	$(MKDIR_P) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0
- 	$(INSTALL_DATA) $(srcdir)/gtk-keys.css.default $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css
- 	$(MKDIR_P) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0
- 	$(INSTALL_DATA) $(srcdir)/gtk-keys.css.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css
- 
-uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-mac-key-theme
-+uninstall-local: uninstall-ms-lib uninstall-mac-key-theme
- 	rm -f $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtk.css
- 	rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css
- 	rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css
-diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' gtk+-3.10.6.old/gtk/deprecated/gtkaction.c gtk+-3.10.6/gtk/deprecated/gtkaction.c
--- gtk+-3.10.6.old/gtk/deprecated/gtkaction.c	2014-09-30 17:02:13 +0000
-+++ gtk+-3.10.6/gtk/deprecated/gtkaction.c	2014-09-30 17:05:22 +0000
-@@ -513,7 +513,7 @@ gtk_action_class_init (GtkActionClass *k
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' gtk+-3.16.4.old/gtk/deprecated/gtkaction.c gtk+-3.16.4/gtk/deprecated/gtkaction.c
+--- gtk+-3.16.4.old/gtk/deprecated/gtkaction.c	2015-03-02 19:34:03 +0000
+++ gtk+-3.16.4/gtk/deprecated/gtkaction.c	2015-07-12 16:34:22 +0000
+@@ -518,7 +518,7 @@ gtk_action_class_init (GtkActionClass *k
                                    g_param_spec_boolean ("always-show-image",
                                                          P_("Always show image"),
                                                          P_("Whether the image will always be shown"),
@ -126,10 +25,10 @@ diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' gtk+-3.10.6.old/gtk/deprecated/g
                                                          GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
   /**
-diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' gtk+-3.10.6.old/gtk/deprecated/gtkimagemenuitem.c gtk+-3.10.6/gtk/deprecated/gtkimagemenuitem.c
--- gtk+-3.10.6.old/gtk/deprecated/gtkimagemenuitem.c	2014-09-30 17:02:13 +0000
-+++ gtk+-3.10.6/gtk/deprecated/gtkimagemenuitem.c	2014-09-30 17:05:38 +0000
-@@ -204,7 +204,7 @@ gtk_image_menu_item_class_init (GtkImage
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' gtk+-3.16.4.old/gtk/deprecated/gtkimagemenuitem.c gtk+-3.16.4/gtk/deprecated/gtkimagemenuitem.c
+--- gtk+-3.16.4.old/gtk/deprecated/gtkimagemenuitem.c	2015-05-16 00:48:48 +0000
+++ gtk+-3.16.4/gtk/deprecated/gtkimagemenuitem.c	2015-07-12 16:34:22 +0000
+@@ -232,7 +232,7 @@ gtk_image_menu_item_class_init (GtkImage
                                    g_param_spec_boolean ("always-show-image",
                                                          P_("Always show image"),
                                                          P_("Whether the image will always be shown"),
@ -138,15 +37,38 @@ diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' gtk+-3.10.6.old/gtk/deprecated/g
                                                          GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED));
 
   /**
-diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' gtk+-3.10.6.old/gtk/gtkbutton.c gtk+-3.10.6/gtk/gtkbutton.c
--- gtk+-3.10.6.old/gtk/gtkbutton.c	2014-09-30 17:02:14 +0000
-+++ gtk+-3.10.6/gtk/gtkbutton.c	2014-09-30 17:04:34 +0000
-@@ -377,7 +377,7 @@ gtk_button_class_init (GtkButtonClass *k
-                                    g_param_spec_boolean ("always-show-image",
-                                                          P_("Always show image"),
-                                                          P_("Whether the image will always be shown"),
-                                                         FALSE,
-+                                                         TRUE,
-                                                          GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' gtk+-3.16.4.old/gtk/gtkbutton.c gtk+-3.16.4/gtk/gtkbutton.c
+--- gtk+-3.16.4.old/gtk/gtkbutton.c	2015-05-16 00:48:48 +0000
+++ gtk+-3.16.4/gtk/gtkbutton.c	2015-07-12 16:34:22 +0000
+@@ -365,7 +365,7 @@ gtk_button_class_init (GtkButtonClass *k
+      g_param_spec_boolean ("always-show-image",
+                            P_("Always show image"),
+                            P_("Whether the image will always be shown"),
+-                           FALSE,
+                           TRUE,
+                            GTK_PARAM_READWRITE|G_PARAM_CONSTRUCT|G_PARAM_EXPLICIT_NOTIFY);
 
-   g_object_class_override_property (gobject_class, PROP_ACTION_NAME, "action-name");
+   g_object_class_install_properties (gobject_class, LAST_PROP, props);
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' gtk+-3.16.4.old/gtk/gtkscrolledwindow.c gtk+-3.16.4/gtk/gtkscrolledwindow.c
+--- gtk+-3.16.4.old/gtk/gtkscrolledwindow.c	2015-06-10 13:49:02 +0000
+++ gtk+-3.16.4/gtk/gtkscrolledwindow.c	2015-07-12 16:34:45 +0000
+@@ -596,7 +596,7 @@ gtk_scrolled_window_class_init (GtkScrol
+                                    g_param_spec_boolean ("overlay-scrolling",
+                                                          P_("Overlay Scrolling"),
+                                                          P_("Overlay scrolling mode"),
+-                                                         TRUE,
+                                                         FALSE,
+                                                          GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
+ 
+   /**
+@@ -4052,8 +4052,8 @@ gtk_scrolled_window_update_use_indicator
+ 
+   use_indicators = priv->overlay_scrolling;
+ 
+-  if (g_strcmp0 (g_getenv ("GTK_OVERLAY_SCROLLING"), "0") == 0)
+-    use_indicators = FALSE;
+  if (g_strcmp0 (g_getenv ("GTK_OVERLAY_SCROLLING"), "1") == 0)
+    use_indicators = TRUE;
+ 
+   if (priv->use_indicators != use_indicators)
+     {
--- a/win32/patches/libepoxy.patch
+++ b/win32/patches/libepoxy.patch
@ -0,0 +1,52 @@
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' libepoxy-1.2/configure.ac libepoxy-1.2.new/configure.ac
+--- libepoxy-1.2/configure.ac	2014-05-14 00:22:08 +0000
+++ libepoxy-1.2.new/configure.ac	2015-07-05 17:19:01 +0000
+@@ -32,13 +32,13 @@ AC_CONFIG_HEADERS([config.h])
+ AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects])
+ 
+ # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+-m4_ifndef([XORG_MACROS_VERSION],
+-          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen.
+-  Hint: either install from source, git://anongit.freedesktop.org/xorg/util/macros or,
+-  depending on you distribution, try package 'xutils-dev' or 'xorg-x11-util-macros'])])
+-
+-XORG_MACROS_VERSION(1.8)
+-XORG_DEFAULT_OPTIONS
+#m4_ifndef([XORG_MACROS_VERSION],
+#          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen.
+#  Hint: either install from source, git://anongit.freedesktop.org/xorg/util/macros or,
+#  depending on you distribution, try package 'xutils-dev' or 'xorg-x11-util-macros'])])
+#
+#XORG_MACROS_VERSION(1.8)
+#XORG_DEFAULT_OPTIONS
+ 
+ AC_CHECK_PROGS([PYTHON], [python3 python2 python])
+ 
+@@ -56,7 +56,7 @@ AC_CHECK_HEADER([KHR/khrplatform.h],
+ 
+ # OS X defaults to having -Wint-conversion ("warn when passing
+ # uintptr_t to a void *") by default.  Kill that.
+-XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
+#XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
+ 
+ has_znow=yes
+ 
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' libepoxy-1.2/src/dispatch_common.c libepoxy-1.2.new/src/dispatch_common.c
+--- libepoxy-1.2/src/dispatch_common.c	2014-05-14 00:22:08 +0000
+++ libepoxy-1.2.new/src/dispatch_common.c	2015-07-05 17:21:58 +0000
+@@ -318,13 +318,13 @@ epoxy_internal_has_gl_extension(const ch
+             return invalid_op_mode;
+         return epoxy_extension_in_string(exts, ext);
+     } else {
+-        int num_extensions;
+        int num_extensions, i;
+ 
+         glGetIntegerv(GL_NUM_EXTENSIONS, &num_extensions);
+         if (num_extensions == 0)
+             return invalid_op_mode;
+ 
+-        for (int i = 0; i < num_extensions; i++) {
+        for (i = 0; i < num_extensions; i++) {
+             const char *gl_ext = (const char *)glGetStringi(GL_EXTENSIONS, i);
+             if (strcmp(ext, gl_ext) == 0)
+                 return true;
--- a/win32/patches/libical.patch
+++ b/win32/patches/libical.patch
@ -1,16 +1,46 @@
-diff -upr -x .deps -x .libs -x '*.la' libical-1.0.old/src/libical/icaltime.c libical-1.0/src/libical/icaltime.c
--- libical-1.0.old/src/libical/icaltime.c	2013-04-14 17:24:42 +0000
-+++ libical-1.0/src/libical/icaltime.c	2014-08-03 13:58:29 +0000
-@@ -61,7 +61,7 @@
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' libical-1.0.1.old/src/libical/icaltime.c libical-1.0.1/src/libical/icaltime.c
+--- libical-1.0.1.old/src/libical/icaltime.c	2014-10-09 15:07:05 +0000
+++ libical-1.0.1/src/libical/icaltime.c	2015-07-10 18:02:31 +0000
+@@ -61,12 +61,7 @@
 #undef gmtime_r
 
 /* The gmtime() in Microsoft's C library is MT-safe */
 -#define gmtime_r(tp,tmp) (gmtime(tp)?(*(tmp)=*gmtime(tp),(tmp)):0)
+-#endif
+-
+-#ifdef HAVE_PTHREAD
+- #include <pthread.h>    
+-    static pthread_mutex_t tzid_mutex = PTHREAD_MUTEX_INITIALIZER;
 +#define gmtime_r(tp,tmp) (gmtime(tp)?(*(tmp)=*gmtime(tp),(tmp)):memset(tmp, 0, sizeof(*tmp)))
 #endif
 
- #ifdef HAVE_PTHREAD
-@@ -205,11 +205,7 @@ icaltime_from_timet_with_zone(const time
+ /*
+@@ -77,7 +72,7 @@
+  *  local daylight savings time applied to the result.
+  *  This function expects well-formed input.
+  */
+-static time_t make_time(struct tm *tm, int tzm)
+static time_t make_time(struct tm *tm, int tzm, int be_strict)
+ {
+   time_t tim;
+ 
+@@ -91,13 +86,13 @@ static time_t make_time(struct tm *tm, i
+ #if (SIZEOF_TIME_T == 4)
+   /* check that year specification within range */
+ 
+-  if (tm->tm_year < 70 || tm->tm_year > 138)
+  if (be_strict && (tm->tm_year < 70 || tm->tm_year > 138))
+     return((time_t) -1);
+ 
+   /* check for upper bound of Jan 17, 2038 (to avoid possibility of
+      32-bit arithmetic overflow) */
+   
+-  if (tm->tm_year == 138) {
+  if (be_strict && tm->tm_year == 138) {
+     if (tm->tm_mon > 0)
+       return((time_t) -1);
+     else if (tm->tm_mday > 17)
+@@ -207,11 +202,7 @@ icaltime_from_timet_with_zone(const time
 
     /* Convert the time_t to a struct tm in UTC time. We can trust gmtime
        for this. */
@ -22,9 +52,146 @@ diff -upr -x .deps -x .libs -x '*.la' libical-1.0.old/src/libical/icaltime.c lib
      
     tt.year   = t.tm_year + 1900;
     tt.month  = t.tm_mon + 1;
-diff -upr -x .deps -x .libs -x '*.la' libical-1.0.old/src/libical/icaltimezone.c libical-1.0/src/libical/icaltimezone.c
--- libical-1.0.old/src/libical/icaltimezone.c	2013-04-14 17:24:42 +0000
-+++ libical-1.0/src/libical/icaltimezone.c	2014-08-03 13:59:38 +0000
+@@ -291,99 +282,12 @@ time_t icaltime_as_timet(const struct ic
+     stm.tm_year = tt.year-1900;
+     stm.tm_isdst = -1;
+ 
+-    t = make_time(&stm, 0);
+    t = make_time(&stm, 0, 1);
+ 
+     return t;
+ 
+ }
+ 
+-
+-/* Structure used by set_tz to hold an old value of TZ, and the new
+-   value, which is in memory we will have to free in unset_tz */
+-/* This will hold the last "TZ=XXX" string we used with putenv(). After we
+-   call putenv() again to set a new TZ string, we can free the previous one.
+-   As far as I know, no libc implementations actually free the memory used in
+-   the environment variables (how could they know if it is a static string or
+-   a malloc'ed string?), so we have to free it ourselves. */
+-static char* saved_tz = NULL;
+-
+-/* If you use set_tz(), you must call unset_tz() some time later to restore the
+-   original TZ. Pass unset_tz() the string that set_tz() returns. Call both the functions
+-   locking the tzid mutex as in icaltime_as_timet_with_zone */
+-char* set_tz(const char* tzid)
+-{
+-    char *old_tz, *old_tz_copy = NULL, *new_tz;
+-
+-    /* Get the old TZ setting and save a copy of it to return. */
+-    old_tz = getenv("TZ");
+-    if(old_tz){
+-	old_tz_copy = (char*)malloc(strlen (old_tz) + 4);
+-
+-	if(old_tz_copy == 0){
+-	    icalerror_set_errno(ICAL_NEWFAILED_ERROR);
+-	    return 0;
+-	}
+-
+-	strcpy (old_tz_copy, "TZ=");
+-	strcpy (old_tz_copy + 3, old_tz);
+-    }
+-
+-    /* Create the new TZ string. */
+-    new_tz = (char*)malloc(strlen (tzid) + 4);
+-
+-    if(new_tz == 0){
+-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
+-	free(old_tz_copy);
+-	return 0;
+-    }
+-
+-    strcpy (new_tz, "TZ=");
+-    strcpy (new_tz + 3, tzid);
+-
+-    /* Add the new TZ to the environment. */
+-    putenv(new_tz); 
+-
+-    /* Free any previous TZ environment string we have used in a synchronized manner. */
+-
+-    free (saved_tz);
+-
+-    /* Save a pointer to the TZ string we just set, so we can free it later. */
+-    saved_tz = new_tz;
+-
+-    return old_tz_copy; /* This will be zero if the TZ env var was not set */
+-}
+-
+-void unset_tz(char *tzstr)
+-{
+-    /* restore the original environment */
+-
+-    if(tzstr!=0){
+-	putenv(tzstr);
+-    } else {
+-	/* Delete from environment.  We prefer unsetenv(3) over putenv(3)
+-	   because the former is POSIX and behaves consistently.  The later
+-	   does not unset the variable in some systems (like NetBSD), leaving
+-	   it with an empty value.  This causes problems later because further
+-	   calls to time related functions in libc will treat times in UTC. */
+-#ifdef HAVE_UNSETENV
+-	unsetenv("TZ");
+-#else
+-#ifdef _MSC_VER 
+-	putenv("TZ="); // The equals is required to remove with MS Visual C++
+-#else
+-	putenv("TZ");
+-#endif
+-#endif
+-    } 
+-
+-    /* Free any previous TZ environment string we have used in a synchronized manner */
+-    free (saved_tz);
+-
+-    /* Save a pointer to the TZ string we just set, so we can free it later.
+-       (This can possibly be NULL if there was no TZ to restore.) */
+-    saved_tz = tzstr;
+-}
+-
+ /**	Return the time as seconds past the UNIX epoch, using the
+  *	given timezone.
+  *
+@@ -397,8 +301,6 @@ time_t icaltime_as_timet_with_zone(const
+ {
+     icaltimezone *utc_zone;
+     struct tm stm;
+-    time_t t;
+-    char *old_tz;
+     struct icaltimetype local_tt;
+     
+     utc_zone = icaltimezone_get_utc_timezone ();
+@@ -426,25 +328,8 @@ time_t icaltime_as_timet_with_zone(const
+     stm.tm_mon = local_tt.month-1;
+     stm.tm_year = local_tt.year-1900;
+     stm.tm_isdst = -1;
+-/* The functions putenv and mktime are not thread safe, inserting a lock
+-to prevent any crashes */
+-
+-#ifdef HAVE_PTHREAD
+-    pthread_mutex_lock (&tzid_mutex);
+-#endif
+-    
+-    /* Set TZ to UTC and use mktime to convert to a time_t. */
+-    old_tz = set_tz ("UTC");
+-    tzset ();
+-
+-    t = mktime (&stm);
+-    unset_tz (old_tz);
+-    tzset ();
+ 
+-#ifdef HAVE_PTHREAD
+-    pthread_mutex_unlock (&tzid_mutex);
+-#endif
+-    return t;
+    return make_time (&stm, 0, 0);
+ }
+ 
+ const char* icaltime_as_ical_string(const struct icaltimetype tt)
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' libical-1.0.1.old/src/libical/icaltimezone.c libical-1.0.1/src/libical/icaltimezone.c
+--- libical-1.0.1.old/src/libical/icaltimezone.c	2014-10-09 15:07:05 +0000
+++ libical-1.0.1/src/libical/icaltimezone.c	2015-07-10 18:02:31 +0000
@@ -61,12 +61,19 @@ static pthread_mutex_t builtin_mutex = P
 #undef gmtime_r
 
@ -55,20 +222,20 @@ diff -upr -x .deps -x .libs -x '*.la' libical-1.0.old/src/libical/icaltimezone.c
 
 /** The prefix we use to uniquely identify TZIDs.
     It must begin and end with forward slashes.
-@@ -1702,10 +1709,10 @@ icaltimezone_parse_zone_tab		(void)
+@@ -1731,10 +1738,10 @@ icaltimezone_parse_zone_tab		(void)
 	return;
     }
- #ifndef USE_BUILTIN_TZDATA
+     if (!use_builtin_tzdata) {
 -    snprintf (filename, filename_len, "%s/%s", icaltzutil_get_zone_directory (),
 +    snprintf (filename, filename_len, "%s" DIR_SEPARATOR "%s", icaltzutil_get_zone_directory (),
 	      ZONES_TAB_SYSTEM_FILENAME);
- #else    
+     } else {
 -    snprintf (filename, filename_len, "%s/%s", get_zone_directory(),
 +    snprintf (filename, filename_len, "%s" DIR_SEPARATOR "%s", get_zone_directory(),
 	      ZONES_TAB_FILENAME);
- #endif    
+     }
 
-@@ -1823,7 +1830,7 @@ icaltimezone_load_builtin_timezone	(ical
+@@ -1856,7 +1863,7 @@ icaltimezone_load_builtin_timezone	(ical
 	goto out;
     }
 
@ -77,10 +244,10 @@ diff -upr -x .deps -x .libs -x '*.la' libical-1.0.old/src/libical/icaltimezone.c
 	      zone->location);
 
     fp = fopen (filename, "r");
-diff -upr -x .deps -x .libs -x '*.la' libical-1.0.old/src/libical/icaltz-util.c libical-1.0/src/libical/icaltz-util.c
--- libical-1.0.old/src/libical/icaltz-util.c	2013-04-14 17:24:42 +0000
-+++ libical-1.0/src/libical/icaltz-util.c	2014-08-03 12:54:17 +0000
-@@ -50,7 +50,7 @@
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' libical-1.0.1.old/src/libical/icaltz-util.c libical-1.0.1/src/libical/icaltz-util.c
+--- libical-1.0.1.old/src/libical/icaltz-util.c	2014-10-09 15:07:05 +0000
+++ libical-1.0.1/src/libical/icaltz-util.c	2015-07-10 18:03:56 +0000
+@@ -51,7 +51,7 @@
 # endif
 #endif
 
@ -89,27 +256,23 @@ diff -upr -x .deps -x .libs -x '*.la' libical-1.0.old/src/libical/icaltz-util.c
 #if !defined(HAVE_BYTESWAP_H) && !defined(HAVE_SYS_ENDIAN_H) && !defined(HAVE_ENDIAN_H)
 #define bswap_16(x) (((x) << 8) & 0xff00) | (((x) >> 8 ) & 0xff)
 #define bswap_32(x) (((x) << 24) & 0xff000000)  \
-@@ -67,6 +67,11 @@
+@@ -68,6 +68,7 @@
                     | (((x) & 0x00000000000000ffull) << 56))
 #endif
 #include <io.h>
-+#include <sys/param.h> /* for BYTE_ORDER */
-+#endif
-+
-+#ifdef WIN32
 +#include <windows.h>
 #endif
 
- #if defined(__APPLE__)
-@@ -191,6 +196,7 @@ zname_from_stridx (char *str, long int i
+ #if defined(__APPLE__) || defined(__MINGW32__)
+@@ -190,6 +191,7 @@ zname_from_stridx (char *str, long int i
 static void
 set_zonedir (void)
 {
 +	#ifndef WIN32
 	char file_path[PATH_MAX];
 	const char *fname = ZONES_TAB_SYSTEM_FILENAME;
- 	int i;	
-@@ -202,6 +208,42 @@ set_zonedir (void)
+ 	unsigned int i;
+@@ -201,6 +203,42 @@ set_zonedir (void)
 			break;
 		}
 	}
@ -151,19 +314,19 @@ diff -upr -x .deps -x .libs -x '*.la' libical-1.0.old/src/libical/icaltz-util.c
 +	#endif
 }
 
- 
-@@ -256,6 +298,14 @@ icaltzutil_fetch_timezone (const char *l
+ const char *
+@@ -242,6 +280,14 @@ icaltzutil_fetch_timezone (const char *l
 
 	full_path = (char *) malloc (strlen (basedir) + strlen (location) + 2);
 	sprintf (full_path,"%s/%s",basedir, location);
 +	#ifdef WIN32
-+	pos = strlen(basedir);
-+	while(full_path[pos]) {
-+		if (full_path[pos] == '/')
-+			full_path[pos] = '\\';
-+		pos++;
+	i = strlen(basedir);
+	while(full_path[i]) {
+		if (full_path[i] == '/')
+			full_path[i] = '\\';
+		i++;
 +	}
 +	#endif
- 
 	if ((f = fopen (full_path, "rb")) == 0) {
 		icalerror_set_errno (ICAL_FILE_ERROR);
+ 		free (full_path);
--- a/win32/patches/libtasn1.patch
+++ b/win32/patches/libtasn1.patch
@ -1,42 +0,0 @@
-diff -upr libtasn1-3.4.old/config.h libtasn1-3.4/config.h
--- libtasn1-3.4.old/config.h	2014-03-24 22:51:20 +0000
-+++ libtasn1-3.4/config.h	2014-03-24 22:53:52 +0000
-@@ -558,7 +558,7 @@
- #define HAVE_WINSOCK2_H 1
- 
- /* Define to 1 if you have the `_ftelli64' function. */
-#define HAVE__FTELLI64 1
-+#undef HAVE__FTELLI64
- 
- /* Define to 1 if you have the `_ftime' function. */
- #define HAVE__FTIME 1
-diff -upr libtasn1-3.4.old/gl/msvc-inval.c libtasn1-3.4/gl/msvc-inval.c
--- libtasn1-3.4.old/gl/msvc-inval.c	2014-03-24 22:52:55 +0000
-+++ libtasn1-3.4/gl/msvc-inval.c	2014-03-24 22:50:23 +0000
-@@ -28,7 +28,7 @@
- 
- # if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING
- 
-static void cdecl
-+static void __cdecl
- gl_msvc_invalid_parameter_handler (const wchar_t *expression,
-                                    const wchar_t *function,
-                                    const wchar_t *file,
-@@ -45,7 +45,7 @@ gl_msvc_invalid_parameter_handler (const
- 
- #  if defined _MSC_VER
- 
-static void cdecl
-+static void __cdecl
- gl_msvc_invalid_parameter_handler (const wchar_t *expression,
-                                    const wchar_t *function,
-                                    const wchar_t *file,
-@@ -94,7 +94,7 @@ gl_msvc_inval_current (void)
-     }
- }
- 
-static void cdecl
-+static void __cdecl
- gl_msvc_invalid_parameter_handler (const wchar_t *expression,
-                                    const wchar_t *function,
-                                    const wchar_t *file,
--- a/win32/patches/nettle.patch
+++ b/win32/patches/nettle.patch
@ -0,0 +1,69 @@
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' nettle-3.1/config.h.in nettle-3.1.new/config.h.in
+--- nettle-3.1/config.h.in	2015-04-07 19:00:08 +0000
+++ nettle-3.1.new/config.h.in	2015-07-05 18:55:52 +0000
+@@ -142,9 +142,6 @@
+ /* The size of `short', as computed by sizeof. */
+ #undef SIZEOF_SHORT
+ 
+-/* The size of `size_t', as computed by sizeof. */
+-#undef SIZEOF_SIZE_T
+-
+ /* The size of `void*', as computed by sizeof. */
+ #undef SIZEOF_VOIDP
+ 
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' nettle-3.1/configure nettle-3.1.new/configure
+--- nettle-3.1/configure	2015-04-07 19:00:08 +0000
+++ nettle-3.1.new/configure	2015-07-05 18:54:38 +0000
+@@ -5444,39 +5444,7 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+ 
+ 
+-# The cast to long int works around a bug in the HP C Compiler
+-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-# This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
+-$as_echo_n "checking size of size_t... " >&6; }
+-if ${ac_cv_sizeof_size_t+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"; then :
+-
+-else
+-  if test "$ac_cv_type_size_t" = yes; then
+-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error 77 "cannot compute sizeof (size_t)
+-See \`config.log' for more details" "$LINENO" 5; }
+-   else
+-     ac_cv_sizeof_size_t=0
+-   fi
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
+-$as_echo "$ac_cv_sizeof_size_t" >&6; }
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+-_ACEOF
+-
+-
+#AC_CHECK_SIZEOF(size_t)
+ 
+ for ac_header in openssl/blowfish.h openssl/des.h openssl/cast.h openssl/aes.h openssl/ecdsa.h
+ do :
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' nettle-3.1/configure.ac nettle-3.1.new/configure.ac
+--- nettle-3.1/configure.ac	2015-04-07 19:00:08 +0000
+++ nettle-3.1.new/configure.ac	2015-07-05 18:53:40 +0000
+@@ -183,7 +183,7 @@ AC_TYPE_UID_T
+ AC_TYPE_SIZE_T
+ AC_HEADER_TIME
+ AC_CHECK_SIZEOF(long)
+-AC_CHECK_SIZEOF(size_t)
+#AC_CHECK_SIZEOF(size_t)
+ 
+ AC_CHECK_HEADERS([openssl/blowfish.h openssl/des.h openssl/cast.h openssl/aes.h openssl/ecdsa.h],,
+ [enable_openssl=no
--- a/win32/patches/openldap.patch
+++ b/win32/patches/openldap.patch
@ -1,7 +1,7 @@
-diff -upr openldap-2.4.9.old/Makefile openldap-2.4.9/Makefile
--- openldap-2.4.9.old/Makefile	2014-03-26 05:17:05 +0000
-+++ openldap-2.4.9/Makefile	2014-03-26 21:20:23 +0000
-@@ -264,7 +264,7 @@ FORCE:
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' openldap-2.4.39.old/Makefile openldap-2.4.39/Makefile
+--- openldap-2.4.39.old/Makefile	2015-07-06 18:34:49 +0000
+++ openldap-2.4.39/Makefile	2015-07-06 17:28:46 +0000
+@@ -266,7 +266,7 @@ FORCE:
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
@ -10,9 +10,9 @@ diff -upr openldap-2.4.9.old/Makefile openldap-2.4.9/Makefile
 CLEANDIRS=
 INSTALLDIRS= 
 
-diff -upr openldap-2.4.9.old/Makefile.in openldap-2.4.9/Makefile.in
--- openldap-2.4.9.old/Makefile.in	2014-03-26 05:17:05 +0000
-+++ openldap-2.4.9/Makefile.in	2014-03-26 21:20:00 +0000
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' openldap-2.4.39.old/Makefile.in openldap-2.4.39/Makefile.in
+--- openldap-2.4.39.old/Makefile.in	2015-07-06 18:34:49 +0000
+++ openldap-2.4.39/Makefile.in	2015-07-06 17:28:46 +0000
@@ -13,7 +13,7 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
@ -22,22 +22,34 @@ diff -upr openldap-2.4.9.old/Makefile.in openldap-2.4.9/Makefile.in
 CLEANDIRS=
 INSTALLDIRS= 
 
-diff -upr openldap-2.4.9.old/include/ldap_pvt_thread.h openldap-2.4.9/include/ldap_pvt_thread.h
--- openldap-2.4.9.old/include/ldap_pvt_thread.h	2014-03-26 05:17:20 +0000
-+++ openldap-2.4.9/include/ldap_pvt_thread.h	2014-03-26 21:19:42 +0000
-@@ -61,7 +61,7 @@ ldap_pvt_thread_set_concurrency LDAP_P((
- #define	LDAP_PVT_THREAD_SET_STACK_SIZE
- #ifndef LDAP_PVT_THREAD_STACK_SIZE
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' openldap-2.4.39.old/include/ldap.h openldap-2.4.39/include/ldap.h
+--- openldap-2.4.39.old/include/ldap.h	2014-01-25 13:36:15 +0000
+++ openldap-2.4.39/include/ldap.h	2015-07-06 18:47:29 +0000
+@@ -2211,7 +2211,7 @@ ldap_parse_vlvresponse_control LDAP_P((
+ 	ber_int_t *target_posp,
+ 	ber_int_t *list_countp,
+ 	struct berval **contextp,
+-	int           *errcodep ));
+	ber_int_t     *errcodep ));
+ 
+ /*
+  * LDAP Who Am I?
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' openldap-2.4.39.old/include/ldap_pvt_thread.h openldap-2.4.39/include/ldap_pvt_thread.h
+--- openldap-2.4.39.old/include/ldap_pvt_thread.h	2015-07-06 18:34:49 +0000
+++ openldap-2.4.39/include/ldap_pvt_thread.h	2015-07-06 17:28:50 +0000
+@@ -68,7 +68,7 @@ ldap_pvt_thread_set_concurrency LDAP_P((
+ #	undef LDAP_PVT_THREAD_SET_STACK_SIZE
+ #elif !defined( LDAP_PVT_THREAD_STACK_SIZE )
 	/* LARGE stack. Will be twice as large on 64 bit machine. */
-#define LDAP_PVT_THREAD_STACK_SIZE	( 1 * 1024 * 1024 * sizeof(void *) )
-+#define LDAP_PVT_THREAD_STACK_SIZE	( 1 * 1024 * 1024 * 4 )
- /* May be explicitly defined to zero to disable it */
- #elif LDAP_PVT_THREAD_STACK_SIZE == 0
- #undef LDAP_PVT_THREAD_SET_STACK_SIZE
-diff -upr openldap-2.4.9.old/include/portable.h openldap-2.4.9/include/portable.h
--- openldap-2.4.9.old/include/portable.h	2014-03-26 05:17:20 +0000
-+++ openldap-2.4.9/include/portable.h	2014-03-26 21:19:42 +0000
-@@ -1086,7 +1086,7 @@
+-#	define LDAP_PVT_THREAD_STACK_SIZE ( 1 * 1024 * 1024 * sizeof(void *) )
+#	define LDAP_PVT_THREAD_STACK_SIZE ( 1 * 1024 * 1024 * 8 )
+ #endif
+ #endif /* !LDAP_PVT_THREAD_H_DONE */
+ 
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' openldap-2.4.39.old/include/portable.h openldap-2.4.39/include/portable.h
+--- openldap-2.4.39.old/include/portable.h	2015-07-06 18:38:19 +0000
+++ openldap-2.4.39/include/portable.h	2015-07-06 17:28:46 +0000
+@@ -1113,7 +1113,7 @@
 #define snprintf _snprintf
 
 /* Define like ber_socklen_t if <sys/socket.h> does not define. */
@ -46,10 +58,66 @@ diff -upr openldap-2.4.9.old/include/portable.h openldap-2.4.9/include/portable.
 
 /* Define to `signed int' if <sys/types.h> does not define. */
 /* #undef ssize_t */
-diff -upr openldap-2.4.9.old/libraries/libldap_r/Makefile openldap-2.4.9/libraries/libldap_r/Makefile
--- openldap-2.4.9.old/libraries/libldap_r/Makefile	2014-03-26 05:17:20 +0000
-+++ openldap-2.4.9/libraries/libldap_r/Makefile	2014-03-26 21:19:42 +0000
-@@ -304,10 +304,10 @@ LIB_DEFS = -DLDAP_LIBRARY
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' openldap-2.4.39.old/libraries/libldap/tls_g.c openldap-2.4.39/libraries/libldap/tls_g.c
+--- openldap-2.4.39.old/libraries/libldap/tls_g.c	2014-01-25 13:36:15 +0000
+++ openldap-2.4.39/libraries/libldap/tls_g.c	2015-07-06 19:13:40 +0000
+@@ -158,7 +158,9 @@ static struct gcry_thread_cbs tlsg_threa
+ static void
+ tlsg_thr_init( void )
+ {
+	#if LIBGNUTLS_VERSION_NUMBER <= 0x020b00
+ 	gcry_control (GCRYCTL_SET_THREAD_CBS, &tlsg_thread_cbs);
+	#endif
+ }
+ #endif /* LDAP_R_COMPILE */
+ 
+@@ -168,7 +170,7 @@ tlsg_thr_init( void )
+ static int
+ tlsg_init( void )
+ {
+-#ifdef HAVE_GCRYPT_RAND
+#if defined(HAVE_GCRYPT_RAND) && LIBGNUTLS_VERSION_NUMBER <= 0x020b00
+ 	struct ldapoptions *lo = LDAP_INT_GLOBAL_OPT();
+ 	if ( lo->ldo_tls_randfile &&
+ 		gcry_control( GCRYCTL_SET_RNDEGD_SOCKET, lo->ldo_tls_randfile )) {
+@@ -368,23 +370,24 @@ tlsg_ctx_init( struct ldapoptions *lo, s
+ 		 * then we have to build the cert chain.
+ 		 */
+ 		if ( max == 1 && !gnutls_x509_crt_check_issuer( certs[0], certs[0] )) {
+-			gnutls_x509_crt_t *cas;
+-			unsigned int i, j, ncas;
+			unsigned int i;
+ 
+-			gnutls_certificate_get_x509_cas( ctx->cred, &cas, &ncas );
+			/*gnutls_certificate_get_x509_cas( ctx->cred, &cas, &ncas );*/
+ 			for ( i = 1; i<VERIFY_DEPTH; i++ ) {
+-				for ( j = 0; j<ncas; j++ ) {
+-					if ( gnutls_x509_crt_check_issuer( certs[i-1], cas[j] )) {
+-						certs[i] = cas[j];
+				int found = 0;
+				gnutls_x509_crt_t issuer;
+				if (gnutls_certificate_get_issuer(ctx->cred, certs[i-1], &issuer, GNUTLS_TL_GET_COPY) == GNUTLS_E_SUCCESS) {
+					if ( gnutls_x509_crt_check_issuer( certs[i-1], issuer )) {
+						certs[i] = issuer;
+ 						max++;
+ 						/* If this CA is self-signed, we're done */
+-						if ( gnutls_x509_crt_check_issuer( cas[j], cas[j] ))
+-							j = ncas;
+						if ( gnutls_x509_crt_check_issuer( issuer, issuer ))
+							found = 1;
+ 						break;
+ 					}
+ 				}
+ 				/* only continue if we found a CA and it was not self-signed */
+-				if ( j == ncas )
+				if ( found )
+ 					break;
+ 			}
+ 		}
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' openldap-2.4.39.old/libraries/libldap_r/Makefile openldap-2.4.39/libraries/libldap_r/Makefile
+--- openldap-2.4.39.old/libraries/libldap_r/Makefile	2015-07-06 18:34:49 +0000
+++ openldap-2.4.39/libraries/libldap_r/Makefile	2015-07-06 17:28:46 +0000
+@@ -310,10 +310,10 @@ LIB_DEFS = -DLDAP_LIBRARY
 
 XDEFS = -DLDAP_R_COMPILE -I$(XXDIR)
 XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A)
@ -63,10 +131,10 @@ diff -upr openldap-2.4.9.old/libraries/libldap_r/Makefile openldap-2.4.9/librari
 
 .links : Makefile
 	@for i in $(XXSRCS); do \
-diff -upr openldap-2.4.9.old/libraries/libldap_r/Makefile.in openldap-2.4.9/libraries/libldap_r/Makefile.in
--- openldap-2.4.9.old/libraries/libldap_r/Makefile.in	2014-03-26 05:17:20 +0000
-+++ openldap-2.4.9/libraries/libldap_r/Makefile.in	2014-03-26 21:19:42 +0000
-@@ -53,10 +53,10 @@ LIB_DEFS = -DLDAP_LIBRARY
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' openldap-2.4.39.old/libraries/libldap_r/Makefile.in openldap-2.4.39/libraries/libldap_r/Makefile.in
+--- openldap-2.4.39.old/libraries/libldap_r/Makefile.in	2015-07-06 18:34:49 +0000
+++ openldap-2.4.39/libraries/libldap_r/Makefile.in	2015-07-06 17:28:46 +0000
+@@ -57,10 +57,10 @@ LIB_DEFS = -DLDAP_LIBRARY
 
 XDEFS = -DLDAP_R_COMPILE -I$(XXDIR)
 XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A)
--- a/win32/patches/p11-kit.patch
+++ b/win32/patches/p11-kit.patch
@ -1,60 +1,11 @@
-diff -upr p11-kit-98292d6bbc.old/configure.ac p11-kit-98292d6bbc/configure.ac
--- p11-kit-98292d6bbc.old/configure.ac	2014-03-24 21:44:56 +0000
-+++ p11-kit-98292d6bbc/configure.ac	2014-03-24 20:45:41 +0000
-@@ -22,7 +22,7 @@ P11KIT_AGE=0
- AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_MACRO_DIR([build/m4])
- AC_CONFIG_AUX_DIR([build/litter])
-AM_INIT_AUTOMAKE([1.10 foreign serial-tests])
-+AM_INIT_AUTOMAKE([1.10 foreign])
- AM_SANITY_CHECK
- AM_MAINTAINER_MODE([enable])
- m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
-diff -upr p11-kit-98292d6bbc.old/common/compat.c p11-kit-98292d6bbc/common/compat.c
--- p11-kit-98292d6bbc.old/common/compat.c	2014-03-26 05:06:34 +0000
-+++ p11-kit-98292d6bbc/common/compat.c	2014-03-26 05:04:47 +0000
-@@ -840,7 +840,17 @@ strerror_r (int errnum,
-             size_t buflen)
- {
- #ifdef OS_WIN32
-+	#ifdef __MINGW32__
-+	char *str = strerror (errnum);
-+	if (!str) {
-+		*buf = 0;
-+		return EINVAL;
-+	}
-+	strncpy (buf, str, buflen);
-+	return 0;
-+	#else
- 	return strerror_s (buf, buflen, errnum);
-+	#endif
- #else
- 	#error no strerror_r implementation
- #endif
-diff -upr p11-kit-98292d6bbc.old/p11-kit/Makefile.am p11-kit-98292d6bbc/p11-kit/Makefile.am
--- p11-kit-98292d6bbc.old/p11-kit/Makefile.am	2014-03-26 05:06:05 +0000
-+++ p11-kit-98292d6bbc/p11-kit/Makefile.am	2014-03-24 23:17:41 +0000
-@@ -98,6 +98,11 @@ libp11_kit_testable_la_CFLAGS = \
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' p11-kit-ec9e2450ba/p11-kit/Makefile.am p11-kit-ec9e2450ba.new/p11-kit/Makefile.am
+--- p11-kit-ec9e2450ba/p11-kit/Makefile.am	2015-02-20 20:28:59 +0000
+++ p11-kit-ec9e2450ba.new/p11-kit/Makefile.am	2015-07-06 16:01:39 +0000
+@@ -73,6 +73,7 @@ libp11_kit_testable_la_CFLAGS = \
 	$(LIBFFI_CFLAGS) \
 	$(NULL)
 
-+# Proxy module is actually same as library, so install a link
-+install-exec-hook:
-+	$(LN_S) -f `readlink $(DESTDIR)$(libdir)/libp11-kit.so` $(DESTDIR)$(libdir)/p11-kit-proxy.so
-+	$(MKDIR_P) $(DESTDIR)$(p11_package_config_modules)
-+
- endif
- 
- pkgconfigdir = $(libdir)/pkgconfig
-@@ -112,11 +117,6 @@ EXTRA_DIST = \
- 	docs.h \
- 	$(NULL)
- 
-# Proxy module is actually same as library, so install a link
-install-exec-hook:
-	$(LN_S) -f `readlink $(DESTDIR)$(libdir)/libp11-kit.so` $(DESTDIR)$(libdir)/p11-kit-proxy.so
-	$(MKDIR_P) $(DESTDIR)$(p11_package_config_modules)
-
- bin_PROGRAMS = \
- 	p11-kit
+libp11_kit_la_LIBADD += -lws2_32
+ else
 
+ libp11_kit_testable_la_CFLAGS = \
--- a/win32/patches/webkitgtk.patch
+++ b/win32/patches/webkitgtk.patch
@ -1,727 +0,0 @@
-diff -upr -x .deps -x .libs -x '*.la' webkitgtk-2.4.1.old/Source/JavaScriptCore/jit/JITStubsX86.h webkitgtk-2.4.1/Source/JavaScriptCore/jit/JITStubsX86.h
--- webkitgtk-2.4.1.old/Source/JavaScriptCore/jit/JITStubsX86.h	2014-06-20 20:05:59 +0000
-+++ webkitgtk-2.4.1/Source/JavaScriptCore/jit/JITStubsX86.h	2014-06-20 19:42:30 +0000
-@@ -32,6 +32,7 @@
- #define JITStubsX86_h
- 
- #include "JITStubsX86Common.h"
-+#include <wtf/InlineASM.h>
- 
- #if !CPU(X86)
- #error "JITStubsX86.h should only be #included if CPU(X86)"
-@@ -198,6 +199,225 @@ SYMBOL_STRING(ctiMasmProbeTrampolineEnd)
- );
- #endif // USE(MASM_PROBE)
- 
-+#if OS(WINDOWS) && ENABLE(JIT)
-+extern "C" {
-+
-+    // FIXME: Since Windows doesn't use the LLInt, we have inline stubs here.
-+    // Until the LLInt is changed to support Windows, these stub needs to be updated.
-+    asm (
-+        ".globl " SYMBOL_STRING(callToJavaScript) "\n"
-+        HIDE_SYMBOL(callToJavaScript) "\n"
-+        SYMBOL_STRING(callToJavaScript) ":" "\n"
-+            "mov    (%esp),%edx" "\n"
-+            "push   %ebp" "\n"
-+            "mov    %ebp,%eax" "\n"
-+            "mov    %esp,%ebp" "\n"
-+            "push   %esi" "\n"
-+            "push   %edi" "\n"
-+            "push   %ebx" "\n"
-+            "sub    $0x1c,%esp" "\n"
-+            "mov    0x34(%esp),%ecx" "\n"
-+            "mov    0x38(%esp),%esi" "\n"
-+            "mov    0x3c(%esp),%ebp" "\n"
-+            "sub    $0x20,%ebp" "\n"
-+            "movl   $0x0,0x24(%ebp)" "\n"
-+            "movl   $0x0,0x20(%ebp)" "\n"
-+            "movl   $0x0,0x1c(%ebp)" "\n"
-+            "mov    %ecx,0x18(%ebp)" "\n"
-+            "mov    (%ecx),%ebx" "\n"
-+            "movl   $0x0,0x14(%ebp)" "\n"
-+            "mov    %ebx,0x10(%ebp)" "\n"
-+            "movl   $0x0,0xc(%ebp)" "\n"
-+            "movl   $0x1,0x8(%ebp)" "\n"
-+            "mov    %edx,0x4(%ebp)" "\n"
-+            "mov    %eax,0x0(%ebp)" "\n"
-+            "mov    %ebp,%eax" "\n"
-+
-+            "mov    0x28(%esi),%edx" "\n"
-+            "add    $0x5,%edx" "\n"
-+            "shl    $0x3,%edx" "\n"
-+            "sub    %edx,%ebp" "\n"
-+            "mov    %eax,0x0(%ebp)" "\n"
-+
-+            "mov    $0x5,%eax" "\n"
-+
-+        ".copyHeaderLoop:" "\n"
-+            "sub    $0x1,%eax" "\n"
-+            "mov    (%esi,%eax,8),%ecx" "\n"
-+            "mov    %ecx,0x8(%ebp,%eax,8)" "\n"
-+            "mov    0x4(%esi,%eax,8),%ecx" "\n"
-+            "mov    %ecx,0xc(%ebp,%eax,8)" "\n"
-+            "test   %eax,%eax" "\n"
-+            "jne .copyHeaderLoop" "\n"
-+
-+            "mov    0x18(%esi),%edx" "\n"
-+            "sub    $0x1,%edx" "\n"
-+            "mov    0x28(%esi),%ecx" "\n"
-+            "sub    $0x1,%ecx" "\n"
-+
-+            "cmp    %ecx,%edx" "\n"
-+            "je .copyArgs" "\n"
-+
-+            "xor    %eax,%eax" "\n"
-+            "mov    $0xfffffffc,%ebx" "\n"
-+
-+        ".fillExtraArgsLoop:" "\n"
-+            "sub    $0x1,%ecx" "\n"
-+            "mov    %eax,0x30(%ebp,%ecx,8)" "\n"
-+            "mov    %ebx,0x34(%ebp,%ecx,8)" "\n"
-+            "cmp    %ecx,%edx" "\n"
-+            "jne .fillExtraArgsLoop" "\n"
-+
-+        ".copyArgs:" "\n"
-+            "mov    0x2c(%esi),%eax" "\n"
-+
-+        ".copyArgsLoop:" "\n"
-+            "test   %edx,%edx" "\n"
-+            "je .copyArgsDone" "\n"
-+            "sub    $0x1,%edx" "\n"
-+            "mov    (%eax,%edx,8),%ecx" "\n"
-+            "mov    0x4(%eax,%edx,8),%ebx" "\n"
-+            "mov    %ecx,0x30(%ebp,%edx,8)" "\n"
-+            "mov    %ebx,0x34(%ebp,%edx,8)" "\n"
-+            "jmp .copyArgsLoop" "\n"
-+
-+        ".copyArgsDone:" "\n"
-+            "mov    0x34(%esp),%ecx" "\n"
-+            "mov    %ebp,(%ecx)" "\n"
-+
-+            "call   *0x30(%esp)" "\n"
-+
-+            "cmpl   $0x1,0x8(%ebp)" "\n"
-+            "je .calleeFramePopped" "\n"
-+            "mov    0x0(%ebp),%ebp" "\n"
-+
-+        ".calleeFramePopped:" "\n"
-+            "mov    0x18(%ebp),%ecx" "\n"
-+            "mov    0x10(%ebp),%ebx" "\n"
-+            "mov    %ebx,(%ecx)" "\n"
-+
-+            "add    $0x1c,%esp" "\n"
-+            "pop    %ebx" "\n"
-+            "pop    %edi" "\n"
-+            "pop    %esi" "\n"
-+            "pop    %ebp" "\n"
-+            "ret" "\n"
-+
-+        ".globl " SYMBOL_STRING(returnFromJavaScript) "\n"
-+        HIDE_SYMBOL(returnFromJavaScript) "\n"
-+        SYMBOL_STRING(returnFromJavaScript) ":" "\n"
-+            "add    $0x1c,%esp" "\n"
-+            "pop    %ebx" "\n"
-+            "pop    %edi" "\n"
-+            "pop    %esi" "\n"
-+            "pop    %ebp" "\n"
-+            "ret" "\n"
-+
-+        ".globl " SYMBOL_STRING(callToNativeFunction) "\n"
-+        HIDE_SYMBOL(callToNativeFunction) "\n"
-+        SYMBOL_STRING(callToNativeFunction) ":" "\n"
-+            "mov    (%esp),%edx" "\n"
-+            "push   %ebp" "\n"
-+            "mov    %ebp,%eax" "\n"
-+            "mov    %esp,%ebp" "\n"
-+            "push   %esi" "\n"
-+            "push   %edi" "\n"
-+            "push   %ebx" "\n"
-+            "sub    $0x1c,%esp" "\n"
-+            "mov    0x34(%esp),%ecx" "\n"
-+            "mov    0x38(%esp),%esi" "\n"
-+            "mov    0x3c(%esp),%ebp" "\n"
-+            "sub    $0x20,%ebp" "\n"
-+            "movl   $0x0,0x24(%ebp)" "\n"
-+            "movl   $0x0,0x20(%ebp)" "\n"
-+            "movl   $0x0,0x1c(%ebp)" "\n"
-+            "mov    %ecx,0x18(%ebp)" "\n"
-+            "mov    (%ecx),%ebx" "\n"
-+            "movl   $0x0,0x14(%ebp)" "\n"
-+            "mov    %ebx,0x10(%ebp)" "\n"
-+            "movl   $0x0,0xc(%ebp)" "\n"
-+            "movl   $0x1,0x8(%ebp)" "\n"
-+            "mov    %edx,0x4(%ebp)" "\n"
-+            "mov    %eax,0x0(%ebp)" "\n"
-+            "mov    %ebp,%eax" "\n"
-+
-+            "mov    0x28(%esi),%edx" "\n"
-+            "add    $0x5,%edx" "\n"
-+            "shl    $0x3,%edx" "\n"
-+            "sub    %edx,%ebp" "\n"
-+            "mov    %eax,0x0(%ebp)" "\n"
-+
-+            "mov    $0x5,%eax" "\n"
-+
-+        "copyHeaderLoop:" "\n"
-+            "sub    $0x1,%eax" "\n"
-+            "mov    (%esi,%eax,8),%ecx" "\n"
-+            "mov    %ecx,0x8(%ebp,%eax,8)" "\n"
-+            "mov    0x4(%esi,%eax,8),%ecx" "\n"
-+            "mov    %ecx,0xc(%ebp,%eax,8)" "\n"
-+            "test   %eax,%eax" "\n"
-+            "jne copyHeaderLoop" "\n"
-+
-+            "mov    0x18(%esi),%edx" "\n"
-+            "sub    $0x1,%edx" "\n"
-+            "mov    0x28(%esi),%ecx" "\n"
-+            "sub    $0x1,%ecx" "\n"
-+
-+            "cmp    %ecx,%edx" "\n"
-+            "je copyArgs" "\n"
-+
-+            "xor    %eax,%eax" "\n"
-+            "mov    $0xfffffffc,%ebx" "\n"
-+
-+        "fillExtraArgsLoop:" "\n"
-+            "sub    $0x1,%ecx" "\n"
-+            "mov    %eax,0x30(%ebp,%ecx,8)" "\n"
-+            "mov    %ebx,0x34(%ebp,%ecx,8)" "\n"
-+            "cmp    %ecx,%edx" "\n"
-+            "jne fillExtraArgsLoop" "\n"
-+
-+        "copyArgs:" "\n"
-+            "mov    0x2c(%esi),%eax" "\n"
-+
-+        "copyArgsLoop:" "\n"
-+            "test   %edx,%edx" "\n"
-+            "je copyArgsDone" "\n"
-+            "sub    $0x1,%edx" "\n"
-+            "mov    (%eax,%edx,8),%ecx" "\n"
-+            "mov    0x4(%eax,%edx,8),%ebx" "\n"
-+            "mov    %ecx,0x30(%ebp,%edx,8)" "\n"
-+            "mov    %ebx,0x34(%ebp,%edx,8)" "\n"
-+            "jmp copyArgsLoop" "\n"
-+
-+        "copyArgsDone:" "\n"
-+            "mov    0x34(%esp),%ecx" "\n"
-+            "mov    %ebp,(%ecx)" "\n"
-+
-+            "mov    0x30(%esp),%edi" "\n"
-+            "mov    %ebp,0x30(%esp)" "\n"
-+            "mov    %ebp,%ecx" "\n"
-+            "call   *%edi" "\n"
-+
-+            "cmpl   $0x1,0x8(%ebp)" "\n"
-+            "je calleeFramePopped" "\n"
-+            "mov    0x0(%ebp),%ebp" "\n"
-+
-+        "calleeFramePopped:" "\n"
-+            "mov    0x18(%ebp),%ecx" "\n"
-+            "mov    0x10(%ebp),%ebx" "\n"
-+            "mov    %ebx,(%ecx)" "\n"
-+
-+            "add    $0x1c,%esp" "\n"
-+            "pop    %ebx" "\n"
-+            "pop    %edi" "\n"
-+            "pop    %esi" "\n"
-+            "pop    %ebp" "\n"
-+            "ret" "\n"
-+        );
-+}
-+
-+#endif // OS(WINDOWS) && ENABLE(JIT)
-+
- #endif // COMPILER(GCC)
- 
- #if COMPILER(MSVC)
-diff -upr -x .deps -x .libs -x '*.la' webkitgtk-2.4.1.old/Source/ThirdParty/ANGLE/GNUmakefile.am webkitgtk-2.4.1/Source/ThirdParty/ANGLE/GNUmakefile.am
--- webkitgtk-2.4.1.old/Source/ThirdParty/ANGLE/GNUmakefile.am	2014-06-20 20:05:59 +0000
-+++ webkitgtk-2.4.1/Source/ThirdParty/ANGLE/GNUmakefile.am	2014-05-24 05:04:11 +0000
-@@ -80,7 +80,6 @@ libANGLE_la_SOURCES = \
- 	Source/ThirdParty/ANGLE/src/compiler/MMap.h \
- 	Source/ThirdParty/ANGLE/src/compiler/NodeSearch.h \
- 	Source/ThirdParty/ANGLE/src/compiler/osinclude.h \
-	Source/ThirdParty/ANGLE/src/compiler/ossource_posix.cpp \
- 	Source/ThirdParty/ANGLE/src/compiler/OutputESSL.cpp \
- 	Source/ThirdParty/ANGLE/src/compiler/OutputESSL.h \
- 	Source/ThirdParty/ANGLE/src/compiler/OutputGLSLBase.cpp \
-@@ -161,3 +160,11 @@ libANGLE_la_SOURCES = \
- 	Source/ThirdParty/ANGLE/src/compiler/VersionGLSL.h \
- 	Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.cpp \
- 	Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.h
-+
-+if OS_WIN32
-+libANGLE_la_SOURCES += \
-+	Source/ThirdParty/ANGLE/src/compiler/ossource_win.cpp
-+else
-+libANGLE_la_SOURCES += \
-+	Source/ThirdParty/ANGLE/src/compiler/ossource_posix.cpp
-+endif
-diff -upr -x .deps -x .libs -x '*.la' webkitgtk-2.4.1.old/Source/ThirdParty/ANGLE/src/compiler/ossource_win.cpp webkitgtk-2.4.1/Source/ThirdParty/ANGLE/src/compiler/ossource_win.cpp
--- webkitgtk-2.4.1.old/Source/ThirdParty/ANGLE/src/compiler/ossource_win.cpp	2014-07-12 16:07:30 +0000
-+++ webkitgtk-2.4.1/Source/ThirdParty/ANGLE/src/compiler/ossource_win.cpp	2014-05-24 05:04:11 +0000
-@@ -0,0 +1,57 @@
-+//
-+// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+//
-+
-+#include "compiler/osinclude.h"
-+//
-+// This file contains contains the window's specific functions
-+//
-+
-+#if !defined(ANGLE_OS_WIN)
-+#error Trying to build a windows specific file in a non windows build.
-+#endif
-+
-+
-+//
-+// Thread Local Storage Operations
-+//
-+OS_TLSIndex OS_AllocTLSIndex()
-+{
-+	DWORD dwIndex = TlsAlloc();
-+	if (dwIndex == TLS_OUT_OF_INDEXES) {
-+		assert(0 && "OS_AllocTLSIndex(): Unable to allocate Thread Local Storage");
-+		return OS_INVALID_TLS_INDEX;
-+	}
-+
-+	return dwIndex;
-+}
-+
-+
-+bool OS_SetTLSValue(OS_TLSIndex nIndex, void *lpvValue)
-+{
-+	if (nIndex == OS_INVALID_TLS_INDEX) {
-+		assert(0 && "OS_SetTLSValue(): Invalid TLS Index");
-+		return false;
-+	}
-+
-+	if (TlsSetValue(nIndex, lpvValue))
-+		return true;
-+	else
-+		return false;
-+}
-+
-+
-+bool OS_FreeTLSIndex(OS_TLSIndex nIndex)
-+{
-+	if (nIndex == OS_INVALID_TLS_INDEX) {
-+		assert(0 && "OS_SetTLSValue(): Invalid TLS Index");
-+		return false;
-+	}
-+
-+	if (TlsFree(nIndex))
-+		return true;
-+	else
-+		return false;
-+}
-diff -upr -x .deps -x .libs -x '*.la' webkitgtk-2.4.1.old/Source/WTF/GNUmakefile.list.am webkitgtk-2.4.1/Source/WTF/GNUmakefile.list.am
--- webkitgtk-2.4.1.old/Source/WTF/GNUmakefile.list.am	2014-05-18 16:44:48 +0000
-+++ webkitgtk-2.4.1/Source/WTF/GNUmakefile.list.am	2014-05-24 05:09:00 +0000
-@@ -256,3 +256,8 @@ wtf_sources += \
-     Source/WTF/wtf/unicode/UnicodeMacrosFromICU.h \
-     Source/WTF/wtf/unicode/icu/CollatorICU.cpp \
-     Source/WTF/wtf/unicode/icu/UnicodeIcu.h
-+
-+if TARGET_WIN32
-+wtf_sources += \
-+    Source/WTF/wtf/win/GdiObject.h
-+endif # TARGET_WIN32
-diff -upr -x .deps -x .libs -x '*.la' webkitgtk-2.4.1.old/Source/WTF/wtf/Atomics.h webkitgtk-2.4.1/Source/WTF/wtf/Atomics.h
--- webkitgtk-2.4.1.old/Source/WTF/wtf/Atomics.h	2014-06-20 20:05:59 +0000
-+++ webkitgtk-2.4.1/Source/WTF/wtf/Atomics.h	2014-05-28 18:01:59 +0000
-@@ -260,7 +260,7 @@ inline void memoryBarrierBeforeUnlock()
- inline bool weakCompareAndSwap(uint8_t* location, uint8_t expected, uint8_t newValue)
- {
- #if ENABLE(COMPARE_AND_SWAP)
-#if !OS(WINDOWS) && (CPU(X86) || CPU(X86_64))
-+#if !COMPILER(MSVC) && (CPU(X86) || CPU(X86_64))
-     unsigned char result;
-     asm volatile(
-         "lock; cmpxchgb %3, %2\n\t"
-diff -upr -x .deps -x .libs -x '*.la' webkitgtk-2.4.1.old/Source/WTF/wtf/MathExtras.h webkitgtk-2.4.1/Source/WTF/wtf/MathExtras.h
--- webkitgtk-2.4.1.old/Source/WTF/wtf/MathExtras.h	2014-06-20 20:05:59 +0000
-+++ webkitgtk-2.4.1/Source/WTF/wtf/MathExtras.h	2014-05-24 05:04:11 +0000
-@@ -67,6 +67,12 @@ const double piOverFourDouble = M_PI_4;
- const float piOverFourFloat = static_cast<float>(M_PI_4);
- #endif
- 
-+#ifndef M_SQRT2
-+const double sqrtOfTwoDouble = 1.41421356237309504880;
-+#else
-+const double sqrtOfTwoDouble = M_SQRT2;
-+#endif
-+
- #if OS(DARWIN)
- 
- // Work around a bug in the Mac OS X libc where ceil(-0.1) return +0.
-diff -upr -x .deps -x .libs -x '*.la' webkitgtk-2.4.1.old/Source/WTF/wtf/Platform.h webkitgtk-2.4.1/Source/WTF/wtf/Platform.h
--- webkitgtk-2.4.1.old/Source/WTF/wtf/Platform.h	2014-06-20 20:05:59 +0000
-+++ webkitgtk-2.4.1/Source/WTF/wtf/Platform.h	2014-05-24 05:04:11 +0000
-@@ -594,8 +594,6 @@
- #define HAVE_ALIGNED_MALLOC 1
- #define HAVE_ISDEBUGGERPRESENT 1
- 
-#include <WTF/WTFHeaderDetection.h>
-
- #endif
- 
- #if OS(WINDOWS)
-diff -upr -x .deps -x .libs -x '*.la' webkitgtk-2.4.1.old/Source/WTF/wtf/threads/BinarySemaphore.h webkitgtk-2.4.1/Source/WTF/wtf/threads/BinarySemaphore.h
--- webkitgtk-2.4.1.old/Source/WTF/wtf/threads/BinarySemaphore.h	2014-05-18 16:44:58 +0000
-+++ webkitgtk-2.4.1/Source/WTF/wtf/threads/BinarySemaphore.h	2014-05-29 17:02:56 +0000
-@@ -41,12 +41,12 @@ public:
-     WTF_EXPORT_PRIVATE void signal();
-     WTF_EXPORT_PRIVATE bool wait(double absoluteTime);
- 
-#if OS(WINDOWS)
-+#if PLATFORM(WIN)
-     HANDLE event() const { return m_event; }
- #endif
- 
- private:
-#if OS(WINDOWS)
-+#if PLATFORM(WIN)
-     HANDLE m_event;
- #else
-     bool m_isSet;
-diff -upr -x .deps -x .libs -x '*.la' webkitgtk-2.4.1.old/Source/WTF/wtf/win/GDIObject.h webkitgtk-2.4.1/Source/WTF/wtf/win/GDIObject.h
--- webkitgtk-2.4.1.old/Source/WTF/wtf/win/GDIObject.h	2014-07-12 06:21:32 +0000
-+++ webkitgtk-2.4.1/Source/WTF/wtf/win/GDIObject.h	2014-05-24 12:26:42 +0000
-@@ -0,0 +1,131 @@
-+/*
-+ * Copyright (C) 2013 Apple Inc. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
-+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-+ */
-+
-+#ifndef GDIObject_h
-+#define GDIObject_h
-+
-+#include <algorithm>
-+#include <cstddef>
-+#include <memory>
-+#include <windows.h>
-+#include <wtf/Assertions.h>
-+#include <wtf/Noncopyable.h>
-+
-+namespace WTF {
-+
-+template<typename T> void deleteObject(T);
-+
-+template<typename T> class GDIObject {
-+    WTF_MAKE_NONCOPYABLE(GDIObject);
-+public:
-+    GDIObject() : m_object(0) { }
-+    GDIObject(std::nullptr_t) : m_object(0) { }
-+    ~GDIObject() { deleteObject<T>(m_object); }
-+
-+    T get() const { return m_object; }
-+
-+    void clear();
-+    T leak() WARN_UNUSED_RETURN;
-+
-+    bool operator!() const { return !m_object; }
-+
-+    // This conversion operator allows implicit conversion to bool but not to other integer types.
-+    typedef const void* UnspecifiedBoolType;
-+    operator UnspecifiedBoolType() const { return m_object ? reinterpret_cast<UnspecifiedBoolType>(&m_object) : 0; }
-+
-+    GDIObject<T>& operator=(std::nullptr_t) { clear(); return *this; }
-+
-+    GDIObject(GDIObject&&);
-+    template<typename U> GDIObject(GDIObject<U>&&);
-+
-+    GDIObject& operator=(GDIObject&&);
-+    template<typename U> GDIObject& operator=(GDIObject<U>&&);
-+
-+    void swap(GDIObject& o) { std::swap(m_object, o.m_object); }
-+
-+private:
-+    template<typename U> friend GDIObject<U> adoptGDIObject(U);
-+    GDIObject(T object) : m_object(object) { }
-+
-+    GDIObject<T>& operator=(T);
-+
-+    T m_object;
-+};
-+
-+template<typename T> inline void GDIObject<T>::clear()
-+{
-+    T object = m_object;
-+    m_object = 0;
-+    deleteObject(object);
-+}
-+
-+template<typename T> inline T GDIObject<T>::leak()
-+{
-+    T object = m_object;
-+    m_object = 0;
-+    return object;
-+}
-+
-+template<typename T> inline GDIObject<T>::GDIObject(GDIObject<T>&& other)
-+    : m_object(other.leak())
-+{
-+}
-+
-+template<typename T> inline GDIObject<T>& GDIObject<T>::operator=(GDIObject<T>&& other)
-+{
-+    auto object = std::move(other);
-+    swap(object);
-+    return *this;
-+}
-+
-+template<typename T> inline GDIObject<T> adoptGDIObject(T object)
-+{
-+    return GDIObject<T>(object);
-+}
-+
-+template<typename T> inline void swap(GDIObject<T>& a, GDIObject<T>& b)
-+{
-+    a.swap(b);
-+}
-+
-+// Nearly all GDI types use the same DeleteObject call.
-+template<typename T> inline void deleteObject(T object)
-+{
-+    if (object)
-+        ::DeleteObject(object);
-+}
-+
-+template<> inline void deleteObject<HDC>(HDC hdc)
-+{
-+    if (hdc)
-+        ::DeleteDC(hdc);
-+}
-+
-+} // namespace WTF
-+
-+using WTF::GDIObject;
-+using WTF::adoptGDIObject;
-+
-+#endif // GDIObject_h
-diff -upr -x .deps -x .libs -x '*.la' webkitgtk-2.4.1.old/Source/WebCore/GNUmakefile.list.am webkitgtk-2.4.1/Source/WebCore/GNUmakefile.list.am
--- webkitgtk-2.4.1.old/Source/WebCore/GNUmakefile.list.am	2014-06-20 20:05:59 +0000
-+++ webkitgtk-2.4.1/Source/WebCore/GNUmakefile.list.am	2014-05-24 05:09:00 +0000
-@@ -6252,9 +6252,11 @@ webcoregtk_sources += \
- 	Source/WebCore/platform/graphics/glx/GLContextGLX.h
- endif # END USE_GLX
- else
-+if !TARGET_WIN32
- webcore_sources += \
- 	Source/WebCore/plugins/PluginPackageNone.cpp \
- 	Source/WebCore/plugins/PluginViewNone.cpp
-+endif # !TARGET_WIN32
- endif # END TARGET_X11
- 
- if TARGET_X11_OR_WAYLAND
-@@ -6281,9 +6283,12 @@ webcore_sources += \
- 	Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp \
- 	Source/WebCore/platform/graphics/win/GraphicsContextWin.cpp \
- 	Source/WebCore/platform/graphics/win/LocalWindowsContext.h \
-+	Source/WebCore/platform/graphics/win/SharedGDIObject.h \
- 	Source/WebCore/platform/graphics/win/TransformationMatrixWin.cpp \
- 	Source/WebCore/platform/win/BitmapInfo.cpp \
- 	Source/WebCore/platform/win/BitmapInfo.h \
-+	Source/WebCore/platform/win/GDIObjectCounter.cpp \
-+	Source/WebCore/platform/win/GDIObjectCounter.h \
- 	Source/WebCore/platform/win/SystemInfo.cpp \
- 	Source/WebCore/platform/win/SystemInfo.h \
- 	Source/WebCore/platform/win/WebCoreInstanceHandle.cpp \
-diff -upr -x .deps -x .libs -x '*.la' webkitgtk-2.4.1.old/Source/WebCore/bindings/scripts/preprocessor.pm webkitgtk-2.4.1/Source/WebCore/bindings/scripts/preprocessor.pm
--- webkitgtk-2.4.1.old/Source/WebCore/bindings/scripts/preprocessor.pm	2014-06-20 20:05:59 +0000
-+++ webkitgtk-2.4.1/Source/WebCore/bindings/scripts/preprocessor.pm	2014-05-24 05:04:11 +0000
-@@ -51,6 +51,8 @@ sub applyPreprocessor
-             $preprocessor = "/usr/sfw/bin/gcc";
-         } elsif (-x "/usr/bin/clang") {
-             $preprocessor = "/usr/bin/clang";
-+        } elsif ($Config{osname} eq 'msys') {
-+            $preprocessor = "gcc";
-         } else {
-             $preprocessor = "/usr/bin/gcc";
-         }
-@@ -71,7 +73,7 @@ sub applyPreprocessor
-     @macros = map { "-D$_" } @macros;
- 
-     my $pid = 0;
-    if ($Config{osname} eq "cygwin" || $Config{osname} eq 'MSWin32') {
-+    if ($Config{osname} eq "cygwin" || $Config{osname} eq 'MSWin32' || $Config{osname} eq 'msys') {
-         # This call can fail if Windows rebases cygwin, so retry a few times until it succeeds.
-         for (my $tries = 0; !$pid && ($tries < 20); $tries++) {
-             eval {
-diff -upr -x .deps -x .libs -x '*.la' webkitgtk-2.4.1.old/Source/WebCore/dom/make_names.pl webkitgtk-2.4.1/Source/WebCore/dom/make_names.pl
--- webkitgtk-2.4.1.old/Source/WebCore/dom/make_names.pl	2014-06-20 20:05:59 +0000
-+++ webkitgtk-2.4.1/Source/WebCore/dom/make_names.pl	2014-05-24 05:04:11 +0000
-@@ -69,6 +69,8 @@ if ($ENV{CC}) {
-     $gccLocation = "/usr/sfw/bin/gcc";
- } elsif ($Config::Config{"osname"} eq "darwin" && $ENV{SDKROOT}) {
-     chomp($gccLocation = `xcrun -find cc -sdk '$ENV{SDKROOT}'`);
-+} elsif ($Config::Config{"osname"} eq "msys") {
-+    $gccLocation = "gcc";
- } else {
-     $gccLocation = "/usr/bin/cc";
- }
-diff -upr -x .deps -x .libs -x '*.la' webkitgtk-2.4.1.old/Source/WebCore/platform/graphics/FontPlatformData.h webkitgtk-2.4.1/Source/WebCore/platform/graphics/FontPlatformData.h
--- webkitgtk-2.4.1.old/Source/WebCore/platform/graphics/FontPlatformData.h	2014-06-20 20:05:59 +0000
-+++ webkitgtk-2.4.1/Source/WebCore/platform/graphics/FontPlatformData.h	2014-05-24 05:04:11 +0000
-@@ -62,7 +62,6 @@ typedef const struct __CTFont* CTFontRef
- #include <wtf/text/StringImpl.h>
- 
- #if PLATFORM(WIN)
-#include <wtf/win/GDIObject.h>
- typedef struct HFONT__* HFONT;
- #endif
- 
-diff -upr -x .deps -x .libs -x '*.la' webkitgtk-2.4.1.old/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp webkitgtk-2.4.1/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp
--- webkitgtk-2.4.1.old/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp	2014-06-20 20:05:59 +0000
-+++ webkitgtk-2.4.1/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp	2014-05-24 05:04:11 +0000
-@@ -32,6 +32,7 @@
- #include <ft2build.h>
- #include FT_TRUETYPE_TABLES_H
- #include <wtf/text/WTFString.h>
-+#include <wtf/MathExtras.h>
- 
- #if !PLATFORM(EFL)
- #include <gdk/gdk.h>
-@@ -120,7 +121,7 @@ static void rotateCairoMatrixForVertical
-     // combination of rotation (R) and translation (T) applied on the
-     // horizontal matrix (H). V = H . R . T, where R rotates by -90 degrees
-     // and T translates by font size towards y axis.
-    cairo_matrix_rotate(matrix, -M_PI_2);
-+    cairo_matrix_rotate(matrix, -piOverTwoDouble);
-     cairo_matrix_translate(matrix, 0.0, 1.0);
- }
- 
-diff -upr -x .deps -x .libs -x '*.la' webkitgtk-2.4.1.old/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp webkitgtk-2.4.1/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp
--- webkitgtk-2.4.1.old/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp	2014-06-20 20:05:59 +0000
-+++ webkitgtk-2.4.1/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp	2014-05-24 05:09:00 +0000
-@@ -32,6 +32,7 @@
- 
- #include <cairo-win32.h>
- #include "GraphicsContextPlatformPrivateCairo.h"
-+#include <wtf/win/GdiObject.h>
- 
- using namespace std;
- 
-diff -upr -x .deps -x .libs -x '*.la' webkitgtk-2.4.1.old/Source/WebCore/platform/gtk/FileSystemGtk.cpp webkitgtk-2.4.1/Source/WebCore/platform/gtk/FileSystemGtk.cpp
--- webkitgtk-2.4.1.old/Source/WebCore/platform/gtk/FileSystemGtk.cpp	2014-06-20 20:05:59 +0000
-+++ webkitgtk-2.4.1/Source/WebCore/platform/gtk/FileSystemGtk.cpp	2014-05-24 05:04:11 +0000
-@@ -23,6 +23,10 @@
- #include "config.h"
- #include "FileSystem.h"
- 
-+#if OS(WINDOWS)
-+#include <windows.h>
-+#endif
-+
- #include "FileMetadata.h"
- #include "UUID.h"
- #include <gio/gio.h>
-diff -upr -x .deps -x .libs -x '*.la' webkitgtk-2.4.1.old/Source/WebCore/rendering/RenderBlock.h webkitgtk-2.4.1/Source/WebCore/rendering/RenderBlock.h
--- webkitgtk-2.4.1.old/Source/WebCore/rendering/RenderBlock.h	2014-06-20 20:05:59 +0000
-+++ webkitgtk-2.4.1/Source/WebCore/rendering/RenderBlock.h	2014-05-24 15:52:01 +0000
-@@ -613,8 +613,8 @@ public:
-     unsigned m_beingDestroyed : 1;
-     unsigned m_hasMarkupTruncation : 1;
-     unsigned m_hasBorderOrPaddingLogicalWidthChanged : 1;
-    enum LineLayoutPath { UndeterminedPath, SimpleLinesPath, LineBoxesPath, ForceLineBoxesPath };
-     unsigned m_lineLayoutPath : 2;
-+    enum LineLayoutPath { UndeterminedPath, SimpleLinesPath, LineBoxesPath, ForceLineBoxesPath };
-     
-     // RenderRubyBase objects need to be able to split and merge, moving their children around
-     // (calling moveChildTo, moveAllChildrenTo, and makeChildrenNonInline).
-diff -upr -x .deps -x .libs -x '*.la' webkitgtk-2.4.1.old/Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp webkitgtk-2.4.1/Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp
--- webkitgtk-2.4.1.old/Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp	2014-06-20 20:05:59 +0000
-+++ webkitgtk-2.4.1/Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp	2014-05-24 05:04:11 +0000
-@@ -71,8 +71,8 @@ void RenderMathMLMenclose::computePrefer
-     size_t notationalValueSize = notationValues.size();
-     for (size_t i = 0; i < notationalValueSize; i++) {
-         if (notationValues[i] == "circle") {
-            m_minPreferredLogicalWidth = minPreferredLogicalWidth() * float(M_SQRT2);
-            m_maxPreferredLogicalWidth = maxPreferredLogicalWidth() * float(M_SQRT2);
-+            m_minPreferredLogicalWidth = minPreferredLogicalWidth() * float(sqrtOfTwoDouble);
-+            m_maxPreferredLogicalWidth = maxPreferredLogicalWidth() * float(sqrtOfTwoDouble);
-         }
-     }
- 
-@@ -86,7 +86,7 @@ void RenderMathMLMenclose::updateLogical
-     size_t notationalValueSize = notationValues.size();
-     for (size_t i = 0; i < notationalValueSize; i++)
-         if (notationValues[i] == "circle")
-            setLogicalHeight(logicalHeight() * float(M_SQRT2));
-+            setLogicalHeight(logicalHeight() * float(sqrtOfTwoDouble));
- }
- 
- void RenderMathMLMenclose::paint(PaintInfo& info, const LayoutPoint& paintOffset)
-diff -upr -x .deps -x .libs -x '*.la' webkitgtk-2.4.1.old/Source/autotools/FindDependencies.m4 webkitgtk-2.4.1/Source/autotools/FindDependencies.m4
--- webkitgtk-2.4.1.old/Source/autotools/FindDependencies.m4	2014-06-20 20:05:59 +0000
-+++ webkitgtk-2.4.1/Source/autotools/FindDependencies.m4	2014-05-24 05:04:11 +0000
-@@ -109,8 +109,14 @@ case "$host" in
-         UNICODE_LIBS="-licucore"
-         ;;
-     *-*-mingw*)
-        UNICODE_CFLAGS=""
-        UNICODE_LIBS="-licui18n -licuuc"
-+	PKG_CHECK_MODULES(ICU, icu-i18n, ,)
-+	if test "x$ICU_LIBS" = "x" ; then
-+        	UNICODE_CFLAGS=""
-+        	UNICODE_LIBS="-licui18n -licuuc"
-+	else
-+        	UNICODE_CFLAGS="$ICU_CFLAGS"
-+        	UNICODE_LIBS="$ICU_LIBS"
-+	fi
-         AC_CHECK_HEADERS([unicode/uchar.h], [], [AC_MSG_ERROR([Could not find ICU headers.])])
-         ;;
-     *)
-@@ -455,7 +461,14 @@ if test "$found_opengl" = "yes"; then
-         OPENGL_LIBS="-lGLESv2"
-     else
-         acceleration_description="$acceleration_description (gl"
-        OPENGL_LIBS="-lGL"
-+        case "$host" in
-+            *-*-mingw*)
-+                OPENGL_LIBS="-lopengl32"
-+                ;;
-+            *)
-+                OPENGL_LIBS="-lGL"
-+                ;;
-+        esac
-     fi
-     if test "$enable_egl" = "yes"; then
-         acceleration_description="$acceleration_description, egl"
-diff -upr -x .deps -x .libs -x '*.la' webkitgtk-2.4.1.old/Source/autotools/ReadCommandLineArguments.m4 webkitgtk-2.4.1/Source/autotools/ReadCommandLineArguments.m4
--- webkitgtk-2.4.1.old/Source/autotools/ReadCommandLineArguments.m4	2014-06-20 20:05:59 +0000
-+++ webkitgtk-2.4.1/Source/autotools/ReadCommandLineArguments.m4	2014-05-24 05:04:11 +0000
-@@ -83,7 +83,7 @@ AM_WEBKIT_DETERMINE_BUILD_TARGET_STATUS(
- AM_WEBKIT_DETERMINE_BUILD_TARGET_STATUS([directfb], [enable_directfb_target], [build_targets])
- 
- AC_MSG_CHECKING([whether to build for the Win32 target])
-AC_MSG_RESULT([$enable_wayland_target])
-+AC_MSG_RESULT([$enable_win32_target])
- 
- AC_MSG_CHECKING([whether to enable spellcheck support])
- AC_ARG_ENABLE([spellcheck],