Bug#864048: unblock: marco/1.16.1-1

[Mike Gabriel]

Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock

Please consider unblocking package marco ready for upload.

>From upstream we received a last-minute fix for #828077 (mate-panel:
Mouse focus problem with stack of applications). The underlying cause has
been fixed in the MATE window manager aka marco.


unblock marco/1.16.1-1

-- System Information:
Debian Release: 9.0
  APT prefers testing
  APT policy: (990, 'testing')
Architecture: amd64
 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.9.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
-------------- next part --------------
diff -Nru marco-1.16.0/configure.ac marco-1.16.1/configure.ac
--- marco-1.16.0/configure.ac	2016-09-19 06:14:56.000000000 +0200
+++ marco-1.16.1/configure.ac	2017-05-10 18:39:04.000000000 +0200
@@ -2,7 +2,7 @@
 
 m4_define([marco_major_version], [1])
 m4_define([marco_minor_version], [16])
-m4_define([marco_micro_version], [0])
+m4_define([marco_micro_version], [1])
 
 m4_define([marco_version],
           [marco_major_version.marco_minor_version.marco_micro_version])
diff -Nru marco-1.16.0/debian/changelog marco-1.16.1/debian/changelog
--- marco-1.16.0/debian/changelog	2016-10-01 16:07:35.000000000 +0200
+++ marco-1.16.1/debian/changelog	2017-06-03 18:20:27.000000000 +0200
@@ -1,3 +1,11 @@
+marco (1.16.1-1) unstable; urgency=medium
+
+  * New upstream release.
+    - Fix strange window switching foreground/background behavior.
+      (Closes: #828077).
+
+ -- Mike Gabriel <sunweaver at debian.org>  Sat, 03 Jun 2017 18:20:27 +0200
+
 marco (1.16.0-1) unstable; urgency=medium
 
   [ Martin Wimpress ]
diff -Nru marco-1.16.0/NEWS marco-1.16.1/NEWS
--- marco-1.16.0/NEWS	2016-09-19 06:14:56.000000000 +0200
+++ marco-1.16.1/NEWS	2017-05-10 18:39:04.000000000 +0200
@@ -1,3 +1,7 @@
+1.16.1
+
+    * fix strange window switching foreground/background behavior
+
 1.16.0
 
     * Translations update
diff -Nru marco-1.16.0/src/compositor/compositor.c marco-1.16.1/src/compositor/compositor.c
--- marco-1.16.0/src/compositor/compositor.c	2016-09-19 06:14:56.000000000 +0200
+++ marco-1.16.1/src/compositor/compositor.c	2017-05-10 18:39:04.000000000 +0200
@@ -172,10 +172,6 @@
 void meta_compositor_free_window (MetaCompositor *compositor,
                                   MetaWindow     *window)
 {
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-  if (compositor && compositor->free_window)
-    compositor->free_window (compositor, window);
-#endif
 }
 
 void
diff -Nru marco-1.16.0/src/compositor/compositor-private.h marco-1.16.1/src/compositor/compositor-private.h
--- marco-1.16.0/src/compositor/compositor-private.h	2016-09-19 06:14:56.000000000 +0200
+++ marco-1.16.1/src/compositor/compositor-private.h	2017-05-10 18:39:04.000000000 +0200
@@ -55,9 +55,6 @@
                              MetaScreen     *screen,
                              MetaWindow     *window);
 
-  void (*free_window) (MetaCompositor *compositor,
-                       MetaWindow     *window);
-
   void (*maximize_window)   (MetaCompositor *compositor,
                              MetaWindow     *window);
   void (*unmaximize_window) (MetaCompositor *compositor,
diff -Nru marco-1.16.0/src/compositor/compositor-xrender.c marco-1.16.1/src/compositor/compositor-xrender.c
--- marco-1.16.0/src/compositor/compositor-xrender.c	2016-09-19 06:14:56.000000000 +0200
+++ marco-1.16.1/src/compositor/compositor-xrender.c	2017-05-10 18:39:04.000000000 +0200
@@ -2694,38 +2694,23 @@
 #ifdef HAVE_COMPOSITE_EXTENSIONS
 #endif
 }
-#endif /* 0 */
 
 static void
 xrender_free_window (MetaCompositor *compositor,
                      MetaWindow     *window)
 {
 #ifdef HAVE_COMPOSITE_EXTENSIONS
-  MetaCompositorXRender *xrc;
-  MetaFrame *frame;
-  Window xwindow;
-
-  xrc = (MetaCompositorXRender *) compositor;
-  frame = meta_window_get_frame (window);
-  xwindow = None;
-
-  if (frame)
-    {
-      xwindow = meta_frame_get_xwindow (frame);
-    }
-  else
-    {
-      /* FIXME: When an undecorated window is hidden this is called, but the
-       * window does not get readded if it is subsequentally shown again. See:
-       * http://bugzilla.gnome.org/show_bug.cgi?id=504876
-       */
-      /* xwindow = meta_window_get_xwindow (window); */
-    }
-
-  if (xwindow != None)
-    destroy_win (xrc->display, xwindow, FALSE);
+  /* FIXME: When an undecorated window is hidden this is called,
+     but the window does not get readded if it is subsequentally shown again
+     See http://bugzilla.gnome.org/show_bug.cgi?id=504876
+
+     I don't *think* theres any need for this call anyway, leaving it out
+     does not seem to cause any side effects so far, but I should check with
+     someone who understands more. */
+  /* destroy_win (compositor->display, window->xwindow, FALSE); */
 #endif
 }
+#endif /* 0 */
 
 static void
 xrender_process_event (MetaCompositor *compositor,
@@ -3052,7 +3037,6 @@
   xrender_get_window_pixmap,
 #endif
   xrender_set_active_window,
-  xrender_free_window,
   xrender_maximize_window,
   xrender_unmaximize_window,
 };