update gtk3 to latest stable version

5 files changed, 5 insertions, 144 deletions

diff --git a/package/gtk3/Makefile b/package/gtk3/Makefile
index 2aed233eb..d609cc26e 100644
--- a/package/gtk3/Makefile
+++ b/package/gtk3/Makefile
@@ -4,16 +4,16 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		gtk+
-PKG_VERSION:=		3.14.6
-PKG_EXTRAVER:=		3.14
+PKG_VERSION:=		3.16.3
+PKG_EXTRAVER:=		3.16
 PKG_RELEASE:=		1
-PKG_HASH:=		cfc424e6e10ffeb34a33762aeb77905c3ed938f0b4006ddb7e880aad234ef119
+PKG_HASH:=		2943fd4a6b02c2a9b2edd231c1d8f7a1d2f8d36996f14310d34f503dca9ebea4
 PKG_DESCR:=		multi-platform toolkit for creating graphical user interfaces
 PKG_SECTION:=		libs/misc
-PKG_DEPENDS:=		glib libstdcxx cairo libxi
+PKG_DEPENDS:=		glib libstdcxx cairo libxi libepoxy
 PKG_BUILDDEP:=		cairo atk pango libXext renderproto libXrender
 PKG_BUILDDEP+=		gdk-pixbuf libXcomposite libXdamage libX11 libXi
-PKG_BUILDDEP+=		at-spi2-core at-spi2-atk gdk-pixbuf-host
+PKG_BUILDDEP+=		at-spi2-core at-spi2-atk gdk-pixbuf-host libepoxy
 PKG_URL:=		http://www.gtk.org/
 PKG_SITES:=		$(MASTER_SITE_GNOME:=gtk+/$(PKG_EXTRAVER)/)
 PKG_LIBNAME:=		libgtk3
