From ab49a50845436b38f5b788fcf625b1eb3cba105d Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Tue, 8 Apr 2014 11:16:01 +1000
Subject: package atk: improve portability fix

---
 src/atk-2-portability.patch | 15 ---------------
 src/atk.mk                  |  2 +-
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 src/atk-2-portability.patch

diff --git a/src/atk-2-portability.patch b/src/atk-2-portability.patch
deleted file mode 100644
index 6f72a61..0000000
--- a/src/atk-2-portability.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-diff -ur atk-2.10.0.orig/atk/Makefile.in atk-2.10.0/atk/Makefile.in
---- atk-2.10.0.orig/atk/Makefile.in	2014-03-09 14:57:06.000000000 +1100
-+++ atk-2.10.0/atk/Makefile.in	2014-03-09 14:58:26.000000000 +1100
-@@ -919,7 +919,7 @@
- @MS_LIB_AVAILABLE_FALSE@uninstall-ms-lib:
- 
- atk.def: atk.symbols
--	(echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/atk.symbols | sed -e '/^$$/d' -e 's/^/	/' -e 's/G_GNUC_[^ ]*//g') > atk.def
-+	(`echo -e EXPORTS`; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/atk.symbols | sed -e '/^$$/d' -e 's/^/	/' -e 's/G_GNUC_[^ ]*//g') > atk.def
- 
- atk-$(ATK_API_VERSION).lib: libatk-$(ATK_API_VERSION).la atk.def
- 	lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libatk-$(ATK_API_VERSION)-$(LT_CURRENT_MINUS_AGE).dll -def:atk.def -out:$@
diff --git a/src/atk.mk b/src/atk.mk
index d385446..85c6b82 100644
--- a/src/atk.mk
+++ b/src/atk.mk
@@ -23,6 +23,6 @@ define $(PKG)_BUILD
         $(MXE_CONFIGURE_OPTS) \
         --disable-glibtest \
         --disable-gtk-doc
-    $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= SHELL=bash
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
-- 
cgit v0.12