mingw-w64-gtk3: 3.12.2 -> 3.14.0

4 files changed, 147 insertions, 174 deletions

diff --git a/mingw-w64-gtk3/0001-Bug-731013-cross-compilation-broken-when-building-ex.patch b/mingw-w64-gtk3/0001-Bug-731013-cross-compilation-broken-when-building-ex.patch
new file mode 100644
index 0000000..16f243c
--- /dev/null
+++ b/mingw-w64-gtk3/0001-Bug-731013-cross-compilation-broken-when-building-ex.patch
@@ -0,0 +1,62 @@
+From cd93006829d56782d605b4202c45e1aad7ce1746 Mon Sep 17 00:00:00 2001
+From: Jehan <jehan@girinstud.io>
+Date: Wed, 13 Aug 2014 05:08:08 +0000
+Subject: [PATCH 1/3] Bug 731013 - cross-compilation broken when building
+ extract-strings
+
+It is actually a bad idea to use noinst_PROGRAMS for build tools,
+because it adds a $(EXEEXT). It is best to override the all target
+with all-local to trigger the tool build.
+---
+ gtk/Makefile.am           | 2 +-
+ gtk/inspector/Makefile.am | 2 +-
+ util/Makefile.am          | 6 +++---
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 5c31084..7b78fb8 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -1566,7 +1566,7 @@ distclean-local:
+ 	if test $(srcdir) != .; then \
+ 	  rm -f $(MAINTAINERCLEANFILES); \
+ 	  rm -rf stock-icons; \
+-	  rm -f extract-strings$(EXEEXT); \
++	  rm -f extract-strings$(BUILD_EXEEXT); \
+ 	  rm -f $(template_headers); \
+ 	fi
+ 
+diff --git a/gtk/inspector/Makefile.am b/gtk/inspector/Makefile.am
+index 9e14945..7b1876f 100644
+--- a/gtk/inspector/Makefile.am
++++ b/gtk/inspector/Makefile.am
+@@ -114,7 +114,7 @@ templates = 				\
+ 
+ template_headers = $(templates:.ui=.ui.h)
+ 
+-extract_strings = $(top_builddir)/util/extract-strings
++extract_strings = $(top_builddir)/util/extract-strings$(BUILD_EXEEXT)
+ 
+ %.ui.h : %.ui 
+ 	$(AM_V_GEN) $(extract_strings) $< > $@
+diff --git a/util/Makefile.am b/util/Makefile.am
+index e8cf8fd..d0aa488 100644
+--- a/util/Makefile.am
++++ b/util/Makefile.am
+@@ -4,10 +4,10 @@ extract_strings_cppflags =
+ extract_strings_cflags = $(GLIB_CFLAGS_FOR_BUILD)
+ extract_strings_ldadd = $(GLIB_LIBS_FOR_BUILD)
+ 
+-extract-strings$(EXEEXT): $(extract_strings_sources)
+-	@rm -f extract-strings
++extract-strings$(BUILD_EXEEXT): $(extract_strings_sources)
++	@rm -f extract-strings$(BUILD_EXEEXT)
+ 	$(AM_V_CCLD)$(CC_FOR_BUILD) $(extract_strings_cppflags) $(CPPFLAGS_FOR_BUILD) $(extract_strings_cflags) $(CFLAGS_FOR_BUILD) $^ $(LDFLAGS_FOR_BUILD) $(extract_strings_ldadd) $(LIBS_FOR_BUILD) -o $@
+ 
+-noinst_PROGRAMS = extract-strings
++all-local: extract-strings$(BUILD_EXEEXT)
+ 
+ -include $(top_srcdir)/git.mk
+-- 
+1.8.1.2
+
diff --git a/mingw-w64-gtk3/0004-BURN-THE-.DEF.patch b/mingw-w64-gtk3/0004-BURN-THE-.DEF.patch
deleted file mode 100644
index 6fa2566..0000000
--- a/mingw-w64-gtk3/0004-BURN-THE-.DEF.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 1f4e6cc1a3fe62d05036cfae181f10e07da3764a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
- =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
-Date: Fri, 10 May 2013 09:23:17 +0400
-Subject: [PATCH 4/5] BURN THE .DEF
-
----
- gdk/Makefile.am  | 23 ++++++-----------------
- gdk/makefile.msc | 14 ++++----------
- gtk/Makefile.am  | 22 ++++++----------------
- 3 files changed, 16 insertions(+), 43 deletions(-)
-
-diff --git a/gdk/Makefile.am b/gdk/Makefile.am
-index af0ac94..a0233f9 100644
---- a/gdk/Makefile.am
-+++ b/gdk/Makefile.am
-@@ -178,8 +178,8 @@ endif # USE_QUARTZ
- if USE_WIN32
- libgdk_3_la_SOURCES += gdkkeynames.c
- libgdk_3_la_LIBADD += win32/libgdk-win32.la
--libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
--libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def
-+libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o
-+libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o
- endif # USE_WIN32
- 
- if USE_BROADWAY
-@@ -269,22 +269,11 @@ CLEANFILES += $(gir_DATA) $(typelibs_DATA)
- 
- endif # HAVE_INTROSPECTION
- 
--if OS_WIN32
--install-def-file: gdk.def
--	mkdir -p $(DESTDIR)$(libdir)
--	$(INSTALL) $(srcdir)/gdk.def $(DESTDIR)$(libdir)/gdk-win32-3.0.def
--uninstall-def-file:
--	-rm $(DESTDIR)$(libdir)/gdk-win32-3.0.def
--else
--install-def-file:
--uninstall-def-file:
--endif
--
- if MS_LIB_AVAILABLE
- noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib
- 
--gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la gdk.def
--	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@
-+gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la
-+	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -out:$@
- 
- install-ms-lib:
- 	mkdir -p $(DESTDIR)$(libdir)
-@@ -381,9 +370,9 @@ dist-hook: ../build/win32/vs9/gdk.vcproj ../build/win32/vs10/gdk.vcxproj ../buil
- 
- DISTCLEANFILES = gdkconfig.h stamp-gc-h
- 
--install-data-local: install-ms-lib install-def-file
-+install-data-local: install-ms-lib
- 
--uninstall-local: uninstall-ms-lib uninstall-def-file
-+uninstall-local: uninstall-ms-lib
- 	rm -f $(DESTDIR)$(configexecincludedir)/gdkconfig.h
- 
- # if srcdir!=builddir, clean out maintainer-clean files from builddir
-diff --git a/gdk/makefile.msc b/gdk/makefile.msc
-index 0d88d1e..f956606 100644
---- a/gdk/makefile.msc
-+++ b/gdk/makefile.msc
-@@ -139,25 +139,19 @@ gdkenumtypes.c: $(gdk_public_h_sources) gdkenumtypes.c.template
- gdkconfig.h : gdkconfig.h.win32
- 	copy gdkconfig.h.win32 gdkconfig.h
- 
--gdk.def: gdk.symbols
--	echo EXPORTS > gdk.def
--	cl /EP -DG_OS_WIN32 -DGDK_WINDOWING_WIN32 \
--		-DG_GNUC_CONST= \
--		gdk.symbols >> gdk.def
--
- # /force /verbose:lib 
--libgdk-win32-$(GTK_VER)-0.dll : $(gdk_OBJECTS) gdk.def win32\gdk-win32.lib
-+libgdk-win32-$(GTK_VER)-0.dll : $(gdk_OBJECTS) win32\gdk-win32.lib
- 	$(CC) $(CFLAGS) -LD -Fe$@ $(gdk_OBJECTS) win32\gdk-win32.lib $(EXTRALIBS) \
- 	gdi32.lib user32.lib imm32.lib shell32.lib ole32.lib uuid.lib win32\gdk.res \
--	$(LDFLAGS) /implib:gdk-win32-$(GTK_VER).lib /def:gdk.def
-+	$(LDFLAGS) /implib:gdk-win32-$(GTK_VER).lib
- 
- gdk-win32-$(GTK_VER)s.lib : $(gdk_OBJECTS)
- 	lib /out:gdk-win32-$(GTK_VER)s.lib $(gdk_OBJECTS) win32\gdk-win32.lib
- 
--gdk-x11-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def x11\gdk-x11.lib
-+gdk-x11-$(GTK_VER).dll : $(gdk_OBJECTS) x11\gdk-x11.lib
- 	$(CC) $(CFLAGS) -LD -Fegdk-x11-$(GTK_VER).dll $(gdk_OBJECTS) \
- 	$(PANGO)\pango\pangox-$(PANGO_VER).lib \
--	x11\gdk-x11.lib $(X11_LIBS) $(EXTRALIBS) user32.lib $(LDFLAGS) /def:gdk.def
-+	x11\gdk-x11.lib $(X11_LIBS) $(EXTRALIBS) user32.lib $(LDFLAGS)
- 
- testgdk.exe : libgdk-win32-$(GTK_VER)-0.dll testgdk.obj
- 	$(CC) -Fetestgdk.exe testgdk.obj gdk-win32-$(GTK_VER).lib $(EXTRALIBS) $(LDFLAGS)
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 60fbc31..5da0b35 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -61,29 +61,19 @@ no_undefined = -no-undefined
- endif
- 
- if OS_WIN32
--gtk_def = gtk.def
--gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def
--
- gtk_win32_res = gtk-win32-res.o
- gtk_win32_res_ldflag = -Wl,gtk-win32-res.o
- 
- gtk-win32-res.o : gtk-win32.rc
- 	$(WINDRES) gtk-win32.rc $@
- 
--install-def-file: gtk.def
--	$(INSTALL) $(srcdir)/gtk.def $(DESTDIR)$(libdir)/gtk-win32-3.0.def
--uninstall-def-file:
--	-rm $(DESTDIR)$(libdir)/gtk-win32-3.0.def
--else
--install-def-file:
--uninstall-def-file:
- endif
- 
- if MS_LIB_AVAILABLE
- noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib
- 
--gtk-win32-$(GTK_API_VERSION).lib: libgtk-win32-$(GTK_API_VERSION).la gtk.def
--	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgtk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gtk.def -out:$@
-+gtk-win32-$(GTK_API_VERSION).lib: libgtk-win32-$(GTK_API_VERSION).la
-+	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgtk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -out:$@
- 
- install-ms-lib:
- 	$(INSTALL) gtk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
-@@ -1226,8 +1216,8 @@ libgtk_3_la_DEPENDENCIES = $(deps)
- if USE_WIN32
- libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
- libgtk_3_la_LDFLAGS += -Wl,-luuid
--libgtk_3_la_DEPENDENCIES += $(gtk_def) $(gtk_win32_res) $(deps)
--libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
-+libgtk_3_la_DEPENDENCIES += $(gtk_win32_res) $(deps)
-+libgtk_target_ldflags = $(gtk_win32_res_ldflag)
- endif
- 
- install-exec-hook:
-@@ -1279,13 +1269,13 @@ dist-hook: ../build/win32/vs9/gtk.vcproj ../build/win32/vs10/gtk.vcxproj ../buil
- 	rm libgtk.vs10.sourcefiles.filters
- 
- # Install a RC file for the default GTK+ theme, and key themes
--install-data-local: install-ms-lib install-def-file install-mac-key-theme
-+install-data-local: install-ms-lib install-mac-key-theme
- 	$(MKDIR_P) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0
- 	$(INSTALL_DATA) $(srcdir)/gtk-keys.css.default $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css
- 	$(MKDIR_P) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0
- 	$(INSTALL_DATA) $(srcdir)/gtk-keys.css.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css
- 
--uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-mac-key-theme
-+uninstall-local: uninstall-ms-lib uninstall-mac-key-theme
- 	rm -f $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtk.css
- 	rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css
- 	rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css
--- 
-1.8.0.3
-
diff --git a/mingw-w64-gtk3/PKGBUILD b/mingw-w64-gtk3/PKGBUILD
index d630492..7f820e8 100644
--- a/mingw-w64-gtk3/PKGBUILD
+++ b/mingw-w64-gtk3/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: lantw44 at gmail dot com
 
 pkgname=mingw-w64-gtk3
