mingw-w64-gtk3: Remove gobject-introspection dependency

3 files changed, 195 insertions, 6 deletions

diff --git a/mingw-w64-gtk3/.SRCINFO b/mingw-w64-gtk3/.SRCINFO
index 42bbf5c..67db2fb 100644
--- a/mingw-w64-gtk3/.SRCINFO
+++ b/mingw-w64-gtk3/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mingw-w64-gtk3
-	pkgdesc = GTK+ is a multi-platform toolkit (v3) (mingw-w64)
+	pkgdesc = GObject-based multi-platform GUI toolkit (v3) (mingw-w64)
 	pkgver = 3.10.2
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.gtk.org
 	arch = any
 	license = LGPL
@@ -23,8 +23,10 @@ pkgbase = mingw-w64-gtk3
 	options = staticlibs
 	source = http://ftp.gnome.org/pub/gnome/sources/gtk+/3.10/gtk+-3.10.2.tar.xz
 	source = 0004-BURN-THE-.DEF.patch
+	source = 0005-Remove-gobject-introspection.patch
 	sha256sums = 93af12d28e5f6ccc373ea59f31147e2884c9b3c15dc4841ce3b5cee45b13814c
 	sha256sums = b35ecacab70680391e06af85893b7aa8612f0812ded35395b6e93f49e8eab92b
+	sha256sums = e9e29fbf7444e449def11a31a6c2682932df416b1b5c82dbe0eac54e3fe51dd9
 
 pkgname = mingw-w64-gtk3
 