diff --git a/package/gtk3/patches/patch-Makefile_in b/package/gtk3/patches/patch-Makefile_in
deleted file mode 100644
index 2461d719d..000000000
--- a/package/gtk3/patches/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk+-3.14.6.orig/Makefile.in	2014-12-11 10:53:53.000000000 -0600
-+++ gtk+-3.14.6/Makefile.in	2014-12-31 04:22:52.355544746 -0600
-@@ -540,7 +540,7 @@ XVFB_START = \
- 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
- 	&& DISPLAY=:$$XID && export DISPLAY
- 
--SRC_SUBDIRS = util gdk gtk libgail-util modules demos tests testsuite examples
-+SRC_SUBDIRS = util gdk gtk libgail-util modules
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
- MAINTAINERCLEANFILES = \
diff --git a/package/gtk3/patches/patch-gtk_native_Makefile_in b/package/gtk3/patches/patch-gtk_native_Makefile_in
deleted file mode 100644
index 9547d4da1..000000000
--- a/package/gtk3/patches/patch-gtk_native_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk+-3.14.6.orig/gtk/native/Makefile.in	2014-12-11 10:53:56.000000000 -0600
-+++ gtk+-3.14.6/gtk/native/Makefile.in	2014-12-30 17:25:00.981949733 -0600
-@@ -579,7 +579,7 @@ uninstall-am:
- 
- native-update-icon-cache$(BUILD_EXEEXT): $(srcdir)/../updateiconcache.c
- 	echo '#define GETTEXT_PACKAGE "gtk30"' > $(srcdir)/config.h
--	$(AM_V_CCLD)$(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) -I. -I$(srcdir)/../.. $(NATIVE_GDKPIXBUF_CFLAGS) $(CFLAGS_FOR_BUILD) $^ $(LDFLAGS_FOR_BUILD) $(NATIVE_GDKPIXBUF_LIBS) $(LIBS_FOR_BUILD) -o $@
-+	$(AM_V_CCLD)$(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) -I. -I$(srcdir)/../.. $(CFLAGS_FOR_BUILD) $^ $(LDFLAGS_FOR_BUILD) $(LIBS_FOR_BUILD) -o $@
- 	rm -f $(srcdir)/config.h
- 
- @CROSS_COMPILING_TRUE@@USE_EXTERNAL_ICON_CACHE_FALSE@all-local: native-update-icon-cache$(BUILD_EXEEXT)
diff --git a/package/gtk3/patches/patch-util_Makefile_in b/package/gtk3/patches/patch-util_Makefile_in
deleted file mode 100644
index 8d50619f9..000000000
--- a/package/gtk3/patches/patch-util_Makefile_in
+++ /dev/null
@@ -1,63 +0,0 @@
---- gtk+-3.14.6.orig/util/Makefile.in	2014-12-11 10:53:58.000000000 -0600
-+++ gtk+-3.14.6/util/Makefile.in	2014-12-30 17:08:54.389940884 -0600
-@@ -109,7 +109,7 @@ am__v_lt_0 = --silent
- am__v_lt_1 = 
- extract_strings_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
--	$(extract_strings_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-+	$(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) \
- 	-o $@
- AM_V_P = $(am__v_P_@AM_V@)
- am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-@@ -127,20 +127,20 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top
- depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
--COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD)
- LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CFLAGS) $(CFLAGS)
-+	$(LIBTOOLFLAGS) --mode=compile $(CC_FOR_BUILD) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) \
-+	$(AM_CFLAGS) $(CFLAGS_FOR_BUILD)
- AM_V_CC = $(am__v_CC_@AM_V@)
- am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
- am__v_CC_0 = @echo "  CC      " $@;
- am__v_CC_1 = 
--CCLD = $(CC)
-+CCLD = $(CC_FOR_BUILD)
- LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) \
-+	$(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@
- AM_V_CCLD = $(am__v_CCLD_@AM_V@)
- am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
- am__v_CCLD_0 = @echo "  CCLD    " $@;
-@@ -485,7 +485,7 @@ clean-noinstPROGRAMS:
- 
- extract-strings$(EXEEXT): $(extract_strings_OBJECTS) $(extract_strings_DEPENDENCIES) $(EXTRA_extract_strings_DEPENDENCIES) 
- 	@rm -f extract-strings$(EXEEXT)
--	$(AM_V_CCLD)$(extract_strings_LINK) $(extract_strings_OBJECTS) $(extract_strings_LDADD) $(LIBS)
-+	$(AM_V_CCLD)$(extract_strings_LINK) $(extract_strings_OBJECTS) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -517,11 +517,11 @@ distclean-compile:
- @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
- 
- extract_strings-extract-strings.o: extract-strings.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(extract_strings_CFLAGS) $(CFLAGS) -MT extract_strings-extract-strings.o -MD -MP -MF $(DEPDIR)/extract_strings-extract-strings.Tpo -c -o extract_strings-extract-strings.o `test -f 'extract-strings.c' || echo '$(srcdir)/'`extract-strings.c
-+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -MT extract_strings-extract-strings.o -MD -MP -MF $(DEPDIR)/extract_strings-extract-strings.Tpo -c -o extract_strings-extract-strings.o `test -f 'extract-strings.c' || echo '$(srcdir)/'`extract-strings.c
- @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/extract_strings-extract-strings.Tpo $(DEPDIR)/extract_strings-extract-strings.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='extract-strings.c' object='extract_strings-extract-strings.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(extract_strings_CFLAGS) $(CFLAGS) -c -o extract_strings-extract-strings.o `test -f 'extract-strings.c' || echo '$(srcdir)/'`extract-strings.c
-+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -c -o extract_strings-extract-strings.o `test -f 'extract-strings.c' || echo '$(srcdir)/'`extract-strings.c
- 
- extract_strings-extract-strings.obj: extract-strings.c
- @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(extract_strings_CFLAGS) $(CFLAGS) -MT extract_strings-extract-strings.obj -MD -MP -MF $(DEPDIR)/extract_strings-extract-strings.Tpo -c -o extract_strings-extract-strings.obj `if test -f 'extract-strings.c'; then $(CYGPATH_W) 'extract-strings.c'; else $(CYGPATH_W) '$(srcdir)/extract-strings.c'; fi`
diff --git a/package/gtk3/patches/patch-util_Makefile_in.orig b/package/gtk3/patches/patch-util_Makefile_in.orig
deleted file mode 100644
index 922098038..000000000
--- a/package/gtk3/patches/patch-util_Makefile_in.orig
+++ /dev/null
@@ -1,54 +0,0 @@
---- gtk+-3.14.6.orig/util/Makefile.in	2014-12-11 10:53:58.000000000 -0600
-+++ gtk+-3.14.6/util/Makefile.in	2014-12-30 16:06:49.273906779 -0600
-@@ -109,7 +109,7 @@ am__v_lt_0 = --silent
- am__v_lt_1 = 
- extract_strings_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
--	$(extract_strings_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-+	$(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) \
- 	-o $@
- AM_V_P = $(am__v_P_@AM_V@)
- am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-@@ -127,20 +127,20 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top
- depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
--COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD)
- LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CFLAGS) $(CFLAGS)
-+	$(LIBTOOLFLAGS) --mode=compile $(CC_FOR_BUILD) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) \
-+	$(AM_CFLAGS) $(CFLAGS_FOR_BUILD)
- AM_V_CC = $(am__v_CC_@AM_V@)
- am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
- am__v_CC_0 = @echo "  CC      " $@;
- am__v_CC_1 = 
--CCLD = $(CC)
-+CCLD = $(CC_FOR_BUILD)
- LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) \
-+	$(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@
- AM_V_CCLD = $(am__v_CCLD_@AM_V@)
- am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
- am__v_CCLD_0 = @echo "  CCLD    " $@;
-@@ -517,11 +517,11 @@ distclean-compile:
- @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
- 
- extract_strings-extract-strings.o: extract-strings.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(extract_strings_CFLAGS) $(CFLAGS) -MT extract_strings-extract-strings.o -MD -MP -MF $(DEPDIR)/extract_strings-extract-strings.Tpo -c -o extract_strings-extract-strings.o `test -f 'extract-strings.c' || echo '$(srcdir)/'`extract-strings.c
-+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -MT extract_strings-extract-strings.o -MD -MP -MF $(DEPDIR)/extract_strings-extract-strings.Tpo -c -o extract_strings-extract-strings.o `test -f 'extract-strings.c' || echo '$(srcdir)/'`extract-strings.c
- @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/extract_strings-extract-strings.Tpo $(DEPDIR)/extract_strings-extract-strings.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='extract-strings.c' object='extract_strings-extract-strings.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(extract_strings_CFLAGS) $(CFLAGS) -c -o extract_strings-extract-strings.o `test -f 'extract-strings.c' || echo '$(srcdir)/'`extract-strings.c
-+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -c -o extract_strings-extract-strings.o `test -f 'extract-strings.c' || echo '$(srcdir)/'`extract-strings.c
- 
- extract_strings-extract-strings.obj: extract-strings.c
- @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(extract_strings_CFLAGS) $(CFLAGS) -MT extract_strings-extract-strings.obj -MD -MP -MF $(DEPDIR)/extract_strings-extract-strings.Tpo -c -o extract_strings-extract-strings.obj `if test -f 'extract-strings.c'; then $(CYGPATH_W) 'extract-strings.c'; else $(CYGPATH_W) '$(srcdir)/extract-strings.c'; fi`