-pkgver=3.12.2
+pkgver=3.14.0
 pkgrel=1
 pkgdesc="GObject-based multi-platform GUI toolkit (v3) (mingw-w64)"
 arch=(any)
@@ -13,29 +13,32 @@ makedepends+=(autoconf automake libtool)
 # autotools are required because several Makefile.am are modified
 depends=(
 'mingw-w64-crt'
-'mingw-w64-atk>=2.7.5'
-'mingw-w64-pango>=1.32.4'
-'mingw-w64-glib2>=2.39.5'
+'mingw-w64-atk>=2.12.0'
+'mingw-w64-pango>=1.36.7'
+'mingw-w64-glib2>=2.41.2'
 'mingw-w64-cairo>=1.12.0'
-'mingw-w64-gdk-pixbuf2>=2.27.1')
+'mingw-w64-gdk-pixbuf2>=2.30.0')
 options=(!strip !buildflags staticlibs)
 
 source=(
 "http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz"
-"0004-BURN-THE-.DEF.patch"
+"gtk3-commit-62254c.patch"
+"0001-Bug-731013-cross-compilation-broken-when-building-ex.patch"
 "0005-Remove-gobject-introspection.patch")
 
-# The second source file is downloaded from Fedora Project
+# The second and the third patch are downloaded from Fedora Project
 
