From a9e1749b40608ba42db4f146bfd34687be1c97a3 Mon Sep 17 00:00:00 2001 From: Ting-Wei Lan Date: Tue, 1 Apr 2014 14:11:26 +0800 Subject: mingw-w64-gtk3: 3.10.7 -> 3.12.0 --- mingw-w64-gtk3/.SRCINFO | 10 ++-- .../0005-Remove-gobject-introspection.patch | 68 +++++++++++++++++----- mingw-w64-gtk3/PKGBUILD | 8 +-- 3 files changed, 63 insertions(+), 23 deletions(-) diff --git a/mingw-w64-gtk3/.SRCINFO b/mingw-w64-gtk3/.SRCINFO index b2491a1..da343de 100644 --- a/mingw-w64-gtk3/.SRCINFO +++ b/mingw-w64-gtk3/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = mingw-w64-gtk3 pkgdesc = GObject-based multi-platform GUI toolkit (v3) (mingw-w64) - pkgver = 3.10.7 + pkgver = 3.12.0 pkgrel = 1 url = http://www.gtk.org arch = any @@ -15,18 +15,18 @@ pkgbase = mingw-w64-gtk3 depends = mingw-w64-crt depends = mingw-w64-atk>=2.7.5 depends = mingw-w64-pango>=1.32.4 - depends = mingw-w64-glib2>=2.37.5 + depends = mingw-w64-glib2>=2.39.5 depends = mingw-w64-cairo>=1.12.0 depends = mingw-w64-gdk-pixbuf2>=2.27.1 options = !strip options = !buildflags options = staticlibs - source = http://ftp.gnome.org/pub/gnome/sources/gtk+/3.10/gtk+-3.10.7.tar.xz + source = http://ftp.gnome.org/pub/gnome/sources/gtk+/3.12/gtk+-3.12.0.tar.xz source = 0004-BURN-THE-.DEF.patch source = 0005-Remove-gobject-introspection.patch - sha256sums = b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427 + sha256sums = eb69741cd4029b5a1ac9cf04d9de55dcf9e30777a63891750f5d20cc554b6e4b sha256sums = b35ecacab70680391e06af85893b7aa8612f0812ded35395b6e93f49e8eab92b - sha256sums = e9e29fbf7444e449def11a31a6c2682932df416b1b5c82dbe0eac54e3fe51dd9 + sha256sums = b32544cfd52fa39be3390d08e5cf174b425e2023a40546382639a6f3b547c61b pkgname = mingw-w64-gtk3 diff --git a/mingw-w64-gtk3/0005-Remove-gobject-introspection.patch b/mingw-w64-gtk3/0005-Remove-gobject-introspection.patch index 28cdba1..f130076 100644 --- a/mingw-w64-gtk3/0005-Remove-gobject-introspection.patch +++ b/mingw-w64-gtk3/0005-Remove-gobject-introspection.patch @@ -1,19 +1,19 @@ -From f8483f358783d4bb6179335b3bbbab910a6b92e9 Mon Sep 17 00:00:00 2001 +From ce7ffa434879371f128cef9d602a352248938026 Mon Sep 17 00:00:00 2001 From: LAN-TW -Date: Thu, 7 Nov 2013 00:31:25 +0800 +Date: Tue, 1 Apr 2014 13:38:20 +0800 Subject: [PATCH] Remove gobject-introspection --- - configure.ac | 6 ----- - gdk/Makefile.am | 79 --------------------------------------------------------- - gtk/Makefile.am | 52 ------------------------------------- - 3 files changed, 137 deletions(-) + configure.ac | 6 ---- + gdk/Makefile.am | 98 --------------------------------------------------------- + gtk/Makefile.am | 61 ----------------------------------- + 3 files changed, 165 deletions(-) diff --git a/configure.ac b/configure.ac -index 8c7098e..a1c8958 100644 +index 0539eb5..15e652c 100644 --- a/configure.ac +++ b/configure.ac -@@ -1566,12 +1566,6 @@ fi +@@ -1613,12 +1613,6 @@ fi GLIB_GSETTINGS ################################################## @@ -23,14 +23,28 @@ index 8c7098e..a1c8958 100644 -GOBJECT_INTROSPECTION_CHECK(introspection_required_version) - -################################################## - # Packagekit module + # colord module ################################################# diff --git a/gdk/Makefile.am b/gdk/Makefile.am -index 3ec649d..2c76999 100644 +index a7fd1ba..1fce47d 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am -@@ -191,85 +191,6 @@ if USE_WAYLAND +@@ -1,13 +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 libgdk_3_la_LIBADD += wayland/libgdk-wayland.la endif @@ -63,6 +77,7 @@ index 3ec649d..2c76999 100644 - 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 \ @@ -80,8 +95,18 @@ index 3ec649d..2c76999 100644 - 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 \ @@ -117,10 +142,25 @@ index 3ec649d..2c76999 100644 noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index 179fc9c..d0aaa3f 100644 +index cbb215a..61f7b79 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am -@@ -1302,58 +1302,6 @@ LDADDS = \ +@@ -1,14 +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 = \ $(top_builddir)/gdk/libgdk-3.la \ $(GTK_DEP_LIBS) @@ -180,5 +220,5 @@ index 179fc9c..d0aaa3f 100644 # Installed tools # -- -1.8.4.2 +1.9.1 diff --git a/mingw-w64-gtk3/PKGBUILD b/mingw-w64-gtk3/PKGBUILD index 0c3a2e1..b50e79e 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.10.7 +pkgver=3.12.0 pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit (v3) (mingw-w64)" arch=(any) @@ -15,7 +15,7 @@ depends=( 'mingw-w64-crt' 'mingw-w64-atk>=2.7.5' 'mingw-w64-pango>=1.32.4' -'mingw-w64-glib2>=2.37.5' +'mingw-w64-glib2>=2.39.5' 'mingw-w64-cairo>=1.12.0' 'mingw-w64-gdk-pixbuf2>=2.27.1') options=(!strip !buildflags staticlibs) @@ -27,9 +27,9 @@ source=( # The second source file is downloaded from Fedora Project -sha256sums=('b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427' +sha256sums=('eb69741cd4029b5a1ac9cf04d9de55dcf9e30777a63891750f5d20cc554b6e4b' 'b35ecacab70680391e06af85893b7aa8612f0812ded35395b6e93f49e8eab92b' - 'e9e29fbf7444e449def11a31a6c2682932df416b1b5c82dbe0eac54e3fe51dd9') + 'b32544cfd52fa39be3390d08e5cf174b425e2023a40546382639a6f3b547c61b') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" -- cgit v1.2.3