# HG changeset patch
# User Michael Goffioul <michael.goffioul@gmail.com>
# Date 1374463992 14400
# Node ID 1c7c6c09022393783af97f9bd95ddd5c89e86dad
# Parent  18c5fa5ce861b23de9971f7118cb719c7c8cc318
[MSVC] enable ATK compilation (and bump version to 2.8.0)

diff -r 18c5fa5ce861 -r 1c7c6c090223 dist-files.mk
--- a/dist-files.mk	Sun Jul 21 22:22:29 2013 -0400
+++ b/dist-files.mk	Sun Jul 21 23:33:12 2013 -0400
@@ -281,6 +281,7 @@
   mingwrt.mk \
   mpfr.mk \
   msitools.mk \
+  msvc-atk-1.patch \
   msvc-build-cmake-1.patch \
   msvc-dbus-1.patch \
   msvc-fftw-1.patch \
diff -r 18c5fa5ce861 -r 1c7c6c090223 index.html
--- a/index.html	Sun Jul 21 22:22:29 2013 -0400
+++ b/index.html	Sun Jul 21 23:33:12 2013 -0400
@@ -950,7 +950,7 @@
     </tr>
     <tr>
         <td id="atk-package">atk</td>
-        <td id="atk-version">2.6.0</td>
+        <td id="atk-version">2.8.0</td>
         <td id="atk-website"><a href="http://www.gtk.org/">ATK</a></td>
     </tr>
     <tr>
diff -r 18c5fa5ce861 -r 1c7c6c090223 src/atk-1-DllMain.patch
--- a/src/atk-1-DllMain.patch	Sun Jul 21 22:22:29 2013 -0400
+++ b/src/atk-1-DllMain.patch	Sun Jul 21 23:33:12 2013 -0400
@@ -1,12 +1,15 @@
 diff -uNr atk-2.2.0-orig/atk/atkobject.c atk-2.2.0/atk/atkobject.c
 --- atk-2.2.0-orig/atk/atkobject.c	2011-09-19 19:06:54.000000000 +0200
 +++ atk-2.2.0/atk/atkobject.c	2012-04-14 20:26:12.763814596 +0200
-@@ -366,7 +366,7 @@
+@@ -369,7 +369,11 @@
  static HMODULE atk_dll;
  
  BOOL WINAPI
--DllMain (HINSTANCE hinstDLL,
++#ifdef DLL_EXPORT
+ DllMain (HINSTANCE hinstDLL,
++#else
 +atk_DllMain (HINSTANCE hinstDLL,
++#endif
  	 DWORD     fdwReason,
  	 LPVOID    lpvReserved)
  {
diff -r 18c5fa5ce861 -r 1c7c6c090223 src/atk.mk
--- a/src/atk.mk	Sun Jul 21 22:22:29 2013 -0400
+++ b/src/atk.mk	Sun Jul 21 23:33:12 2013 -0400
@@ -3,7 +3,7 @@
 
 PKG             := atk
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 951f9cd195dcab855c7779cfcba21153106cb754
+$(PKG)_CHECKSUM := e8a9dacd22b31a6cb733ce66fb1c220cc6720970
 $(PKG)_SUBDIR   := atk-$($(PKG)_VERSION)
 $(PKG)_FILE     := atk-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/atk/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
@@ -23,7 +23,10 @@
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-glibtest \
-        --disable-gtk-doc
+        --disable-gtk-doc \
+        PKG_CONFIG='$(MXE_PKG_CONFIG)' \
+        PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' \
+	&& $(CONFIGURE_POST_HOOK)
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
diff -r 18c5fa5ce861 -r 1c7c6c090223 src/msvc-atk-1.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/msvc-atk-1.patch	Sun Jul 21 23:33:12 2013 -0400
@@ -0,0 +1,24 @@
+diff -ur atk-2.8.0-orig/atk/Makefile.in atk-2.8.0/atk/Makefile.in
+--- atk-2.8.0-orig/atk/Makefile.in	2013-03-26 06:36:53 -0400
++++ atk-2.8.0/atk/Makefile.in	2013-07-21 23:20:26 -0400
+@@ -40,7 +40,7 @@
+ @HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelibs_DATA)
+ 
+ # ---------- Win32 stuff ----------
+-@OS_WIN32_TRUE@am__append_3 = -export-symbols atk.def -no-undefined -Wl,atk-win32-res.o
++@OS_WIN32_TRUE@am__append_3 = -export-symbols-regex "xXx" -Wl,atk.def -no-undefined -Wl,atk-win32-res.o
+ @OS_WIN32_FALSE@libatk_1_0_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ @OS_WIN32_FALSE@	$(am__DEPENDENCIES_1)
+ subdir = atk
+@@ -961,9 +961,9 @@
+ 	  rm -f atkmarshal.h atkmarshal.c atk-enum-types.h atk-enum-types.c; \
+ 	fi
+ 
+-install-data-local: install-ms-lib install-def-file
++#install-data-local: install-ms-lib install-def-file
+ 
+-uninstall-local: uninstall-ms-lib uninstall-def-file
++#uninstall-local: uninstall-ms-lib uninstall-def-file
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.