corrected library dependencies and disabled dangling DLL stuff in packages atk, cairo, fontconfig, glib, gtk and pango

src/atk.mk

@@ -16,6 +16,7 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
+    sed 's,DllMain,static _disabled_DllMain,' -i '$(1)/atk/atkobject.c'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \

src/cairo.mk

@@ -6,7 +6,7 @@ $(PKG)_VERSION := 1.8.6
 $(PKG)_SUBDIR  := cairo-$($(PKG)_VERSION)
 $(PKG)_FILE    := cairo-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL     := http://cairographics.org/releases/$($(PKG)_FILE)
-$(PKG)_DEPS    := gcc zlib libpng fontconfig freetype pthreads
+$(PKG)_DEPS    := gcc zlib libpng fontconfig freetype pthreads pixman
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://cairographics.org/releases/' | \
@@ -16,10 +16,32 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
+    sed 's,^\(Libs:.*\),\1 @CAIRO_NONPKGCONFIG_LIBS@,' -i '$(1)/src/cairo.pc.in'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-gtk-doc
+        --disable-gtk-doc \
+        --disable-test-surfaces \
+        --disable-gcov \
+        --disable-xlib \
+        --disable-xlib-xrender \
+        --disable-xcb \
+        --disable-quartz \
+        --disable-quartz-font \
+        --disable-quartz-image \
+        --disable-os2 \
+        --disable-beos \
+        --disable-glitz \
+        --disable-directfb \
+        --enable-win32 \
+        --enable-win32-font \
+        --enable-png \
+        --enable-ft \
+        --enable-ps \
+        --enable-pdf \
+        --enable-svg \
+        --enable-pthread \
+        LIBS="-lmsimg32 -lpthread -lws2_32 `$(TARGET)-pkg-config pixman-1 --libs`"
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef

src/fontconfig.mk

@@ -20,6 +20,7 @@ define $(PKG)_BUILD
     $(SED) 's,^install-data-local:.*,install-data-local:,' -i '$(1)/src/Makefile.in'
     # wine confuses the cross-compiling detection, so set it explicitly
     $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
+    sed 's,^\(Libs:.*\),\1 @EXPAT_LIBS@ @FREETYPE_LIBS@,' -i '$(1)/fontconfig.pc.in'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \

src/glib.mk

@@ -30,13 +30,14 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)/$(glib_SUBDIR)/glib' -j '$(JOBS)'
     $(MAKE) -C '$(1)/$(glib_SUBDIR)/gobject' -j '$(JOBS)' lib_LTLIBRARIES= install-exec
     # cross build
-    sed 's,^\(Libs:.*\),\1 @PCRE_LIBS@ -lole32,' -i '$(1)/glib-2.0.pc.in'
+    sed 's,^\(Libs:.*\),\1 @PCRE_LIBS@ @G_THREAD_LIBS@ @G_LIBS_EXTRA@ -lshlwapi,' -i '$(1)/glib-2.0.pc.in'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --with-threads=win32 \
+        --with-threads=posix \
         --with-pcre=system \
-        PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config'
+        PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
+        LIBS="-lws2_32"
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef

src/gtk.mk

@@ -16,6 +16,10 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
+    sed 's,DllMain,static _disabled_DllMain,' -i '$(1)/gdk/win32/gdkmain-win32.c'
+    sed 's,DllMain,static _disabled_DllMain,' -i '$(1)/gdk-pixbuf/gdk-pixbuf-io.c'
+    sed 's,DllMain,static _disabled_DllMain,' -i '$(1)/gtk/gtkmain.c'
+    sed 's,__declspec(dllimport),,' -i '$(1)/gdk/gdktypes.h'
     sed 's,^\(Libs:.*\)@GTK_EXTRA_LIBS@,\1@GTK_DEP_LIBS@,' -i '$(1)/gtk+-2.0.pc.in'
     sed 's,^\(gtkbuiltincache\.h:\),_disabled_\1,' -i '$(1)/gtk/Makefile.in'
     sed 's,^\(install-data-local:.*\) install-libtool-import-lib,\1,' -i '$(1)/modules/other/gail/libgail-util/Makefile.in'
@@ -24,6 +28,7 @@ define $(PKG)_BUILD
     sed 's,enable_static=no,enable_static=yes,' -i '$(1)/configure'
     sed 's,enable_shared=yes,enable_shared=no,' -i '$(1)/configure'
     sed 's,\(STATIC_LIB_DEPS="[^"]*\) \$$LIBJPEG,\1 $$LIBJASPER $$LIBJPEG,' -i '$(1)/configure'
+    sed 's/-Wl,-luuid/-luuid/' -i '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \

src/pango.mk

@@ -16,6 +16,7 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
+    sed 's,DllMain,static _disabled_DllMain,' -i '$(1)/pango/pango-utils.c'
     sed 's,"[^"]*must build as DLL[^"]*","(disabled warning)",' -i '$(1)/configure'
     sed 's,enable_static=no,enable_static=yes,' -i '$(1)/configure'
     sed 's,enable_shared=yes,enable_shared=no,' -i '$(1)/configure'