2.23.8
This commit is contained in:
Matthias Clasen
parent
a336c6a98a
commit
f11a8331ed
@ -1 +1 @@
|
|||||||
metacity-2.22.0.tar.bz2
|
metacity-2.23.8.tar.bz2
|
||||||
|
|||||||
@ -1,29 +0,0 @@
|
|||||||
diff -up metacity-2.19.21/configure.in.keysdir metacity-2.19.21/configure.in
|
|
||||||
--- metacity-2.19.21/configure.in.keysdir 2007-06-10 23:34:39.000000000 -0400
|
|
||||||
+++ metacity-2.19.21/configure.in 2007-07-09 11:08:26.000000000 -0400
|
|
||||||
@@ -176,6 +176,13 @@ else
|
|
||||||
AC_MSG_ERROR("Pango 1.2.0 or greater based on Xft2 is required")
|
|
||||||
fi
|
|
||||||
|
|
||||||
+if $PKG_CONFIG --exists gnome-keybindings; then
|
|
||||||
+ GNOME_KEYBINDINGS_KEYSDIR=$($PKG_CONFIG --variable keysdir gnome-keybindings)
|
|
||||||
+else
|
|
||||||
+ GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
|
|
||||||
+fi
|
|
||||||
+AC_SUBST(GNOME_KEYBINDINGS_KEYSDIR)
|
|
||||||
+
|
|
||||||
STARTUP_NOTIFICATION_VERSION=0.7
|
|
||||||
AC_MSG_CHECKING([Startup notification library >= $STARTUP_NOTIFICATION_VERSION])
|
|
||||||
if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_VERSION libstartup-notification-1.0; then
|
|
||||||
diff -up metacity-2.19.21/src/Makefile.am.keysdir metacity-2.19.21/src/Makefile.am
|
|
||||||
--- metacity-2.19.21/src/Makefile.am.keysdir 2007-04-05 14:45:12.000000000 -0400
|
|
||||||
+++ metacity-2.19.21/src/Makefile.am 2007-07-09 11:06:41.000000000 -0400
|
|
||||||
@@ -163,7 +163,7 @@ schema_DATA = $(schema_in_files:.schemas
|
|
||||||
|
|
||||||
@INTLTOOL_XML_NOMERGE_RULE@
|
|
||||||
|
|
||||||
-xmldir = $(datadir)/control-center/keybindings
|
|
||||||
+xmldir = @GNOME_KEYBINDINGS_KEYSDIR@
|
|
||||||
xml_in_files = 50-metacity-desktop-key.xml.in 50-metacity-key.xml.in
|
|
||||||
xml_DATA = $(xml_in_files:.xml.in=.xml)
|
|
||||||
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- metacity-2.13.89.0.2006.02.16/configure.in.static-cm 2006-02-07 02:11:17.000000000 -0500
|
|
||||||
+++ metacity-2.13.89.0.2006.02.16/configure.in 2006-02-07 02:11:52.000000000 -0500
|
|
||||||
@@ -222,7 +222,7 @@
|
|
||||||
|
|
||||||
if test x$have_xcomposite = xyes; then
|
|
||||||
echo "Building with CompositeExt"
|
|
||||||
- METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage cm"
|
|
||||||
+ METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage"
|
|
||||||
AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, , [Building with compositing manager support])
|
|
||||||
|
|
||||||
## force on render also
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
Index: src/core/window.c
|
|
||||||
===================================================================
|
|
||||||
--- src/core/window.c (revision 3649)
|
|
||||||
+++ src/core/window.c (working copy)
|
|
||||||
@@ -2009,7 +2009,7 @@
|
|
||||||
{
|
|
||||||
MetaWindow *w = tmp->data;
|
|
||||||
|
|
||||||
- if (w->wm_state_above)
|
|
||||||
+ if (w->wm_state_above && w != newbie)
|
|
||||||
{
|
|
||||||
/* We have found a window that is "above". Perhaps it overlaps. */
|
|
||||||
if (windows_overlap (w, newbie))
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
Index: src/ui/preview-widget.c
|
|
||||||
===================================================================
|
|
||||||
--- src/ui/preview-widget.c (revision 3666)
|
|
||||||
+++ src/ui/preview-widget.c (working copy)
|
|
||||||
@@ -478,6 +478,19 @@
|
|
||||||
|
|
||||||
flags = (META_PREVIEW (preview)->flags);
|
|
||||||
|
|
||||||
+ window_xregion = gdk_region_new ();
|
|
||||||
+
|
|
||||||
+ xrect.x = 0;
|
|
||||||
+ xrect.y = 0;
|
|
||||||
+ xrect.width = new_window_width;
|
|
||||||
+ xrect.height = new_window_height;
|
|
||||||
+
|
|
||||||
+ gdk_region_union_with_rect (window_xregion, &xrect);
|
|
||||||
+
|
|
||||||
+ if (preview->theme == NULL)
|
|
||||||
+ return window_xregion;
|
|
||||||
+
|
|
||||||
+ /* Otherwise, we do have a theme, so calculate the corners */
|
|
||||||
frame_style = meta_theme_get_frame_style (preview->theme,
|
|
||||||
META_FRAME_TYPE_NORMAL, flags);
|
|
||||||
|
|
||||||
@@ -558,14 +571,6 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- window_xregion = gdk_region_new ();
|
|
||||||
-
|
|
||||||
- xrect.x = 0;
|
|
||||||
- xrect.y = 0;
|
|
||||||
- xrect.width = new_window_width;
|
|
||||||
- xrect.height = new_window_height;
|
|
||||||
-
|
|
||||||
- gdk_region_union_with_rect (window_xregion, &xrect);
|
|
||||||
gdk_region_subtract (window_xregion, corners_xregion);
|
|
||||||
gdk_region_destroy (corners_xregion);
|
|
||||||
|
|
||||||
@ -1,18 +1,12 @@
|
|||||||
Summary: Metacity window manager
|
Summary: Metacity window manager
|
||||||
Name: metacity
|
Name: metacity
|
||||||
Version: 2.22.0
|
Version: 2.23.8
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
URL: http://download.gnome.org/sources/metacity/
|
URL: http://download.gnome.org/sources/metacity/
|
||||||
Source0: http://download.gnome.org/sources/metacity/2.22/metacity-%{version}.tar.bz2
|
Source0: http://download.gnome.org/sources/metacity/2.22/metacity-%{version}.tar.bz2
|
||||||
Patch0: default-theme.patch
|
Patch0: default-theme.patch
|
||||||
# http://bugzilla.gnome.org/show_bug.cgi?id=106249
|
|
||||||
Patch2: skip-taskbar-tab.patch
|
|
||||||
# http://bugzilla.gnome.org/show_bug.cgi?id=482354
|
# http://bugzilla.gnome.org/show_bug.cgi?id=482354
|
||||||
Patch3: metacity-2.21.13-dont-move-windows.patch
|
Patch1: metacity-2.21.13-dont-move-windows.patch
|
||||||
# http://bugzilla.gnome.org/show_bug.cgi?id=519188
|
|
||||||
Patch4: metacity-2.22.0-keepabove.patch
|
|
||||||
# fixed in upstream svn
|
|
||||||
Patch5: metacity-theme-crash.patch
|
|
||||||
|
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: User Interface/Desktops
|
Group: User Interface/Desktops
|
||||||
@ -68,10 +62,7 @@ API. This package exists purely for technical reasons.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .default-theme
|
%patch0 -p1 -b .default-theme
|
||||||
%patch2 -p1 -b .skip-taskbar-tab
|
%patch1 -p0 -b .dont-move-windows
|
||||||
%patch3 -p0 -b .dont-move-windows
|
|
||||||
%patch4 -p0 -b .keepabove
|
|
||||||
%patch5 -p0 -b .theme-crash
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
@ -158,6 +149,10 @@ fi
|
|||||||
%{_mandir}/man1/metacity-window-demo.1.gz
|
%{_mandir}/man1/metacity-window-demo.1.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Apr 24 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.8-1
|
||||||
|
- Update to 2.23.8
|
||||||
|
- Drop obsolete patches
|
||||||
|
|
||||||
* Thu Apr 24 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.0-3
|
* Thu Apr 24 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.0-3
|
||||||
- Fix a possible crash in the appearance capplet with
|
- Fix a possible crash in the appearance capplet with
|
||||||
invalid metacity themes (launchpad #199402)
|
invalid metacity themes (launchpad #199402)
|
||||||
|
|||||||
@ -1,12 +0,0 @@
|
|||||||
diff -up metacity-2.21.5/src/core/window.h.skip-taskbar-tab metacity-2.21.5/src/core/window.h
|
|
||||||
--- metacity-2.21.5/src/core/window.h.skip-taskbar-tab 2008-02-03 01:21:30.000000000 -0500
|
|
||||||
+++ metacity-2.21.5/src/core/window.h 2008-02-03 01:21:34.000000000 -0500
|
|
||||||
@@ -558,7 +558,7 @@ gboolean meta_window_same_application (M
|
|
||||||
#define META_WINDOW_IN_NORMAL_TAB_CHAIN(w) \
|
|
||||||
(((w)->input || (w)->take_focus ) && META_WINDOW_IN_NORMAL_TAB_CHAIN_TYPE (w) && (!(w)->skip_taskbar))
|
|
||||||
#define META_WINDOW_IN_DOCK_TAB_CHAIN(w) \
|
|
||||||
- (((w)->input || (w)->take_focus) && ! META_WINDOW_IN_NORMAL_TAB_CHAIN_TYPE (w))
|
|
||||||
+ (((w)->input || (w)->take_focus) && (! META_WINDOW_IN_NORMAL_TAB_CHAIN_TYPE (w) || (w)->skip_taskbar))
|
|
||||||
#define META_WINDOW_IN_GROUP_TAB_CHAIN(w, g) \
|
|
||||||
(((w)->input || (w)->take_focus) && (!g || meta_window_get_group(w)==g))
|
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user