diff options
author | Yaakov Selkowitz <yselkowi@redhat.com> | 2015-04-29 21:44:29 -0500 |
---|---|---|
committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2015-04-29 21:44:29 -0500 |
commit | 9bfdc14e437c5a07262157d09dbd91a15e0efbaf (patch) | |
tree | 663313661a33f58961286acafd9ff2fb1f00c90a | |
parent | eea91f3113210f0e86ecb0e5f0c459a10fea888c (diff) | |
download | metacity-9bfdc14e437c5a07262157d09dbd91a15e0efbaf.tar.gz metacity-9bfdc14e437c5a07262157d09dbd91a15e0efbaf.tar.xz metacity-9bfdc14e437c5a07262157d09dbd91a15e0efbaf.zip |
metacity 3.14.3
-rw-r--r-- | metacity-2.28-empty-keybindings.patch | 10 | ||||
-rw-r--r-- | metacity-3.14-bgo605678.patch | 51 | ||||
-rw-r--r-- | metacity.spec | 26 | ||||
-rw-r--r-- | stop-spamming-xsession-errors.patch | 2 |
4 files changed, 76 insertions, 13 deletions
diff --git a/metacity-2.28-empty-keybindings.patch b/metacity-2.28-empty-keybindings.patch index b2ae51b..3fbaac7 100644 --- a/metacity-2.28-empty-keybindings.patch +++ b/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 diff --git a/metacity-3.14-bgo605678.patch b/metacity-3.14-bgo605678.patch new file mode 100644 index 0000000..76b3d54 --- /dev/null +++ b/metacity-3.14-bgo605678.patch @@ -0,0 +1,51 @@ +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 13a2ea9..c371667 100644 --- a/metacity.spec +++ b/metacity.spec @@ -1,25 +1,26 @@ Summary: Unobtrusive window manager Name: metacity -Version: 3.12.0 -Release: 2%{?dist} +Version: 3.14.3 +Release: 3%{?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.14/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 +Patch100: metacity-3.14-bgo605678.patch + License: GPLv2+ Group: User Interface/Desktops -BuildRequires: gtk2-devel +BuildRequires: gtk3-devel >= 3.12.0 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 @@ -66,9 +67,11 @@ 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 +%patch100 -p1 + # force regeneration rm -f src/org.gnome.metacity.gschema.valid @@ -145,6 +148,15 @@ 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 + +* Wed Feb 04 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.14.3-1 +- Version bump for GNOME 3.14. + * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.12.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/stop-spamming-xsession-errors.patch b/stop-spamming-xsession-errors.patch index 864cf6e..ef3f040 100644 --- a/stop-spamming-xsession-errors.patch +++ b/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 |