diff options
-rw-r--r-- | mingw-w64-gtk3/0005-Remove-gobject-introspection.patch | 208 | ||||
-rw-r--r-- | mingw-w64-gtk3/PKGBUILD | 6 |
2 files changed, 45 insertions, 169 deletions
diff --git a/mingw-w64-gtk3/0005-Remove-gobject-introspection.patch b/mingw-w64-gtk3/0005-Remove-gobject-introspection.patch index f130076..6133831 100644 --- a/mingw-w64-gtk3/0005-Remove-gobject-introspection.patch +++ b/mingw-w64-gtk3/0005-Remove-gobject-introspection.patch @@ -1,16 +1,16 @@ -From ce7ffa434879371f128cef9d602a352248938026 Mon Sep 17 00:00:00 2001 +From bd2626d4b5a4c47d5a8234b55934597bf67d17e1 Mon Sep 17 00:00:00 2001 From: LAN-TW <lantw44@gmail.com> -Date: Tue, 1 Apr 2014 13:38:20 +0800 +Date: Mon, 14 Apr 2014 01:28:44 +0800 Subject: [PATCH] Remove gobject-introspection --- - configure.ac | 6 ---- - gdk/Makefile.am | 98 --------------------------------------------------------- - gtk/Makefile.am | 61 ----------------------------------- - 3 files changed, 165 deletions(-) + 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 0539eb5..15e652c 100644 +index b4a9487..6952ca9 100644 --- a/configure.ac +++ b/configure.ac @@ -1613,12 +1613,6 @@ fi @@ -27,198 +27,74 @@ index 0539eb5..15e652c 100644 ################################################# diff --git a/gdk/Makefile.am b/gdk/Makefile.am -index a7fd1ba..1fce47d 100644 +index ed4540c..340db4f 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am -@@ -1,13 +1,5 @@ +@@ -1,6 +1,5 @@ ## Makefile.am for gtk+/gdk include $(top_srcdir)/Makefile.decl --include $(INTROSPECTION_MAKEFILE) --INTROSPECTION_GIRS = --INTROSPECTION_SCANNER_ARGS = \ -- --add-include-path=../gdk \ -- --warn-all --INTROSPECTION_COMPILER_ARGS = \ -- --includedir=$(srcdir) \ -- --includedir=. - - SUBDIRS = $(GDK_BACKENDS) . - -@@ -191,96 +183,6 @@ if USE_WAYLAND + 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)) \ -- $(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/gdkdisplaymanager-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/gdkx11applaunchcontext.h \ -- x11/gdkx11cursor.h \ -- x11/gdkx11device.h \ -- x11/gdkx11device-core.h \ -- x11/gdkx11device-xi2.h \ -- x11/gdkx11devicemanager.h \ -- x11/gdkx11devicemanager-core.h \ -- x11/gdkx11devicemanager-xi2.h \ -- x11/gdkx11display.h \ -- x11/gdkx11displaymanager.h \ -- x11/gdkx11dnd.h \ -- x11/gdkx11keys.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 -- + + 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) -- + + CLEANFILES += $(gir_DATA) $(typelibs_DATA) + -endif # HAVE_INTROSPECTION -- - if MS_LIB_AVAILABLE - noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib + if OS_WIN32 + install-def-file: gdk.def diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index cbb215a..61f7b79 100644 +index c281666..4ae62e8 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am -@@ -1,14 +1,5 @@ +@@ -1,6 +1,5 @@ # Makefile.am for gtk+/gtk include $(top_srcdir)/Makefile.decl --include $(INTROSPECTION_MAKEFILE) --INTROSPECTION_GIRS = --INTROSPECTION_SCANNER_ARGS = \ -- --add-include-path=../gdk \ -- --warn-all --INTROSPECTION_COMPILER_ARGS = \ -- --includedir=$(srcdir) \ -- --includedir=. \ -- --includedir=../gdk - - if USE_QUARTZ - GTK_PRINT_PREVIEW_COMMAND="open -a /Applications/Preview.app %f" -@@ -1330,58 +1321,6 @@ LDADDS = \ + 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: --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 -- + # 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) + + CLEANFILES += $(gir_DATA) $(typelibs_DATA) -endif -- + # # Installed tools - # -- -1.9.1 +1.9.2 diff --git a/mingw-w64-gtk3/PKGBUILD b/mingw-w64-gtk3/PKGBUILD index b50e79e..91f690c 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.0 +pkgver=3.12.1 pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit (v3) (mingw-w64)" arch=(any) @@ -27,9 +27,9 @@ source=( # The second source file is downloaded from Fedora Project -sha256sums=('eb69741cd4029b5a1ac9cf04d9de55dcf9e30777a63891750f5d20cc554b6e4b' +sha256sums=('719aae5fdb560f64cadb7e968c8c85c0823664de890c9f765ff4c0efeb0277cd' 'b35ecacab70680391e06af85893b7aa8612f0812ded35395b6e93f49e8eab92b' - 'b32544cfd52fa39be3390d08e5cf174b425e2023a40546382639a6f3b547c61b') + 'ae632ad20c87032c326dbb1cda086e33a5078909f89174b2ba232be1b48c32a3') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" |