mingw-w64-gtk3: 3.14.10 -> 3.16.0

3 files changed, 11 insertions, 189 deletions

diff --git a/mingw-w64-gtk3/PKGBUILD b/mingw-w64-gtk3/PKGBUILD
index c907de6..f49f45b 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.14.10
+pkgver=3.16.0
 pkgrel=1
 pkgdesc='GObject-based multi-platform GUI toolkit (v3) (mingw-w64)'
 arch=(any)
@@ -15,40 +15,26 @@ makedepends=(
   'python2') # python2 is required to run gdbus-codegen
 depends=(
   'mingw-w64-crt'
-  '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.30.0')
+  'mingw-w64-atk>=2.15.1'
+  'mingw-w64-cairo>=1.14.0'
+  'mingw-w64-gdk-pixbuf2>=2.30.0'
+  'mingw-w64-glib2>=2.43.4'
+  'mingw-w64-libepoxy>=1.0'
+  'mingw-w64-pango>=1.36.7')
 options=(!strip !buildflags staticlibs)
-
-source=(
-  "http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz"
-  "gtk3-aur-remove-gobject-introspection.patch"
-  "gtk3-bug-731013-fix-cross-compilation.patch")
-
-sha256sums=('c3a8d0a014b0025b3c4dd21faf7f9c273b684479ae60d089f06170761ac0c289'
-            'ae632ad20c87032c326dbb1cda086e33a5078909f89174b2ba232be1b48c32a3'
-            '2dd763d32f7b7de08a325d32b811e87266277edb6055a043632d10c146ffc6d3')
+source=("https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz")
+sha256sums=('ce617318fe18092383cf6ed5d8c688a95a97f2d4c68481317a6a531e288c26ea')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
   cd "${srcdir}/gtk+-${pkgver}"
-  patch -Np1 < "../${source[1]}"
-  patch -Np1 < "../${source[2]}"
-  autoreconf -i
   for _arch in ${_architectures}; do
-    unset LDFLAGS
     export PKG_CONFIG="${_arch}-pkg-config"
     export PKG_CONFIG_FOR_BUILD="pkg-config"
     mkdir -p "build-${_arch}"
     cd "build-${_arch}"
-    msg "Starting configure and make"
-    ${_arch}-configure \
-      --enable-win32-backend \
-      --enable-gtk2-dependency \
-      --disable-cups
+    ${_arch}-configure --enable-win32-backend --disable-cups
     make
     cd ..
   done
