summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Gu <timothygu99@gmail.com>2014-10-17 04:33:47 (GMT)
committerTimothy Gu <timothygu99@gmail.com>2014-10-17 04:33:59 (GMT)
commite77a97ddd8dd3e604c527427f86715cd4a1b70ae (patch)
tree30ffd5330c5ab1de46ba7d1957e5ded47849ca9b
parent73c63cb54702f9236f74cd24bf56693d52304cd1 (diff)
downloadmxe-e77a97ddd8dd3e604c527427f86715cd4a1b70ae.zip
mxe-e77a97ddd8dd3e604c527427f86715cd4a1b70ae.tar.gz
mxe-e77a97ddd8dd3e604c527427f86715cd4a1b70ae.tar.bz2
atk: Update
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
-rw-r--r--src/atk-1-DllMain.patch12
-rw-r--r--src/atk.mk12
2 files changed, 11 insertions, 13 deletions
diff --git a/src/atk-1-DllMain.patch b/src/atk-1-DllMain.patch
index 92158ec..69b8d46 100644
--- a/src/atk-1-DllMain.patch
+++ b/src/atk-1-DllMain.patch
@@ -1,15 +1,15 @@
This file is part of MXE.
See index.html for further information.
-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 @@
+diff -uNr a/atk/atkprivate.c b/atk/atkprivate.c
+--- a/atk/atkprivate.c
++++ b/atk/atkprivate.c
+@@ -39,7 +39,7 @@
static HMODULE atk_dll;
BOOL WINAPI
-DllMain (HINSTANCE hinstDLL,
+atk_DllMain (HINSTANCE hinstDLL,
- DWORD fdwReason,
- LPVOID lpvReserved)
+ DWORD fdwReason,
+ LPVOID lpvReserved)
{
diff --git a/src/atk.mk b/src/atk.mk
index 85c6b82..d7832fe 100644
--- a/src/atk.mk
+++ b/src/atk.mk
@@ -3,8 +3,8 @@
PKG := atk
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 2.10.0
-$(PKG)_CHECKSUM := 9b7f09a31f3781d5af4eb02ec0e2b289cf077a49
+$(PKG)_VERSION := 2.14.0
+$(PKG)_CHECKSUM := b803d055c8e2f786782803b7d21e413718321db7
$(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)
@@ -20,9 +20,7 @@ endef
define $(PKG)_BUILD
cd '$(1)' && ./configure \
- $(MXE_CONFIGURE_OPTS) \
- --disable-glibtest \
- --disable-gtk-doc
- $(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=
+ $(MXE_CONFIGURE_OPTS)
+ $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_CRUFT) SUBDIRS='atk po' SHELL=bash
+ $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_CRUFT) SUBDIRS='atk po'
endef