-sha256sums=('61d74eea74231b1ea4b53084a9d6fc9917ab0e1d71b69d92cbf60a4b4fb385d0'
-            'b35ecacab70680391e06af85893b7aa8612f0812ded35395b6e93f49e8eab92b'
+sha256sums=('68d6b57d15c16808d0045e96b303f3dd439cc22a9c06fdffb07025cd713a82bc'
+            '1c8812f68446d509e019b3f26863348f2cfc469dbb8866bbdfa3213e55a7c433'
+            'd2825227188cf60740540086cd71c56f8e5c6d9c9b9ad7c0869e6746ad0caebe'
             'ae632ad20c87032c326dbb1cda086e33a5078909f89174b2ba232be1b48c32a3')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
   cd "${srcdir}/gtk+-${pkgver}"
-  patch -Np1 < "../0004-BURN-THE-.DEF.patch"
+  patch -Np1 -R < "../gtk3-commit-62254c.patch"
+  patch -Np1 < "../0001-Bug-731013-cross-compilation-broken-when-building-ex.patch"
   patch -Np1 < "../0005-Remove-gobject-introspection.patch"
   autoreconf -i
   for _arch in ${_architectures}; do
diff --git a/mingw-w64-gtk3/gtk3-commit-62254c.patch b/mingw-w64-gtk3/gtk3-commit-62254c.patch
new file mode 100644
index 0000000..a6d51da
--- /dev/null
+++ b/mingw-w64-gtk3/gtk3-commit-62254c.patch
@@ -0,0 +1,72 @@
+From 62254ca3061a1309e836939df242140b53c79603 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Fri, 15 Aug 2014 17:56:39 +0200
+Subject: util/extract-strings: Use autotools syntax for building
+
+Always refer to it as "extract-strings$(EXEEXT)" where needed to take
+cross-compilation into account.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=731013
+
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 3e0d5f8..45de10c 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -1336,7 +1336,7 @@ template_headers = $(COMPOSITE_TEMPLATES:.ui=.ui.h)
+ 
+ %.ui.h: %.ui
+ 	$(AM_V_GEN) mkdir -p $(dir $@) \
+-	&& $(top_builddir)/util/extract-strings$(BUILD_EXEEXT) $< > $@
++	&& $(top_builddir)/util/extract-strings$(EXEEXT) $< > $@
+ 
+ #
+ # rules to generate built sources
+@@ -1566,7 +1566,6 @@ distclean-local:
+ 	if test $(srcdir) != .; then \
+ 	  rm -f $(MAINTAINERCLEANFILES); \
+ 	  rm -rf stock-icons; \
+-	  rm -f extract-strings$(EXEEXT); \
+ 	  rm -f $(template_headers); \
+ 	fi
+ 
+diff --git a/gtk/inspector/Makefile.am b/gtk/inspector/Makefile.am
+index 9e14945..25580e6 100644
+--- a/gtk/inspector/Makefile.am
++++ b/gtk/inspector/Makefile.am
+@@ -114,10 +114,8 @@ templates = 				\
+ 
+ template_headers = $(templates:.ui=.ui.h)
+ 
+-extract_strings = $(top_builddir)/util/extract-strings
+-
+ %.ui.h : %.ui 
+-	$(AM_V_GEN) $(extract_strings) $< > $@
++	$(AM_V_GEN) $(top_builddir)/util/extract-strings$(EXEEXT) $< > $@
+ 
+ EXTRA_DIST += 				\
+ 	inspector.gresource.xml 	\
+diff --git a/util/Makefile.am b/util/Makefile.am
+index e8cf8fd..414dc68 100644
+--- a/util/Makefile.am
++++ b/util/Makefile.am
+@@ -1,13 +1,9 @@
+ # The extract_strings tool is a build utility that runs on the build system.
+-extract_strings_sources = extract-strings.c
+-extract_strings_cppflags =
+-extract_strings_cflags = $(GLIB_CFLAGS_FOR_BUILD)
+-extract_strings_ldadd = $(GLIB_LIBS_FOR_BUILD)
+-
+-extract-strings$(EXEEXT): $(extract_strings_sources)
+-	@rm -f extract-strings
+-	$(AM_V_CCLD)$(CC_FOR_BUILD) $(extract_strings_cppflags) $(CPPFLAGS_FOR_BUILD) $(extract_strings_cflags) $(CFLAGS_FOR_BUILD) $^ $(LDFLAGS_FOR_BUILD) $(extract_strings_ldadd) $(LIBS_FOR_BUILD) -o $@
+ 
+ noinst_PROGRAMS = extract-strings
+ 
++extract_strings_SOURCES = extract-strings.c
++extract_strings_CFLAGS = $(GLIB_CFLAGS_FOR_BUILD)
++extract_strings_LDADD = $(GLIB_LIBS_FOR_BUILD)
++
+ -include $(top_srcdir)/git.mk
+-- 
+cgit v0.10.1
+