kalev pushed to mingw-gtk3 (f21). "Update to 3.14.12"

[notifications at fedoraproject.org]

>From dece03a2126daeca5dc92df06adac3e4e1d46bda Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember at gmail.com>
Date: Sun, 12 Apr 2015 16:23:25 +0200
Subject: Update to 3.14.12


diff --git a/0001-window-GtkPlug-is-conditionally-supported-on-X11-onl.patch b/0001-window-GtkPlug-is-conditionally-supported-on-X11-onl.patch
deleted file mode 100644
index b9a71ee..0000000
--- a/0001-window-GtkPlug-is-conditionally-supported-on-X11-onl.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0b8f666e022d983db2cefaffb24315dc34b26673 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi at 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 e846c41..7f5aae7 100644
---- a/gtk/gtkwindow.c
-+++ b/gtk/gtkwindow.c
-@@ -1601,10 +1601,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
-
diff --git a/mingw-gtk3.spec b/mingw-gtk3.spec
index 2eec89c..26abc57 100644
--- a/mingw-gtk3.spec
+++ b/mingw-gtk3.spec
@@ -9,7 +9,7 @@
 %define enable_autoreconf 1
 
 Name:           mingw-gtk3
-Version:        3.14.5
+Version:        3.14.12
 Release:        1%{?dist}
 Summary:        MinGW Windows GTK+ library
 
@@ -25,9 +25,6 @@ Source1:        gtk.immodules
 # https://bugzilla.gnome.org/show_bug.cgi?id=731013
 Patch0:         gtk3-bug-731013-fix-cross-compilation.patch
 
-# Backported upstream patch to fix the build
-Patch1:         0001-window-GtkPlug-is-conditionally-supported-on-X11-onl.patch
-
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 98
@@ -118,7 +115,6 @@ This package contains the MinGW Windows cross compiled GTK+ 3 library.
 %prep
 %setup -q -n gtk+-%{version}
 %patch0 -p1 -b .extract_strings
-%patch1 -p1
 %if 0%{?enable_autoreconf}
 autoreconf --install --force
 %endif
@@ -151,8 +147,10 @@ rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.def
 rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/*.def
 
 # Remove files used only for tests.
-rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libgtkreftestprivate.a
-rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/libgtkreftestprivate.a
+rm -f $RPM_BUILD_ROOT%{mingw32_bindir}/libgtkreftestprivate-0.dll
+rm -f $RPM_BUILD_ROOT%{mingw64_bindir}/libgtkreftestprivate-0.dll
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libgtkreftestprivate.dll.a
+rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/libgtkreftestprivate.dll.a
 
 rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/*.la
@@ -287,6 +285,9 @@ fi
 
 
 %changelog
+* Sun Apr 12 2015 Kalev Lember <kalevlember at gmail.com> - 3.14.12-1
+- Update to 3.14.12
+
 * Sat Nov 15 2014 Kalev Lember <kalevlember at gmail.com> - 3.14.5-1
 - Update to 3.14.5
 
diff --git a/sources b/sources
index 9dc1ab6..a6bc8ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c6b72b1cec82061167759b9e6cec9bab  gtk+-3.14.5.tar.xz
+820ebf5a1c0c7744d5039616b134f698  gtk+-3.14.12.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mingw-gtk3.git/commit/?h=f21&id=dece03a2126daeca5dc92df06adac3e4e1d46bda