diff options
| -rw-r--r-- | .gitignore | 10 | ||||
| -rw-r--r-- | metacity-3.14-bgo605678.patch | 51 | ||||
| -rw-r--r-- | metacity.spec | 90 | ||||
| -rw-r--r-- | sources | 2 |
4 files changed, 68 insertions, 85 deletions
@@ -8,3 +8,13 @@ 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.14.3.tar.xz +/metacity-3.16.1.tar.xz +/metacity-3.17.2.tar.xz +/metacity-3.18.0.tar.xz +/metacity-3.18.1.tar.xz +/metacity-3.18.3.tar.xz +/metacity-3.20.2.tar.xz +/metacity-3.20.3.tar.xz +/metacity-3.22.0.tar.xz +/metacity-3.22.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 44a8acf..8a5abc8 100644 --- a/metacity.spec +++ b/metacity.spec @@ -1,9 +1,10 @@ Summary: Unobtrusive window manager Name: metacity -Version: 3.14.3 -Release: 4%{?dist} +Version: 3.22.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.22/metacity-%{version}.tar.xz + # http://bugzilla.gnome.org/show_bug.cgi?id=558723 Patch4: stop-spamming-xsession-errors.patch @@ -12,37 +13,31 @@ 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 -Patch101: metacity-3.14-bgo738562.patch - License: GPLv2+ Group: User Interface/Desktops -BuildRequires: gtk3-devel >= 3.12.0 -BuildRequires: pango-devel -BuildRequires: fontconfig-devel -BuildRequires: gsettings-desktop-schemas-devel -BuildRequires: desktop-file-utils -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.19.2 +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 @@ -71,9 +66,6 @@ API. This package exists purely for technical reasons. #patch16 -p1 -b .focus-different-workspace %patch24 -p1 -b .empty-keybindings -%patch100 -p1 -%patch101 -p1 - # force regeneration rm -f src/org.gnome.metacity.gschema.valid @@ -86,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 @@ -129,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,-) @@ -150,9 +139,44 @@ fi %{_mandir}/man1/metacity-window-demo.1.gz %changelog -* Sun Jul 12 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.14.3-4 +* Wed Nov 02 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 3.22.1-1 +- new version + +* Wed Sep 21 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 3.22.0-1 +- Update to 3.22.0 + +* Mon Sep 12 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 3.20.3-1 +- new version + +* Fri Jul 15 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 3.20.2-1 +- new version + +* Tue Jun 28 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 3.20.1.1-1 +- Update to 3.20.1.1 + +* Wed Apr 13 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 3.18.3-2 +- Add gtk2 Adwaita theme for compiz + +* Mon Apr 04 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 3.18.3-1 +- new version + +* Mon Oct 12 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.18.1-1 +- Update to 3.18.1 + +* Fri Oct 02 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.18.0-1 +- Update to 3.18.0 + +* Wed Jul 15 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.17.2-1 +- Unstable version bump + +* Wed Jul 15 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.16.1-2 - Add upstream patch for GNOME bug 738562 +* 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 + * Fri Feb 27 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.14.3-3 - rebuilt @@ -1 +1 @@ -30637f6e564ef66db9bbc31fce99652c metacity-3.12.0.tar.xz +154a8124b3bcda7c95e28c960d9f10fb metacity-3.22.1.tar.xz |