Upgrade to 3.16.1

- Drop metacity-3.14-bgo605678.patch because it was upstreamed
- Remove check for HAVE_SHAPE because the Shape extension is no longer optional

4 files changed, 11 insertions, 66 deletions

diff --git a/.gitignore b/.gitignore
index 4bc0155..b767f6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ metacity-2.30.0.tar.bz2
 /metacity-2.34.13.tar.xz
 /metacity-3.12.0.tar.xz
 /metacity-3.14.3.tar.xz
+/metacity-3.16.1.tar.xz
diff --git a/metacity-3.14-bgo605678.patch b/metacity-3.14-bgo605678.patch
deleted file mode 100644
index 76b3d54..0000000
--- a/metacity-3.14-bgo605678.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 396061c90f5ed4bfb72b176932e71ba71e514c4a Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Thu, 21 Jan 2010 10:10:44 -0500
-Subject: Work around Xlib 64-bit "specialness"
-
-When putting 32-bit properties into longs on 64-bit architectures,
-XGetWindowProperty assumes the values are supposed to be signed, and
-so it sign-extends values greater than 0x7fffffff. So if they *aren't*
-supposed to be signed, we need to chop off the high bits ourselves.
-
-(Most CARDINAL-valued properties only end up using small values
-anyway, so it doesn't matter, but _NET_WM_WINDOW_OPACITY uses the full
-range, and so was previously failing on 64-bit machines.)
-
-https://bugzilla.gnome.org/show_bug.cgi?id=605678
-
-diff --git a/src/core/xprops.c b/src/core/xprops.c
-index 1461377..f1560ca 100644
---- a/src/core/xprops.c
-+++ b/src/core/xprops.c
-@@ -262,6 +262,16 @@ cardinal_list_from_results (GetPropertyResults *results,
-   *n_cardinals_p = results->n_items;
-   results->prop = NULL;
- 
-+#if GLIB_SIZEOF_LONG == 8
-+  /* Xlib sign-extends format=32 items, but we want them unsigned */
-+  {
-+    int i;
-+
-+    for (i = 0; i < *n_cardinals_p; i++)
-+      (*cardinals_p)[i] = (*cardinals_p)[i] & 0xffffffff;
-+  }
-+#endif
-+
-   return TRUE;
- }
- 
-@@ -606,6 +616,10 @@ cardinal_with_atom_type_from_results (GetPropertyResults *results,
-     return FALSE;
- 
-   *cardinal_p = *(gulong*) results->prop;
-+#if GLIB_SIZEOF_LONG == 8
-+  /* Xlib sign-extends format=32 items, but we want them unsigned */
-+  *cardinal_p &= 0xffffffff;
-+#endif
-   XFree (results->prop);
-   results->prop = NULL;
- 
--- 
-cgit v0.10.1
-
diff --git a/metacity.spec b/metacity.spec
index c371667..afea4fe 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -1,9 +1,9 @@
 Summary: Unobtrusive window manager
 Name: metacity
-Version: 3.14.3
-Release: 3%{?dist}
+Version: 3.16.1
+Release: 1%{?dist}
 URL: http://download.gnome.org/sources/metacity/
-Source0: http://download.gnome.org/sources/metacity/3.14/metacity-%{version}.tar.xz
+Source0: http://download.gnome.org/sources/metacity/3.16/metacity-%{version}.tar.xz
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
 Patch4: stop-spamming-xsession-errors.patch
 
@@ -12,11 +12,9 @@ Patch4: stop-spamming-xsession-errors.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=559816
 Patch24: metacity-2.28-empty-keybindings.patch
 
-Patch100: metacity-3.14-bgo605678.patch
-
 License: GPLv2+
 Group: User Interface/Desktops
-BuildRequires: gtk3-devel >= 3.12.0
+BuildRequires: gtk3-devel >= 3.15.2
 BuildRequires: pango-devel 
 BuildRequires: fontconfig-devel
 BuildRequires: gsettings-desktop-schemas-devel
@@ -70,8 +68,6 @@ API. This package exists purely for technical reasons.
 #patch16 -p1 -b .focus-different-workspace
 %patch24 -p1 -b .empty-keybindings
 
-%patch100 -p1
-
 # force regeneration
 rm -f src/org.gnome.metacity.gschema.valid
 
@@ -84,7 +80,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
@@ -148,11 +144,10 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
-* Fri Feb 27 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.14.3-3
-- rebuilt
-
-* Tue Feb 10 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.14.3-2
-- rebuilt
+* Thu Apr 30 2015 Mike DePaulo <mikedep333@gmail.com> - 3.16.1-1
+- Upgrade to 3.16.1
+- Drop metacity-3.14-bgo605678.patch because it was upstreamed
+- Remove check for HAVE_SHAPE because the Shape extension is no longer optional
 
 * Wed Feb 04 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.14.3-1
 - Version bump for GNOME 3.14.
diff --git a/sources b/sources
index de9b80a..93ce385 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-180d5eaacb493551f6f5f6e361bbdf9f  metacity-3.14.3.tar.xz
+5819a75b7a563df2337e1eab8f0e8827  metacity-3.16.1.tar.xz