Hello community, here is the log from the commit of package metacity checked in at Thu Oct 19 19:42:57 CEST 2006. -------- --- GNOME/metacity/metacity.changes 2006-10-03 17:36:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/metacity/metacity.changes 2006-10-15 23:50:00.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Oct 15 22:42:53 CEST 2006 - danw@suse.de + +- Remove dead patches +- Remove pre-compiz patches for using metacity with xcompmgr under xgl +- Update and re-enable metacity-windows-key-binding.patch (203080) + +------------------------------------------------------------------- Old: ---- metacity-2.12.0-horizontal-viewport-constraints-1.patch metacity-319423.patch metacity-6626-raise-on-click.diff metacity-activate-window-hack-1.patch metacity-random-value-error.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ metacity.spec ++++++ --- /var/tmp/diff_new_pack.sR6XWU/_old 2006-10-19 19:41:22.000000000 +0200 +++ /var/tmp/diff_new_pack.sR6XWU/_new 2006-10-19 19:41:22.000000000 +0200 @@ -14,22 +14,17 @@ BuildRequires: gconf2-devel gnome-patch-translation gtk2-devel intltool libglade2-devel perl-XML-Parser startup-notification-devel update-desktop-files %define prefix /opt/gnome %define sysconfdir /etc%{prefix} -License: GPL +License: GNU General Public License (GPL) - all versions Group: System/GUI/GNOME Autoreqprov: on Version: 2.16.3 -Release: 1 +Release: 6 Summary: A Fast Window Manager for the GNOME 2.x Desktop Source: metacity-%{version}.tar.bz2 Patch: metacity-ping-timeout.patch Patch2: metacity-preconf.dif -Patch3: metacity-6626-raise-on-click.diff -Patch5: metacity-2.12.0-horizontal-viewport-constraints-1.patch -Patch6: metacity-activate-window-hack-1.patch -Patch7: metacity-319423.patch Patch8: metacity-audible-bell-off.patch Patch9: metacity-windows-key-binding.patch -Patch10: metacity-random-value-error.patch URL: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: filesystem gconf2 @@ -46,13 +41,8 @@ #gnome-patch-translation-prepare %patch -p1 %patch2 -p1 -#%patch3 -p1 -#%patch5 -p1 -%patch6 -p1 -#%patch7 %patch8 -#%patch9 -p1 -#%patch10 +%patch9 #gnome-patch-translation-update %build @@ -110,6 +100,10 @@ %{prefix}/%_lib/pkgconfig/*.pc %changelog -n metacity +* Sun Oct 15 2006 - danw@suse.de +- Remove dead patches +- Remove pre-compiz patches for using metacity with xcompmgr under xgl +- Update and re-enable metacity-windows-key-binding.patch (203080) * Tue Oct 03 2006 - jhargadon@suse.de - update to version 2.16.3 - fix longstanding focus bug with mouse focus (not sloppy focus) and ++++++ metacity-windows-key-binding.patch ++++++ --- /var/tmp/diff_new_pack.sR6XWU/_old 2006-10-19 19:41:23.000000000 +0200 +++ /var/tmp/diff_new_pack.sR6XWU/_new 2006-10-19 19:41:23.000000000 +0200 @@ -1,5 +1,5 @@ ---- metacity-2.15.34/src/keybindings.c -+++ metacity-2.15.34/src/keybindings.c +--- src/keybindings.c ++++ src/keybindings.c @@ -195,6 +195,12 @@ XEvent *event, MetaKeyBinding *binding); @@ -54,7 +54,7 @@ grab_keys (screen->display->screen_bindings, screen->display->n_screen_bindings, screen->display, screen->xroot); -@@ -1641,6 +1667,13 @@ +@@ -1636,6 +1662,13 @@ all_keys_grabbed = window ? window->all_keys_grabbed : screen->all_keys_grabbed; if (!all_keys_grabbed) { @@ -68,7 +68,7 @@ /* Do the normal keybindings */ process_event (display->screen_bindings, display->n_screen_bindings, -@@ -2981,18 +3014,15 @@ +@@ -2976,18 +3009,15 @@ } static void @@ -92,7 +92,7 @@ action_atom = None; switch (action) { -@@ -3031,6 +3061,19 @@ +@@ -3026,6 +3056,19 @@ } static void @@ -112,8 +112,8 @@ handle_activate_menu (MetaDisplay *display, MetaScreen *screen, MetaWindow *event_window, ---- metacity-2.15.34/src/metacity.schemas.in -+++ metacity-2.15.34/src/metacity.schemas.in +--- src/metacity.schemas.in ++++ src/metacity.schemas.in @@ -335,6 +335,22 @@ </locale> </schema> @@ -137,8 +137,8 @@ <!-- Window Keybindings --> <schema> ---- metacity-2.15.34/src/prefs.c -+++ metacity-2.15.34/src/prefs.c +--- src/prefs.c ++++ src/prefs.c @@ -56,6 +56,7 @@ #define KEY_BUTTON_LAYOUT "/apps/metacity/general/button_layout" #define KEY_REDUCED_RESOURCES "/apps/metacity/general/reduced_resources" @@ -147,23 +147,23 @@ #define KEY_COMMAND_PREFIX "/apps/metacity/keybinding_commands/command_" -@@ -100,6 +101,7 @@ +@@ -99,6 +100,7 @@ static gboolean bell_is_audible = TRUE; static gboolean reduced_resources = FALSE; static gboolean gnome_accessibility = FALSE; +static gboolean enable_windows_keys = TRUE; static char *cursor_theme = NULL; static int cursor_size = 24; - static gboolean border_effects = TRUE; -@@ -163,6 +165,7 @@ + static gboolean compositing_manager = FALSE; +@@ -161,6 +163,7 @@ const char *value); static gboolean update_reduced_resources (gboolean value); static gboolean update_gnome_accessibility (gboolean value); +static gboolean update_enable_windows_keys (gboolean value); static gboolean update_cursor_theme (const char *value); static gboolean update_cursor_size (int size); - static gboolean update_border_effects (gboolean value); -@@ -499,6 +502,11 @@ + static gboolean update_compositing_manager (gboolean value); +@@ -496,6 +499,11 @@ if (get_bool (KEY_GNOME_ACCESSIBILITY, &bool_val)) update_gnome_accessibility (bool_val); @@ -175,9 +175,9 @@ str_val = gconf_client_get_string (default_client, KEY_CURSOR_THEME, &err); cleanup_error (&err); -@@ -1057,6 +1065,22 @@ - if (update_border_effects (gconf_value_get_bool (value))) - queue_changed (META_PREF_BORDER_EFFECTS); +@@ -1037,6 +1045,22 @@ + if (update_compositing_manager (b)) + queue_changed (META_PREF_COMPOSITING_MANAGER); } + else if (strcmp (key, KEY_ENABLE_WINDOWS_KEYS) == 0) + { @@ -198,7 +198,7 @@ else { meta_topic (META_DEBUG_PREFS, "Key %s doesn't mean anything to Metacity\n", -@@ -1597,6 +1621,16 @@ +@@ -1577,6 +1601,16 @@ return old != disable_workarounds; } @@ -215,19 +215,7 @@ #endif /* HAVE_GCONF */ gboolean -@@ -2622,6 +2656,11 @@ - default: - key = g_strdup_printf (KEY_COMMAND_PREFIX"%d", i + 1); - break; -+ -+ case META_PREF_ENABLE_WINDOWS_KEYS: -+ return "ENABLE_WINDOWS_KEYS"; -+ break; -+ - case META_PREF_BORDER_EFFECTS: - return "BORDER_EFFECTS"; - break; -@@ -2873,6 +2912,12 @@ +@@ -2846,6 +2880,12 @@ } gboolean @@ -240,8 +228,8 @@ meta_prefs_get_gnome_accessibility () { return gnome_accessibility; ---- metacity-2.15.34/src/prefs.h -+++ metacity-2.15.34/src/prefs.h +--- src/prefs.h ++++ src/prefs.h @@ -52,6 +52,7 @@ META_PREF_VISUAL_BELL_TYPE, META_PREF_REDUCED_RESOURCES, @@ -249,8 +237,8 @@ + META_PREF_ENABLE_WINDOWS_KEYS, META_PREF_CURSOR_THEME, META_PREF_CURSOR_SIZE, - META_PREF_COMPOSITING_MANAGER, -@@ -83,6 +84,7 @@ + META_PREF_COMPOSITING_MANAGER +@@ -82,6 +83,7 @@ int meta_prefs_get_auto_raise_delay (void); gboolean meta_prefs_get_reduced_resources (void); gboolean meta_prefs_get_gnome_accessibility (void); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org