From 381be422ea892924abc315610b78a3100d208143 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Jul 31 2015 15:20:36 +0000
Subject: add some upstream fixes


---

diff --git a/marco.spec b/marco.spec
index 0851fa4..2627c99 100644
--- a/marco.spec
+++ b/marco.spec
@@ -15,7 +15,7 @@
 Name:          marco
 Version:       %{branch}.1
 %if 0%{?rel_build}
-Release:       1%{?dist}
+Release:       2%{?dist}
 %else
 Release:       0.1%{?git_rel}%{?dist}
 %endif
@@ -38,6 +38,11 @@ Source5:        window.png
 
 # needed for fixing initial-setup issue, rhbz (#962009)
 Patch0:        marco_add-pixbuf-inline-icons_1.9.x.patch
+# http://git.mate-desktop.org/marco/commit/?id=627d2ba
+Patch1:        marco_remove-outdated-assertion.patch
+# rhbz (#1190525)
+# http://git.mate-desktop.org/marco/commit/?id=2847fef
+Patch2:        marco_fix-wine.patch
 
 Requires:      mate-desktop-libs
 
@@ -93,6 +98,8 @@ cp %{SOURCE4} src/stock_minimize.png
 cp %{SOURCE5} src/window.png
 
 %patch0 -p1 -b .inline-icons
+%patch1 -p1 -b .remove-outdated-assertion
+%patch2 -p1 -b .wine.patch
 
 # needed for the patch and for git snapshot builds
 autoreconf -if
@@ -172,6 +179,10 @@ fi
 
 
 %changelog
+* Fri Jul 31 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.1.2
+- improve wine support, rhbz (#1190525)
+- fix crashes with some old metacity themes
+
 * Tue Jun 30 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.1-1
 - update to 1.10.1 release
 
diff --git a/marco_fix-wine.patch b/marco_fix-wine.patch
new file mode 100644
index 0000000..552fa83
--- /dev/null
+++ b/marco_fix-wine.patch
@@ -0,0 +1,25 @@
+From 2847fefe1ae96a795b08115e3e9d8fc45ec939ca Mon Sep 17 00:00:00 2001
+From: Stefan Dösinger <stefandoesinger@gmail.com>
+Date: Thu, 20 Nov 2014 13:56:35 +0000
+Subject: Allow programmatic minimization without MWM_FUNC_MINIMIZE
+
+This fixes switching out of fullscreen Direct3D applications running in
+Wine. See issue 166 for more details.
+---
+diff --git a/src/core/window.c b/src/core/window.c
+index 9b2ad92..44755b0 100644
+--- a/src/core/window.c
++++ b/src/core/window.c
+@@ -5181,8 +5181,7 @@ meta_window_client_message (MetaWindow *window,
+     {
+       meta_verbose ("WM_CHANGE_STATE client message, state: %ld\n",
+                     event->xclient.data.l[0]);
+-      if (event->xclient.data.l[0] == IconicState &&
+-          window->has_minimize_func)
++      if (event->xclient.data.l[0] == IconicState)
+         meta_window_minimize (window);
+ 
+       return TRUE;
+--
+cgit 
+
diff --git a/marco_remove-outdated-assertion.patch b/marco_remove-outdated-assertion.patch
new file mode 100644
index 0000000..1d4696c
--- /dev/null
+++ b/marco_remove-outdated-assertion.patch
@@ -0,0 +1,26 @@
+diff --git a/src/ui/theme.c b/src/ui/theme.c
+index a7dc8d0..173c58f 100644
+--- a/src/ui/theme.c
++++ b/src/ui/theme.c
+@@ -1312,7 +1312,6 @@ meta_color_spec_new_from_string (const char *str,
+       spec = meta_color_spec_new (META_COLOR_SPEC_GTK);
+       spec->data.gtk.state = state;
+       spec->data.gtk.component = component;
+-      g_assert (spec->data.gtk.state < N_GTK_STATES);
+       g_assert (spec->data.gtk.component < META_GTK_COLOR_LAST);
+     }
+   else if (str[0] == 'b' && str[1] == 'l' && str[2] == 'e' && str[3] == 'n' &&
+diff --git a/src/ui/theme.h b/src/ui/theme.h
+index 66996d8..742d01f 100644
+--- a/src/ui/theme.h
++++ b/src/ui/theme.h
+@@ -694,8 +694,6 @@ typedef enum
+   META_FRAME_PIECE_LAST
+ } MetaFramePiece;
+ 
+-#define N_GTK_STATES 5
+-
+ /**
+  * How to draw a frame in a particular state (say, a focussed, non-maximised,
+  * resizable frame). This corresponds closely to the <frame_style> tag
+