diff --git a/.cvsignore b/.cvsignore index 7cb26e2..e2051e7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -compiz-0.7.6.tar.bz2 -desktop-effects-0.7.18.tar.bz2 -kde-desktop-effects-0.0.5.tar.bz2 +compiz-0.7.8.tar.bz2 diff --git a/compiz-0.7.6-decoration-size.patch b/compiz-0.7.6-decoration-size.patch deleted file mode 100644 index 40a167d..0000000 --- a/compiz-0.7.6-decoration-size.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upNr compiz-0.7.6.orign/plugins/decoration.c compiz-0.7.6/plugins/decoration.c ---- compiz-0.7.6.orign/plugins/decoration.c 2008-05-29 13:58:17.000000000 +0200 -+++ compiz-0.7.6/plugins/decoration.c 2008-06-06 12:48:33.000000000 +0200 -@@ -831,7 +831,7 @@ decorWindowUpdate (CompWindow *w, - moveDy = -oldShiftY; - } - -- if (!w->attrib.override_redirect && (moveDx || moveDy)) -+ if (w->placed && !w->attrib.override_redirect && (moveDx || moveDy)) - { - XWindowChanges xwc; - unsigned int mask = CWX | CWY; diff --git a/compiz-0.7.6-metacity-spacer.patch b/compiz-0.7.6-metacity-spacer.patch deleted file mode 100644 index e1b4858..0000000 --- a/compiz-0.7.6-metacity-spacer.patch +++ /dev/null @@ -1,216 +0,0 @@ -Nur in compiz-0.7.6: autom4te.cache. -diff -ur compiz-0.7.6.orign/config.h.in compiz-0.7.6/config.h.in ---- compiz-0.7.6.orign/config.h.in 2008-05-29 14:07:46.000000000 +0200 -+++ compiz-0.7.6/config.h.in 2008-10-22 16:31:36.000000000 +0200 -@@ -45,6 +45,9 @@ - /* Define to 1 if metacity version >= 2.17.0 */ - #undef HAVE_METACITY_2_17_0 - -+/* Define to 1 if metacity version >= 2.23.2 */ -+#undef HAVE_METACITY_2_23_2 -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_STDINT_H - -diff -ur compiz-0.7.6.orign/configure compiz-0.7.6/configure ---- compiz-0.7.6.orign/configure 2008-05-29 14:07:30.000000000 +0200 -+++ compiz-0.7.6/configure 2008-10-17 21:05:36.000000000 +0200 -@@ -25047,6 +25047,16 @@ - else - have_metacity_2_17_0=no - fi -+ if test -n "$PKG_CONFIG" && \ -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmetacity-private >= 2.23.2\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "libmetacity-private >= 2.23.2") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ have_metacity_2_23_2=yes -+else -+ have_metacity_2_23_2=no -+fi - fi - - if test "x$use_gnome" = "xyes"; then -@@ -25270,6 +25280,13 @@ - _ACEOF - - fi -+ if test "$have_metacity_2_23_2" = yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_METACITY_2_23_2 1 -+_ACEOF -+ -+ fi - fi - - if test "x$use_gnome" = "xyes"; then -diff -ur compiz-0.7.6.orign/configure.ac compiz-0.7.6/configure.ac ---- compiz-0.7.6.orign/configure.ac 2008-05-29 14:05:16.000000000 +0200 -+++ compiz-0.7.6/configure.ac 2008-10-17 21:05:10.000000000 +0200 -@@ -326,6 +326,8 @@ - [have_metacity_2_15_21=yes], [have_metacity_2_15_21=no]) - PKG_CHECK_EXISTS(libmetacity-private >= 2.17.0, - [have_metacity_2_17_0=yes], [have_metacity_2_17_0=no]) -+ PKG_CHECK_EXISTS(libmetacity-private >= 2.23.2, -+ [have_metacity_2_23_2=yes], [have_metacity_2_23_2=no]) - fi - - if test "x$use_gnome" = "xyes"; then -@@ -379,6 +381,10 @@ - AC_DEFINE(HAVE_METACITY_2_17_0, 1, - [Define to 1 if metacity version >= 2.17.0]) - fi -+ if test "$have_metacity_2_23_2" = yes; then -+ AC_DEFINE(HAVE_METACITY_2_23_2, 1, -+ [Define to 1 if metacity version >= 2.23.2]) -+ fi - fi - - AM_CONDITIONAL(USE_GNOME, test "x$use_gnome" = "xyes") -diff -ur compiz-0.7.6.orign/gtk/window-decorator/gtk-window-decorator.c compiz-0.7.6/gtk/window-decorator/gtk-window-decorator.c ---- compiz-0.7.6.orign/gtk/window-decorator/gtk-window-decorator.c 2008-05-29 13:58:33.000000000 +0200 -+++ compiz-0.7.6/gtk/window-decorator/gtk-window-decorator.c 2008-10-22 16:38:56.000000000 +0200 -@@ -5949,11 +5949,17 @@ - - if (sides[0] != NULL) - { -- gboolean used[META_BUTTON_FUNCTION_LAST]; - char **buttons; - int b; -+ gboolean used[META_BUTTON_FUNCTION_LAST]; - -- memset (used, 0, sizeof (used)); -+ for (i = 0; i < META_BUTTON_FUNCTION_LAST; i++) -+ { -+ used[i] = FALSE; -+#ifdef HAVE_METACITY_2_23_2 -+ new_layout.left_buttons_has_spacer[i] = FALSE; -+#endif -+ } - - buttons = g_strsplit (sides[0], ",", -1); - -@@ -5961,54 +5967,90 @@ - while (buttons[b] != NULL) - { - f = meta_button_function_from_string (buttons[b]); -- if (f != META_BUTTON_FUNCTION_LAST && !used[f]) -- { -- new_layout.left_buttons[i++] = f; -- used[f] = TRUE; -- -- f = meta_button_opposite_function (f); -- if (f != META_BUTTON_FUNCTION_LAST) -- new_layout.left_buttons[i++] = f; -- } -+#ifdef HAVE_METACITY_2_23_2 -+ if (i > 0 && strcmp("spacer", buttons[b]) == 0) -+ { -+ new_layout.left_buttons_has_spacer[i - 1] = TRUE; -+ f = meta_button_opposite_function (f); -+ -+ if (f != META_BUTTON_FUNCTION_LAST) -+ new_layout.left_buttons_has_spacer[i - 2] = TRUE; -+ } - else -+#endif - { -- fprintf (stderr, "%s: Ignoring unknown or already-used " -- "button name \"%s\"\n", program_name, buttons[b]); -+ if (f != META_BUTTON_FUNCTION_LAST && !used[f]) -+ { -+ used[f] = TRUE; -+ new_layout.left_buttons[i++] = f; -+ -+ f = meta_button_opposite_function (f); -+ -+ if (f != META_BUTTON_FUNCTION_LAST) -+ new_layout.left_buttons[i++] = f; -+ -+ } -+ else -+ { -+ fprintf (stderr, "%s: Ignoring unknown or already-used " -+ "button name \"%s\"\n", program_name, buttons[b]); -+ } - } -- - b++; - } - -+ new_layout.left_buttons[i] = META_BUTTON_FUNCTION_LAST; -+ - g_strfreev (buttons); - - if (sides[1] != NULL) - { -- memset (used, 0, sizeof (used)); -+ for (i = 0; i < META_BUTTON_FUNCTION_LAST; i++) -+ { -+ used[i] = FALSE; -+#ifdef HAVE_METACITY_2_23_2 -+ new_layout.right_buttons_has_spacer[i] = FALSE; -+#endif -+ } - - buttons = g_strsplit (sides[1], ",", -1); - - i = b = 0; - while (buttons[b] != NULL) - { -- f = meta_button_function_from_string (buttons[b]); -- if (f != META_BUTTON_FUNCTION_LAST && !used[f]) -- { -- new_layout.right_buttons[i++] = f; -- used[f] = TRUE; -- -- f = meta_button_opposite_function (f); -- if (f != META_BUTTON_FUNCTION_LAST) -- new_layout.right_buttons[i++] = f; -- } -- else -- { -- fprintf (stderr, "%s: Ignoring unknown or already-used " -- "button name \"%s\"\n", program_name, buttons[b]); -- } -- -- b++; -+ f = meta_button_function_from_string (buttons[b]); -+#ifdef HAVE_METACITY_2_23_2 -+ if (i > 0 && strcmp("spacer", buttons[b]) == 0) -+ { -+ new_layout.right_buttons_has_spacer[i - 1] = TRUE; -+ f = meta_button_opposite_function (f); -+ if (f != META_BUTTON_FUNCTION_LAST) -+ new_layout.right_buttons_has_spacer[i - 2] = TRUE; -+ } -+ else -+#endif -+ { -+ if (f != META_BUTTON_FUNCTION_LAST && !used[f]) -+ { -+ used[f] = TRUE; -+ new_layout.right_buttons[i++] = f; -+ -+ f = meta_button_opposite_function (f); -+ -+ if (f != META_BUTTON_FUNCTION_LAST) -+ new_layout.right_buttons[i++] = f; -+ } -+ else -+ { -+ fprintf (stderr, "%s: Ignoring unknown or " -+ "already-used button name \"%s\"\n", -+ program_name, buttons[b]); -+ } -+ } -+ b++; - } -- -+ new_layout.right_buttons[i] = META_BUTTON_FUNCTION_LAST; -+ - g_strfreev (buttons); - } - } diff --git a/compiz-0.7.6-multi-screen-fix.patch b/compiz-0.7.6-multi-screen-fix.patch deleted file mode 100644 index 5f6176f..0000000 --- a/compiz-0.7.6-multi-screen-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/event.c b/src/event.c - ---- a/src/event.c -+++ b/src/event.c -@@ -2279,12 +2279,16 @@ handleEvent (CompDisplay *d, - w = NULL; - - for (s = d->screens; s; s = s->next) -+ { - for (w = s->windows; w; w = w->next) -+ { - if (w->syncAlarm == sa->alarm) -- break; -- -- if (w) -- handleSyncAlarm (w); -+ { -+ handleSyncAlarm(w); -+ return; -+ } -+ } -+ } - } - break; - } - diff --git a/compiz-0.7.6-utility-windows.patch b/compiz-0.7.6-utility-windows.patch deleted file mode 100644 index d4e2fc5..0000000 --- a/compiz-0.7.6-utility-windows.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/window.c b/src/window.c - ---- a/src/window.c -+++ b/src/window.c -@@ -2920,7 +2920,10 @@ isGroupTransient (CompWindow *w, - - if (w->transientFor == None || w->transientFor == w->screen->root) - { -- if (w->type & (CompWindowTypeDialogMask | -+ if (w->type & (CompWindowTypeUtilMask | -+ CompWindowTypeToolbarMask | -+ CompWindowTypeMenuMask | -+ CompWindowTypeDialogMask | - CompWindowTypeModalDialogMask)) - { - if (w->clientLeader == clientLeader) - diff --git a/compiz.spec b/compiz.spec index 42867f1..37915af 100644 --- a/compiz.spec +++ b/compiz.spec @@ -13,8 +13,8 @@ Name: compiz URL: http://www.go-compiz.org License: GPLv2+ and LGPLv2+ and MIT Group: User Interface/Desktops -Version: 0.7.6 -Release: 17%{?dist} +Version: 0.7.8 +Release: 1%{?dist} Summary: OpenGL window and compositing manager BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,11 +59,6 @@ Patch103: composite-cube-logo.patch Patch105: fedora-logo.patch Patch106: redhat-logo.patch #Patch110: scale-key.patch -# upstream commit 45caca2220f75bfd20074c217ebee10825413547 -Patch111: compiz-0.7.6-decoration-size.patch -Patch112: compiz-0.7.6-metacity-spacer.patch -Patch113: compiz-0.7.6-utility-windows.patch -Patch114: compiz-0.7.6-multi-screen-fix.patch # update translations in desktop-effects Patch115: desktop-effects-linguas.patch @@ -139,10 +134,6 @@ popd %patch106 -p1 -b .redhat-logo %endif #%patch110 -p1 -b .scale-key -%patch111 -p1 -b .decoration-size -%patch112 -p1 -b .metacity-spacer -%patch113 -p1 -b .utility-windows -%patch114 -p1 -b .multi-screen %build rm -rf $RPM_BUILD_ROOT @@ -354,6 +345,14 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Nov 08 2008 Adel Gadllah - 0.7.8-1 +- Update to 0.7.8 +- Dropped patches: + compiz-0.7.6-decoration-size.patch + compiz-0.7.6-metacity-spacer.patch + compiz-0.7.6-utility-windows.patch + compiz-0.7.6-multi-screen-fix.patch + * Mon Oct 27 2008 Matthias Clasen - 0.7.6-17 - Update some translations for the desktop-effects capplet diff --git a/sources b/sources index 5766639..e0b9cb8 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -75fe52ce6374174df6dccd4b6c13ee55 compiz-0.7.6.tar.bz2 -d56f2f6456fc89b06e1e0d21cab74f55 desktop-effects-0.7.18.tar.bz2 -7a7766f43797239ca0a4a0881d91f646 kde-desktop-effects-0.0.5.tar.bz2 +cb8baed2983dec5184f196346f973ad2 compiz-0.7.8.tar.bz2