# HG changeset patch
# User Tony Theodore <tonyt@logyst.com>
# Date 1348316005 -36000
# Node ID 6bc26fc1e74cb3bae628a60e63af6bdd2c76d577
# Parent  0f825b9c0d8c554d8d1058397dd0291e4983fa92# Parent  daff1938f6b1a307bf3599b31161c04e9e059b43
Merge branch 'master' of github.com:mxe/mxe

diff -r 0f825b9c0d8c -r 6bc26fc1e74c Makefile
--- a/Makefile	Sat Sep 22 22:13:09 2012 +1000
+++ b/Makefile	Sat Sep 22 22:13:25 2012 +1000
@@ -191,6 +191,7 @@
 	@echo '[done]     $(1)'
 
 .PHONY: build-only-$(1)
+build-only-$(1): PKG = $(1)
 build-only-$(1):
 	$(if $(value $(1)_BUILD),
 	    rm -rf   '$(2)'
diff -r 0f825b9c0d8c -r 6bc26fc1e74c index.html
--- a/index.html	Sat Sep 22 22:13:09 2012 +1000
+++ b/index.html	Sat Sep 22 22:13:25 2012 +1000
@@ -1745,7 +1745,7 @@
     </tr>
     <tr>
         <td id="poppler-package">poppler</td>
-        <td id="poppler-version">0.20.2</td>
+        <td id="poppler-version">0.20.4</td>
         <td id="poppler-website"><a href="http://poppler.freedesktop.org/">poppler</a></td>
     </tr>
     <tr>
diff -r 0f825b9c0d8c -r 6bc26fc1e74c src/glib.mk
--- a/src/glib.mk	Sat Sep 22 22:13:09 2012 +1000
+++ b/src/glib.mk	Sat Sep 22 22:13:25 2012 +1000
@@ -15,8 +15,7 @@
     head -1
 endef
 
-define $(PKG)_BUILD
-    cd '$(1)' && ./autogen.sh
+define $(PKG)_NATIVE_BUILD
     cp -Rp '$(1)' '$(1).native'
 
     # native build of libiconv (used by glib-genmarshal)
@@ -51,7 +50,23 @@
     $(MAKE) -C '$(1).native/gio'     -j '$(JOBS)' glib-compile-resources
     $(INSTALL) -m755 '$(1).native/gio/glib-compile-schemas' '$(PREFIX)/$(TARGET)/bin/'
     $(INSTALL) -m755 '$(1).native/gio/glib-compile-resources' '$(PREFIX)/$(TARGET)/bin/'
+endef
 
+define $(PKG)_SYMLINK
+    ln -sf `which glib-genmarshal`        '$(PREFIX)/$(TARGET)/bin/'
+    ln -sf `which glib-compile-schemas`   '$(PREFIX)/$(TARGET)/bin/'
+    ln -sf `which glib-compile-resources` '$(PREFIX)/$(TARGET)/bin/'
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./autogen.sh
+    rm -f '$(PREFIX)/$(TARGET)/bin/glib-*'
+    $(if $(findstring y,\
+            $(shell [ -x "`which glib-genmarshal`" ] && \
+                    [ -x "`which glib-compile-schemas`" ] && \
+                    [ -x "`which glib-compile-resources`" ] && echo y)), \
+        $($(PKG)_SYMLINK), \
+        $($(PKG)_NATIVE_BUILD))
     # cross build
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
diff -r 0f825b9c0d8c -r 6bc26fc1e74c src/gnutls-1-fixes.patch
diff -r 0f825b9c0d8c -r 6bc26fc1e74c src/gnutls.mk
diff -r 0f825b9c0d8c -r 6bc26fc1e74c src/poppler.mk
--- a/src/poppler.mk	Sat Sep 22 22:13:09 2012 +1000
+++ b/src/poppler.mk	Sat Sep 22 22:13:25 2012 +1000
@@ -3,7 +3,7 @@
 
 PKG             := poppler
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 0f745b593e764d27a0e21645e6febd6ad8ad2ab9
+$(PKG)_CHECKSUM := fd808cfcd249b7079a09a97f99ffb08db8c62b93
 $(PKG)_SUBDIR   := poppler-$($(PKG)_VERSION)
 $(PKG)_FILE     := poppler-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://poppler.freedesktop.org/$($(PKG)_FILE)