diff --git a/mingw-w64-gtk3/0005-Remove-gobject-introspection.patch b/mingw-w64-gtk3/0005-Remove-gobject-introspection.patch
new file mode 100644
index 0000000..28cdba1
--- /dev/null
+++ b/mingw-w64-gtk3/0005-Remove-gobject-introspection.patch
@@ -0,0 +1,184 @@
+From f8483f358783d4bb6179335b3bbbab910a6b92e9 Mon Sep 17 00:00:00 2001
+From: LAN-TW <lantw44@gmail.com>
+Date: Thu, 7 Nov 2013 00:31:25 +0800
+Subject: [PATCH] Remove gobject-introspection
+
+---
+ configure.ac    |  6 -----
+ gdk/Makefile.am | 79 ---------------------------------------------------------
+ gtk/Makefile.am | 52 -------------------------------------
+ 3 files changed, 137 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8c7098e..a1c8958 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1566,12 +1566,6 @@ fi
+ GLIB_GSETTINGS
+ 
+ ##################################################
+-# GObject introspection
+-##################################################
+-
+-GOBJECT_INTROSPECTION_CHECK(introspection_required_version)
+-
+-##################################################
+ # Packagekit module
+ #################################################
+ 
+diff --git a/gdk/Makefile.am b/gdk/Makefile.am
+index 3ec649d..2c76999 100644
+--- a/gdk/Makefile.am
++++ b/gdk/Makefile.am
+@@ -191,85 +191,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))	\
+-	$(gdk_c_sources)	\
+-        gdkenumtypes.c		\
+-        gdkenumtypes.h
+-
+-Gdk-3.0.gir: libgdk-3.la Makefile
+-Gdk_3_0_gir_SCANNERFLAGS = 	\
+-	--c-include="gdk/gdk.h"
+-Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
+-Gdk_3_0_gir_LIBS = libgdk-3.la
+-Gdk_3_0_gir_FILES = $(introspection_files)
+-Gdk_3_0_gir_CFLAGS = $(AM_CPPFLAGS)
+-Gdk_3_0_gir_EXPORT_PACKAGES = gdk-3.0
+-INTROSPECTION_GIRS += Gdk-3.0.gir
+-
+-if USE_X11
+-x11_introspection_files = 		\
+-	x11/gdkapplaunchcontext-x11.c	\
+-	x11/gdkasync.c			\
+-	x11/gdkcursor-x11.c		\
+-	x11/gdkdevice-core-x11.c	\
+-	x11/gdkdevicemanager-core-x11.c	\
+-	x11/gdkdevicemanager-x11.c	\
+-	x11/gdkdevicemanager-xi2.c	\
+-	x11/gdkdevice-xi2.c		\
+-	x11/gdkdisplay-x11.c		\
+-	x11/gdkdnd-x11.c		\
+-	x11/gdkeventsource.c		\
+-	x11/gdkeventtranslator.c	\
+-	x11/gdkgeometry-x11.c		\
+-	x11/gdkkeys-x11.c		\
+-	x11/gdkmain-x11.c		\
+-	x11/gdkproperty-x11.c		\
+-	x11/gdkscreen-x11.c		\
+-	x11/gdkselection-x11.c		\
+-	x11/gdksettings.c		\
+-	x11/gdktestutils-x11.c		\
+-	x11/gdkvisual-x11.c		\
+-	x11/gdkwindow-x11.c		\
+-	x11/gdkxftdefaults.c		\
+-	x11/gdkxid.c			\
+-	x11/xsettings-client.c		\
+-	x11/gdkx.h			\
+-	x11/gdkx11cursor.h		\
+-	x11/gdkx11display.h		\
+-	x11/gdkx11property.h		\
+-	x11/gdkx11screen.h		\
+-	x11/gdkx11selection.h		\
+-	x11/gdkx11utils.h		\
+-	x11/gdkx11visual.h		\
+-	x11/gdkx11window.h
+-
+-GdkX11-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile
+-GdkX11_3_0_gir_SCANNERFLAGS = 		\
+-	--identifier-prefix=Gdk		\
+-	--c-include="gdk/gdkx.h"	\
+-	--include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
+-GdkX11_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
+-GdkX11_3_0_gir_LIBS = libgdk-3.la
+-GdkX11_3_0_gir_FILES = $(x11_introspection_files)
+-GdkX11_3_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk
+-GdkX11_3_0_gir_EXPORT_PACKAGES = gdk-x11-3.0
+-INTROSPECTION_GIRS += GdkX11-3.0.gir
+-
+-endif # USE_X11
+-
+-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 MS_LIB_AVAILABLE
+ noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib
+ 
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 179fc9c..d0aaa3f 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -1302,58 +1302,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:
+-introspection_files = \
+-    $(filter-out %private.h gtktextdisplay.h gtktextlayout.h, $(gtkinclude_HEADERS) $(deprecatedinclude_HEADERS)) \
+-    $(filter-out  gtkclipboard-quartz.c gtkdnd-quartz.c, \
+-    $(gtk_base_c_sources)) \
+-    gtkprintoperation-unix.c \
+-    gtktypebuiltins.h \
+-    gtktypebuiltins.c
+-
+-# And include the regular ones:
+-if USE_QUARTZ
+-introspection_files += \
+-    gtkclipboard.c \
+-    gtkdnd.c
+-endif
+-
+-if USE_X11
+-introspection_files += \
+-    gtksocket.c \
+-    gtkplug.c
+-endif
+-
+-Gtk-3.0.gir: $(INTROSPECTION_SCANNER) libgtk-3.la $(top_builddir)/gdk/Gdk-3.0.gir Makefile
+-Gtk_3_0_gir_SCANNERFLAGS = 			\
+-	--add-include-path=$(top_builddir)/gdk	\
+-	--include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
+-Gtk_3_0_gir_INCLUDES = Atk-1.0
+-if USE_X11
+-Gtk_3_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
+-Gtk_3_0_gir_INCLUDES += xlib-2.0
+-endif
+-Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h"
+-Gtk_3_0_gir_CFLAGS = \
+-		$(AM_CPPFLAGS) \
+-		-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
+-Gtk_3_0_gir_LIBS = libgtk-3.la $(top_builddir)/gdk/libgdk-3.la
+-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.8.4.2
+
diff --git a/mingw-w64-gtk3/PKGBUILD b/mingw-w64-gtk3/PKGBUILD
index 05c4284..145f58f 100644
--- a/mingw-w64-gtk3/PKGBUILD
+++ b/mingw-w64-gtk3/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgname=mingw-w64-gtk3
 pkgver=3.10.2
-pkgrel=3
-pkgdesc="GTK+ is a multi-platform toolkit (v3) (mingw-w64)"
+pkgrel=4
+pkgdesc="GObject-based multi-platform GUI toolkit (v3) (mingw-w64)"
 arch=(any)
 url="http://www.gtk.org"
 license=("LGPL")
@@ -22,18 +22,21 @@ options=(!strip !buildflags staticlibs)
 
 source=(
 "http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz"
-"0004-BURN-THE-.DEF.patch")
+"0004-BURN-THE-.DEF.patch"
+"0005-Remove-gobject-introspection.patch")
 
 # The second source file is downloaded from Fedora Project
 
 sha256sums=('93af12d28e5f6ccc373ea59f31147e2884c9b3c15dc4841ce3b5cee45b13814c'
-            'b35ecacab70680391e06af85893b7aa8612f0812ded35395b6e93f49e8eab92b')
+            'b35ecacab70680391e06af85893b7aa8612f0812ded35395b6e93f49e8eab92b'
+            'e9e29fbf7444e449def11a31a6c2682932df416b1b5c82dbe0eac54e3fe51dd9')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
   cd "${srcdir}/gtk+-${pkgver}"
   patch -Np1 < "../0004-BURN-THE-.DEF.patch"
+  patch -Np1 < "../0005-Remove-gobject-introspection.patch"
   autoreconf -i
   for _arch in ${_architectures}; do
     unset LDFLAGS