From b56df5445d89e0072784c11d4dd6b655b958dbc9 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 31 Jan 2017 02:15:31 +0100 Subject: update gtk3 to 3.22.7 fix https://github.com/mxe/mxe/issues/1647 gtk3 now depends on libepoxy. --- src/gtk3-1-fixes.patch | 112 +++++++++++++++---------------------------------- src/gtk3.mk | 6 +-- 2 files changed, 37 insertions(+), 81 deletions(-) diff --git a/src/gtk3-1-fixes.patch b/src/gtk3-1-fixes.patch index d4520d6..15976b3 100644 --- a/src/gtk3-1-fixes.patch +++ b/src/gtk3-1-fixes.patch @@ -12,7 +12,7 @@ diff --git a/configure b/configure index 1111111..2222222 100755 --- a/configure +++ b/configure -@@ -7005,15 +7005,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -9378,15 +9378,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "$os_win32" = "yes"; then if test x$enable_static = xyes -o x$enable_static = x; then @@ -74,82 +74,6 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev -Date: Sun, 29 Jan 2017 21:48:31 +0100 -Subject: [PATCH] Here there were two problems - -One is that util/extract-strings.exe -was being cross-built while it should be built locally, the other is -that in fact it wasn't even being built because of some problem with -makefile variables (PROGRAMS appears to be empty even if it is set to -a nonempty value). - -diff --git a/util/Makefile.in b/util/Makefile.in -index 1111111..2222222 100644 ---- a/util/Makefile.in -+++ b/util/Makefile.in -@@ -107,9 +107,8 @@ AM_V_lt = $(am__v_lt_@AM_V@) - am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) - 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) \ -+extract_strings_LINK = $(CC_FOR_BUILD) \ -+ $(extract_strings_CFLAGS) $(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@) -@@ -485,7 +484,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) $(extract_strings_LDADD) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -517,7 +516,7 @@ 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) $(extract_strings_CFLAGS) $(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@ -@@ -620,7 +619,7 @@ distdir: $(DISTFILES) - done - check-am: all-am - check: check-am --all-am: Makefile $(PROGRAMS) -+all-am: Makefile extract-strings$(EXEEXT) - installdirs: - install: install-am - install-exec: install-exec-am - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sun, 29 Jan 2017 21:50:01 +0100 -Subject: [PATCH] This one fixes "cd $builddir" failing because neither - $builddir nor $HOME were set - - -diff --git a/configure b/configure -index 1111111..2222222 100755 ---- a/configure -+++ b/configure -@@ -23215,7 +23215,7 @@ fi - NATIVE_GDKPIXBUF_LIBS=`$PKG_CONFIG_FOR_BUILD --libs gdk-pixbuf-2.0` - # This is the native gtk-update-icon-cache which will be used at - # build time, NOT the one installed on the target host. -- GTK_UPDATE_ICON_CACHE="`cd $builddir && pwd`/gtk/native/native-update-icon-cache$BUILD_EXEEXT" -+ GTK_UPDATE_ICON_CACHE="`pwd`/gtk/native/native-update-icon-cache$BUILD_EXEEXT" - - - - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev Date: Sun, 29 Jan 2017 21:50:48 +0100 Subject: [PATCH] Not sure what happens when this line is commented out @@ -158,10 +82,42 @@ diff --git a/gtk/a11y/gtkaccessibility.c b/gtk/a11y/gtkaccessibility.c index 1111111..2222222 100644 --- a/gtk/a11y/gtkaccessibility.c +++ b/gtk/a11y/gtkaccessibility.c -@@ -991,5 +991,5 @@ _gtk_accessibility_init (void) +@@ -992,5 +992,5 @@ _gtk_accessibility_init (void) atk_bridge_adaptor_init (NULL, NULL); #endif - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); + /* atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); */ } + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Sun, 29 Jan 2017 22:50:45 +0100 +Subject: [PATCH] disable gtk-update-icon-cache + +The error: https://gist.github.com/b3030a43a325ee7646a2bda2864465b5 + +diff --git a/demos/gtk-demo/Makefile.in b/demos/gtk-demo/Makefile.in +index 1111111..2222222 100644 +--- a/demos/gtk-demo/Makefile.in ++++ b/demos/gtk-demo/Makefile.in +@@ -1422,7 +1422,6 @@ uninstall-hook: uninstall-update-icon-cache + + install-update-icon-cache: + $(AM_V_at)$(POST_INSTALL) +- test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)" + + uninstall-update-icon-cache: + $(AM_V_at)$(POST_UNINSTALL) +diff --git a/demos/widget-factory/Makefile.in b/demos/widget-factory/Makefile.in +index 1111111..2222222 100644 +--- a/demos/widget-factory/Makefile.in ++++ b/demos/widget-factory/Makefile.in +@@ -1161,7 +1161,6 @@ uninstall-hook: uninstall-update-icon-cache + + install-update-icon-cache: + $(AM_V_at)$(POST_INSTALL) +- test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)" + + uninstall-update-icon-cache: + $(AM_V_at)$(POST_UNINSTALL) diff --git a/src/gtk3.mk b/src/gtk3.mk index ad02b8c..85e9106 100644 --- a/src/gtk3.mk +++ b/src/gtk3.mk @@ -4,12 +4,12 @@ PKG := gtk3 $(PKG)_WEBSITE := http://www.gtk.org/ $(PKG)_DESCR := GTK+ $(PKG)_IGNORE := -$(PKG)_VERSION := 3.14.4 -$(PKG)_CHECKSUM := a006c716d723dab0c623491566e3292af84c87d9198a30199051d23cfc7bef2f +$(PKG)_VERSION := 3.22.7 +$(PKG)_CHECKSUM := a3a27564bfb1679ebbc75c37cd2bcd6e727c8bdfbcd3984d29305bf9ee60d432 $(PKG)_SUBDIR := gtk+-$($(PKG)_VERSION) $(PKG)_FILE := gtk+-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/gtk+/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) -$(PKG)_DEPS := gcc atk cairo gdk-pixbuf gettext glib jasper jpeg libpng pango tiff +$(PKG)_DEPS := gcc atk cairo gdk-pixbuf gettext glib jasper jpeg libepoxy libpng pango tiff define $(PKG)_UPDATE $(WGET) -q -O- 'http://git.gnome.org/browse/gtk+/refs/tags' | \ -- cgit v0.12