Update to 3.25.1 (#1376984)

.gitignore

@@ -8,3 +8,4 @@ metacity-2.30.0.tar.bz2
 /metacity-2.34.8.tar.xz
 /metacity-2.34.13.tar.xz
 /metacity-3.12.0.tar.xz
+/metacity-3.25.1.tar.xz

metacity-2.28-empty-keybindings.patch

@@ -17,23 +17,23 @@ diff --git a/src/ui/ui.c b/src/ui/ui.c
 index 78aa353..ef9fcfc 100644
 --- a/src/ui/ui.c
 +++ b/src/ui/ui.c
-@@ -954,7 +954,7 @@ meta_ui_parse_accelerator (const char          *accel,
+@@ -827,7 +827,7 @@ meta_ui_parse_accelerator (const char          *accel,
    *keycode = 0;
    *mask = 0;
  
 -  if (strcmp (accel, "disabled") == 0)
 +  if (!accel[0] || strcmp (accel, "disabled") == 0)
      return TRUE;
-   
+ 
    meta_ui_accelerator_parse (accel, &gdk_sym, &gdk_code, &gdk_mask);
-@@ -1041,7 +1041,7 @@ meta_ui_parse_modifier (const char          *accel,
-   
+@@ -914,7 +914,7 @@ meta_ui_parse_modifier (const char          *accel,
+ 
    *mask = 0;
  
 -  if (accel == NULL || strcmp (accel, "disabled") == 0)
 +  if (accel == NULL || !accel[0] || strcmp (accel, "disabled") == 0)
      return TRUE;
-   
+ 
    meta_ui_accelerator_parse (accel, &gdk_sym, &gdk_code, &gdk_mask);
 -- 
 1.7.9

metacity.spec

@@ -1,46 +1,43 @@
 Summary: Unobtrusive window manager
 Name: metacity
-Version: 3.12.0
-Release: 5%{?dist}
+Version: 3.25.1
+Release: 1%{?dist}
 URL: http://download.gnome.org/sources/metacity/
-Source0: http://download.gnome.org/sources/metacity/3.12/metacity-%{version}.tar.xz
+Source0: http://download.gnome.org/sources/metacity/3.25/metacity-%{version}.tar.xz
+
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
 Patch4: stop-spamming-xsession-errors.patch
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=598995
-Patch16: Dont-focus-ancestor-window-on-a-different-workspac.patch
+#Patch16: Dont-focus-ancestor-window-on-a-different-workspac.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=559816
 Patch24: metacity-2.28-empty-keybindings.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
-BuildRequires: gtk2-devel 
-BuildRequires: pango-devel 
-BuildRequires: fontconfig-devel
-BuildRequires: gsettings-desktop-schemas-devel
-BuildRequires: desktop-file-utils
-BuildRequires: libglade2-devel 
-BuildRequires: autoconf, automake, libtool, gnome-common
-BuildRequires: intltool
-BuildRequires: startup-notification-devel 
-BuildRequires: libtool automake autoconf gettext
-BuildRequires: xorg-x11-proto-devel 
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.20.0
+BuildRequires: pkgconfig(gio-2.0) >= 2.44.0
+BuildRequires: pkgconfig(gsettings-desktop-schemas)
+BuildRequires: pkgconfig(pango)
+BuildRequires: pkgconfig(libcanberra-gtk3)
+BuildRequires: pkgconfig(libstartup-notification-1.0)
+BuildRequires: pkgconfig(xcomposite)
+BuildRequires: pkgconfig(xfixes)
+BuildRequires: pkgconfig(xrender)
+BuildRequires: pkgconfig(xdamage)
+BuildRequires: pkgconfig(xrender)
+BuildRequires: pkgconfig(xcursor)
+BuildRequires: pkgconfig(libgtop-2.0)
+BuildRequires: libXinerama-devel
 BuildRequires: libSM-devel, libICE-devel, libX11-devel
-BuildRequires: libXext-devel, libXinerama-devel, libXrandr-devel, libXrender-devel
-BuildRequires: libXcursor-devel
-BuildRequires: libXcomposite-devel, libXdamage-devel
-# for gnome-keybindings.pc
-BuildRequires: control-center 
+BuildRequires: desktop-file-utils
+BuildRequires: autoconf, automake, gettext-devel, libtool, gnome-common
 BuildRequires: yelp-tools
 BuildRequires: zenity
-BuildRequires: dbus-devel
-BuildRequires: libcanberra-devel
 BuildRequires: itstool
 
 Requires: startup-notification 
 Requires: gsettings-desktop-schemas
-# for /usr/share/control-center/keybindings, /usr/share/gnome/wm-properties
-Requires: control-center-filesystem
 Requires: zenity
 
 # http://bugzilla.redhat.com/605675
@@ -66,7 +63,7 @@ API. This package exists purely for technical reasons.
 %setup -q
 %patch4 -p1 -b .stop-spamming-xsession-errors
 
-%patch16 -p1 -b .focus-different-workspace
+#patch16 -p1 -b .focus-different-workspace
 %patch24 -p1 -b .empty-keybindings
 
 # force regeneration
@@ -81,7 +78,7 @@ rm -f configure
 (if ! test -x configure; then autoreconf -i -f; fi;
  %configure --disable-static --disable-schemas-compile)
 
-SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_XFREE_XINERAMA HAVE_SHAPE HAVE_RANDR HAVE_STARTUP_NOTIFICATION"
+SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_XFREE_XINERAMA HAVE_RANDR HAVE_STARTUP_NOTIFICATION"
 
 for I in $SHOULD_HAVE_DEFINED; do
   if ! grep -q "define $I" config.h; then
@@ -124,15 +121,12 @@ fi
 %{_bindir}/metacity
 %{_bindir}/metacity-message
 %{_datadir}/glib-2.0/schemas/*
-%{_datadir}/GConf/gsettings/metacity-schemas.convert
 %{_datadir}/metacity
-%{_datadir}/themes/*
 %{_datadir}/gnome-control-center/keybindings/*
 %{_libdir}/lib*.so.*
 %{_mandir}/man1/metacity.1.gz
 %{_mandir}/man1/metacity-message.1.gz
 %{_datadir}/applications/metacity.desktop
-%{_datadir}/gnome/wm-properties/metacity-wm.desktop
 
 %files devel
 %defattr(-,root,root,-)
@@ -145,6 +139,9 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Fri Jun 09 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 3.25.1-1
+- Update to 3.25.1 (#1376984)
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

sources

@@ -1 +1 @@
-30637f6e564ef66db9bbc31fce99652c  metacity-3.12.0.tar.xz
+SHA512 (metacity-3.25.1.tar.xz) = 1d0de81f10b8f57188026288526fd40cf5f5cf71d8556887d58673035efa83860d604affc08a84a2f4753533c26e8097eabafc6d4b472c97eb58223970be9698

stop-spamming-xsession-errors.patch

@@ -2,7 +2,7 @@ diff -up metacity-2.25.8/src/core/display.c.stop-spamming-xsession-errors metaci
 --- metacity-2.25.8/src/core/display.c.stop-spamming-xsession-errors	2008-11-23 00:28:37.000000000 -0500
 +++ metacity-2.25.8/src/core/display.c	2008-11-24 21:40:33.000000000 -0500
 @@ -3264,10 +3264,12 @@ meta_display_begin_grab_op (MetaDisplay 
-   
+ 
    if (display->grab_op != META_GRAB_OP_NONE)
      {
 +#if 0