@@ -58,7 +44,7 @@ package() {
   cd "${srcdir}/gtk+-${pkgver}"
   for _arch in ${_architectures}; do
     cd "build-${_arch}"
-    make -j1 DESTDIR="$pkgdir" install
+    make DESTDIR="$pkgdir" install
     find "$pkgdir/usr/${_arch}" -name '*.exe' -o -name '*.bat' -o -name '*.def' -o -name '*.exp' -o -name '*.manifest' | xargs -rtl1 rm
     find "$pkgdir/usr/${_arch}" -name '*.dll' | xargs -rtl1 ${_arch}-strip -x
     find "$pkgdir/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs -rtl1 ${_arch}-strip -g
diff --git a/mingw-w64-gtk3/gtk3-aur-remove-gobject-introspection.patch b/mingw-w64-gtk3/gtk3-aur-remove-gobject-introspection.patch
deleted file mode 100644
index 6133831..0000000
--- a/mingw-w64-gtk3/gtk3-aur-remove-gobject-introspection.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From bd2626d4b5a4c47d5a8234b55934597bf67d17e1 Mon Sep 17 00:00:00 2001
-From: LAN-TW <lantw44@gmail.com>
-Date: Mon, 14 Apr 2014 01:28:44 +0800
-Subject: [PATCH] Remove gobject-introspection
-
----
- configure.ac    | 6 ------
- gdk/Makefile.am | 8 --------
- gtk/Makefile.am | 8 --------
- 3 files changed, 22 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index b4a9487..6952ca9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1613,12 +1613,6 @@ fi
- GLIB_GSETTINGS
- 
- ##################################################
--# GObject introspection
--##################################################
--
--GOBJECT_INTROSPECTION_CHECK(introspection_required_version)
--
--##################################################
- # colord module
- #################################################
- 
-diff --git a/gdk/Makefile.am b/gdk/Makefile.am
-index ed4540c..340db4f 100644
---- a/gdk/Makefile.am
-+++ b/gdk/Makefile.am
-@@ -1,6 +1,5 @@
- ## Makefile.am for gtk+/gdk
- include $(top_srcdir)/Makefile.decl
---include $(INTROSPECTION_MAKEFILE)
- INTROSPECTION_GIRS =
- INTROSPECTION_SCANNER_ENV = \
-    CC="$(CC)"
-@@ -193,7 +192,6 @@ if USE_WAYLAND
- libgdk_3_la_LIBADD += wayland/libgdk-wayland.la
- endif
- 
--if HAVE_INTROSPECTION
- 
- introspection_files = 		\
- 	$(filter-out gdkkeysyms-compat.h, $(gdk_public_h_sources))	\
-@@ -322,15 +320,9 @@ INTROSPECTION_GIRS += GdkWin32-3.0.gir
- 
- endif # OS_WIN32
- 
--girdir = $(datadir)/gir-1.0
--gir_DATA = $(INTROSPECTION_GIRS)
--
--typelibsdir = $(libdir)/girepository-1.0
--typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
- 
- CLEANFILES += $(gir_DATA) $(typelibs_DATA)
- 
--endif # HAVE_INTROSPECTION
- 
- if OS_WIN32
- install-def-file: gdk.def
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index c281666..4ae62e8 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -1,6 +1,5 @@
- # Makefile.am for gtk+/gtk
- include $(top_srcdir)/Makefile.decl
---include $(INTROSPECTION_MAKEFILE)
- INTROSPECTION_GIRS =
- INTROSPECTION_SCANNER_ENV = \
- 	CC="$(CC)"
-@@ -1344,7 +1343,6 @@ LDADDS =								\
- 	$(top_builddir)/gdk/libgdk-3.la				\
- 	$(GTK_DEP_LIBS)
- 
--if HAVE_INTROSPECTION
- # The Quartz clipboard and dnd files aren't annotated for
- # introspection. Rather than copy the annotations over from the
- # regular files, exclude the quartz ones:
-@@ -1387,14 +1385,8 @@ Gtk_3_0_gir_FILES = $(introspection_files)
- Gtk_3_0_gir_EXPORT_PACKAGES = gtk+-3.0
- INTROSPECTION_GIRS += Gtk-3.0.gir
- 
--girdir = $(datadir)/gir-1.0
--gir_DATA = $(INTROSPECTION_GIRS)
--
--typelibsdir = $(libdir)/girepository-1.0
--typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
- 
- CLEANFILES += $(gir_DATA) $(typelibs_DATA)
--endif
- 
- #
- # Installed tools
--- 
-1.9.2
-
diff --git a/mingw-w64-gtk3/gtk3-bug-731013-fix-cross-compilation.patch b/mingw-w64-gtk3/gtk3-bug-731013-fix-cross-compilation.patch
deleted file mode 100644
index c0eccf0..0000000
--- a/mingw-w64-gtk3/gtk3-bug-731013-fix-cross-compilation.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From f62df4c82839453135097914fa28200253acbb05 Mon Sep 17 00:00:00 2001
-From: Hib Eris <hib@hiberis.nl>
-Date: Wed, 24 Sep 2014 23:08:02 +0200
-Subject: [PATCH] Fix cross compilation
-
-https://bugzilla.gnome.org/show_bug.cgi?id=731013
----
- gtk/Makefile.am           |  2 +-
- gtk/inspector/Makefile.am |  2 +-
- util/Makefile.am          | 14 ++++++++++----
- 3 files changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 17ca614..7a71cde 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -1330,7 +1330,7 @@ template_headers = $(COMPOSITE_TEMPLATES:.ui=.ui.h)
- 
- %.ui.h: %.ui
- 	$(AM_V_GEN) mkdir -p $(dir $@) \
--	&& $(top_builddir)/util/extract-strings$(EXEEXT) $< > $@
-+	&& $(top_builddir)/util/extract-strings$(BUILD_EXEEXT) $< > $@
- 
- #
- # rules to generate built sources
-diff --git a/gtk/inspector/Makefile.am b/gtk/inspector/Makefile.am
-index dfd54e0..fec2672 100644
---- a/gtk/inspector/Makefile.am
-+++ b/gtk/inspector/Makefile.am
-@@ -114,7 +114,7 @@ templates = 				\
- template_headers = $(templates:.ui=.ui.h)
- 
- %.ui.h : %.ui 
--	$(AM_V_GEN) $(top_builddir)/util/extract-strings$(EXEEXT) $< > $@
-+	$(AM_V_GEN) $(top_builddir)/util/extract-strings$(BUILD_EXEEXT) $< > $@
- 
- EXTRA_DIST += 				\
- 	inspector.gresource.xml 	\
-diff --git a/util/Makefile.am b/util/Makefile.am
-index 414dc68..3d82b7e 100644
---- a/util/Makefile.am
-+++ b/util/Makefile.am
-@@ -1,9 +1,15 @@
- # The extract_strings tool is a build utility that runs on the build system.
- 
--noinst_PROGRAMS = extract-strings
-+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$(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 $@
-+EXTRA_DIST = $(extract_strings_sources)
-+DISTCLEANFILES = extract-strings
- 
--extract_strings_SOURCES = extract-strings.c
--extract_strings_CFLAGS = $(GLIB_CFLAGS_FOR_BUILD)
--extract_strings_LDADD = $(GLIB_LIBS_FOR_BUILD)
-+all: extract-strings$(BUILD_EXEEXT)
- 
- -include $(top_srcdir)/git.mk
--- 
-1.9.1
\ No newline at end of file