diff options
author | Ting-Wei Lan | 2014-12-21 15:02:35 +0800 |
---|---|---|
committer | Ting-Wei Lan | 2014-12-21 15:02:35 +0800 |
commit | 6cee6623580a716d1d56188c95a21c900ab85ec9 (patch) | |
tree | 7b657a67c3a9619036b6b9d0d845a9a46ec948ce | |
parent | 0eec4826708c7ecb68e2848d9194fa3243748fb2 (diff) | |
download | aur-6cee6623580a716d1d56188c95a21c900ab85ec9.tar.gz |
mingw-w64-gtk3: 3.14.5 -> 3.14.6
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 17 | ||||
-rw-r--r-- | gtk3-bug-741827-reftests-fix-typo.patch | 26 | ||||
-rw-r--r-- | window-GtkPlug-is-conditionally-supported-on-X11-o.patch | 38 |
4 files changed, 38 insertions, 53 deletions
@@ -1,6 +1,6 @@ pkgbase = mingw-w64-gtk3 pkgdesc = GObject-based multi-platform GUI toolkit (v3) (mingw-w64) - pkgver = 3.14.5 + pkgver = 3.14.6 pkgrel = 1 url = http://www.gtk.org arch = any @@ -19,14 +19,14 @@ pkgbase = mingw-w64-gtk3 options = !strip options = !buildflags options = staticlibs - source = http://ftp.gnome.org/pub/gnome/sources/gtk+/3.14/gtk+-3.14.5.tar.xz + source = http://ftp.gnome.org/pub/gnome/sources/gtk+/3.14/gtk+-3.14.6.tar.xz source = 0005-Remove-gobject-introspection.patch source = gtk3-bug-731013-fix-cross-compilation.patch - source = window-GtkPlug-is-conditionally-supported-on-X11-o.patch - sha256sums = ba70f5ccde6646c6d8aa5a6398794b7bcf23fc45af22580a215d258f392dbbe2 + source = gtk3-bug-741827-reftests-fix-typo.patch + sha256sums = cfc424e6e10ffeb34a33762aeb77905c3ed938f0b4006ddb7e880aad234ef119 sha256sums = ae632ad20c87032c326dbb1cda086e33a5078909f89174b2ba232be1b48c32a3 sha256sums = 2dd763d32f7b7de08a325d32b811e87266277edb6055a043632d10c146ffc6d3 - sha256sums = 32be72eb4e6cead4c94a90a23c636adc76f41ac33fc6328740c0764ae02fdd9b + sha256sums = 839ac6fa6613d0daf6e8eac6ef8d07b8f825a6556640fa480c597bd7c88e3e82 pkgname = mingw-w64-gtk3 @@ -1,7 +1,7 @@ # Maintainer: lantw44 at gmail dot com pkgname=mingw-w64-gtk3 -pkgver=3.14.5 +pkgver=3.14.6 pkgrel=1 pkgdesc='GObject-based multi-platform GUI toolkit (v3) (mingw-w64)' arch=(any) @@ -26,23 +26,20 @@ source=( "http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz" "0005-Remove-gobject-introspection.patch" "gtk3-bug-731013-fix-cross-compilation.patch" - "window-GtkPlug-is-conditionally-supported-on-X11-o.patch") + "gtk3-bug-741827-reftests-fix-typo.patch") -# The third patch is downloaded from Fedora Project -# The fourth patch: https://bugzilla.gnome.org/show_bug.cgi?id=739885 - -sha256sums=('ba70f5ccde6646c6d8aa5a6398794b7bcf23fc45af22580a215d258f392dbbe2' +sha256sums=('cfc424e6e10ffeb34a33762aeb77905c3ed938f0b4006ddb7e880aad234ef119' 'ae632ad20c87032c326dbb1cda086e33a5078909f89174b2ba232be1b48c32a3' '2dd763d32f7b7de08a325d32b811e87266277edb6055a043632d10c146ffc6d3' - '32be72eb4e6cead4c94a90a23c636adc76f41ac33fc6328740c0764ae02fdd9b') + '839ac6fa6613d0daf6e8eac6ef8d07b8f825a6556640fa480c597bd7c88e3e82') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" build() { cd "${srcdir}/gtk+-${pkgver}" - patch -Np1 < "../0005-Remove-gobject-introspection.patch" - patch -Np1 < "../gtk3-bug-731013-fix-cross-compilation.patch" - patch -Np1 < "../window-GtkPlug-is-conditionally-supported-on-X11-o.patch" + patch -Np1 < "../${source[1]}" + patch -Np1 < "../${source[2]}" + patch -Np1 < "../${source[3]}" autoreconf -i for _arch in ${_architectures}; do unset LDFLAGS diff --git a/gtk3-bug-741827-reftests-fix-typo.patch b/gtk3-bug-741827-reftests-fix-typo.patch new file mode 100644 index 000000000000..107fa72c1005 --- /dev/null +++ b/gtk3-bug-741827-reftests-fix-typo.patch @@ -0,0 +1,26 @@ +From 4d9fde3105eba615785238b6766e0220333cccd3 Mon Sep 17 00:00:00 2001 +From: Ting-Wei Lan <lantw@src.gnome.org> +Date: Sun, 21 Dec 2014 14:51:00 +0800 +Subject: [PATCH] reftests: Fix typo + +It causes build failure on MinGW. +--- + testsuite/reftests/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/testsuite/reftests/Makefile.am b/testsuite/reftests/Makefile.am +index 7479dae..b4b2bc8 100644 +--- a/testsuite/reftests/Makefile.am ++++ b/testsuite/reftests/Makefile.am +@@ -42,7 +42,7 @@ noinst_LTLIBRARIES = \ + endif + + libgtkreftestprivate_la_CFLAGS = $(gtk_reftest_CFLAGS) +-libgtkreftestprivate_la_LDLAGS = $(no_undefined) ++libgtkreftestprivate_la_LDFLAGS = $(no_undefined) + libgtkreftestprivate_la_LIBADD = \ + $(top_builddir)/gdk/libgdk-3.la \ + $(top_builddir)/gtk/libgtk-3.la \ +-- +2.1.0 + diff --git a/window-GtkPlug-is-conditionally-supported-on-X11-o.patch b/window-GtkPlug-is-conditionally-supported-on-X11-o.patch deleted file mode 100644 index 8e6c0b709a54..000000000000 --- a/window-GtkPlug-is-conditionally-supported-on-X11-o.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e9201c0d6d9818f23c8712b2af8316f67d9d6be3 Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi <ebassi@gnome.org> -Date: Mon, 10 Nov 2014 14:08:20 +0000 -Subject: [PATCH] window: GtkPlug is conditionally supported on X11 only - -We cannot do a type check on it if we don't have the X11 backend -compiled in. - -https://bugzilla.gnome.org/show_bug.cgi?id=739885 ---- - gtk/gtkwindow.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c -index 0d0fb88..6cb355b 100644 ---- a/gtk/gtkwindow.c -+++ b/gtk/gtkwindow.c -@@ -1610,10 +1610,17 @@ gtk_window_constructed (GObject *object) - { - GtkWindow *window = GTK_WINDOW (object); - GtkWindowPrivate *priv = window->priv; -+ gboolean is_plug; - - G_OBJECT_CLASS (gtk_window_parent_class)->constructed (object); - -- if (priv->type == GTK_WINDOW_TOPLEVEL && !GTK_IS_PLUG (window)) -+#ifdef GDK_WINDOWING_X11 -+ is_plug = GTK_IS_PLUG (window); -+#else -+ is_plug = FALSE; -+#endif -+ -+ if (priv->type == GTK_WINDOW_TOPLEVEL && !is_plug) - { - priv->multipress_gesture = gtk_gesture_multi_press_new (GTK_WIDGET (object)); - gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->multipress_gesture), 0); --- -2.1.0
\ No newline at end of file |