Author: beatle
Date: 2006-11-13 20:29:44 -0500 (Mon, 13 Nov 2006)
New Revision: 3992
Removed:
branches/experimental/app/compiz/debian/patches/010_snap-inverted.patch
Modified:
branches/experimental/app/compiz/debian/changelog
branches/experimental/app/compiz/debian/patches/002_tfp-server-extension.patch
branches/experimental/app/compiz/debian/patches/005_glfinish.patch
branches/experimental/app/compiz/debian/patches/011_snap-by-default.patch
branches/experimental/app/compiz/debian/patches/012_metacity-theme-support.patch
Log:
Update patches and changelog.
Modified: branches/experimental/app/compiz/debian/changelog
===================================================================
--- branches/experimental/app/compiz/debian/changelog 2006-11-14 01:20:33 UTC
(rev 3991)
+++ branches/experimental/app/compiz/debian/changelog 2006-11-14 01:29:44 UTC
(rev 3992)
@@ -1,3 +1,12 @@
+compiz (0.3.2-1) experimental; urgency=low
+
+ * New upstream release.
+ + Remove 010_snap-inverted.patch, applied upstream.
+ + Refreshed other patches to apply cleanly again.
+ * Targetted at experimental until the release of etch.
+
+ -- Thierry Reding <[EMAIL PROTECTED]> Tue, 14 Nov 2006 02:28:30 +0100
+
compiz (0.2.2-1) unstable; urgency=low
[ Thierry Reding ]
Modified:
branches/experimental/app/compiz/debian/patches/002_tfp-server-extension.patch
===================================================================
---
branches/experimental/app/compiz/debian/patches/002_tfp-server-extension.patch
2006-11-14 01:20:33 UTC (rev 3991)
+++
branches/experimental/app/compiz/debian/patches/002_tfp-server-extension.patch
2006-11-14 01:29:44 UTC (rev 3992)
@@ -20,7 +20,7 @@
GLint stencilBits;
XSetWindowAttributes attrib;
GLfloat globalAmbient[] = { 0.1f, 0.1f, 0.1f, 0.1f };
-@@ -1274,7 +1274,11 @@ addScreen (CompDisplay *display,
+@@ -1276,7 +1276,11 @@ addScreen (CompDisplay *display,
XFree (visinfo);
glxExtensions = glXQueryExtensionsString (s->display->display, screenNum);
Modified: branches/experimental/app/compiz/debian/patches/005_glfinish.patch
===================================================================
--- branches/experimental/app/compiz/debian/patches/005_glfinish.patch
2006-11-14 01:20:33 UTC (rev 3991)
+++ branches/experimental/app/compiz/debian/patches/005_glfinish.patch
2006-11-14 01:29:44 UTC (rev 3992)
@@ -12,7 +12,7 @@
index 7cf12e1..c44b2a2 100644
--- a/src/display.c
+++ b/src/display.c
-@@ -2131,6 +2131,8 @@ eventLoop (void)
+@@ -2180,6 +2180,8 @@ eventLoop (void)
(*s->donePaintScreen) (s);
Deleted: branches/experimental/app/compiz/debian/patches/010_snap-inverted.patch
===================================================================
--- branches/experimental/app/compiz/debian/patches/010_snap-inverted.patch
2006-11-14 01:20:33 UTC (rev 3991)
+++ branches/experimental/app/compiz/debian/patches/010_snap-inverted.patch
2006-11-14 01:29:44 UTC (rev 3992)
@@ -1,113 +0,0 @@
-From: David Reveman <[EMAIL PROTECTED]>
-Date: Tue, 3 Oct 2006 20:17:29 +0000 (-0400)
-Subject: Add snap_inverted option to wobbly plugin.
-X-Git-Url:
http://gitweb.freedesktop.org/?p=xorg/app/compiz.git;a=commitdiff;h=3a90623a209e4b187ffb7387e650a233ef71c071
-
-Add snap_inverted option to wobbly plugin.
----
-
---- a/plugins/compiz.schemas.in
-+++ b/plugins/compiz.schemas.in
-@@ -10738,6 +10738,18 @@
- </schema>
-
- <schema>
-+
<key>/schemas/apps/compiz/plugins/wobbly/allscreens/options/snap_inverted</key>
-+
<applyto>/apps/compiz/plugins/wobbly/allscreens/options/snap_inverted</applyto>
-+ <owner>compiz</owner>
-+ <type>bool</type>
-+ <default>false</default>
-+ <locale name="C">
-+ <short>Snap Inverted</short>
-+ <long>Inverted window snapping</long>
-+ </locale>
-+ </schema>
-+
-+ <schema>
-
<key>/schemas/apps/compiz/plugins/wobbly/screen0/options/friction</key>
-
<applyto>/apps/compiz/plugins/wobbly/screen0/options/friction</applyto>
- <owner>compiz</owner>
---- a/plugins/wobbly.c
-+++ b/plugins/wobbly.c
-@@ -171,13 +171,16 @@ static char *moveWinType[] = {
-
- #define WOBBLY_SNAP_MODIFIERS_DEFAULT ShiftMask
-
-+#define WOBBLY_SNAP_INVERTED_DEFAULT FALSE
-+
- #define WOBBLY_MAXIMIZE_EFFECT_DEFAULT TRUE
-
- static int displayPrivateIndex;
-
--#define WOBBLY_DISPLAY_OPTION_SNAP 0
--#define WOBBLY_DISPLAY_OPTION_SHIVER 1
--#define WOBBLY_DISPLAY_OPTION_NUM 2
-+#define WOBBLY_DISPLAY_OPTION_SNAP 0
-+#define WOBBLY_DISPLAY_OPTION_SNAP_INVERTED 1
-+#define WOBBLY_DISPLAY_OPTION_SHIVER 2
-+#define WOBBLY_DISPLAY_OPTION_NUM 3
-
- typedef struct _WobblyDisplay {
- int screenPrivateIndex;
-@@ -2333,17 +2336,29 @@ wobblyHandleEvent (CompDisplay *d,
- {
- XkbStateNotifyEvent *stateEvent = (XkbStateNotifyEvent *) event;
- CompAction *action;
-+ Bool inverted;
- unsigned int mods = 0xffffffff;
-
-- action = &wd->opt[WOBBLY_DISPLAY_OPTION_SNAP].value.action;
-+ action = &wd->opt[WOBBLY_DISPLAY_OPTION_SNAP].value.action;
-+ inverted = wd->opt[WOBBLY_DISPLAY_OPTION_SNAP_INVERTED].value.b;
-
- if (action->type & CompBindingTypeKey)
- mods = action->key.modifiers;
-
- if ((stateEvent->mods & mods) == mods)
-- wobblyEnableSnapping (d, NULL, 0, NULL, 0);
-+ {
-+ if (inverted)
-+ wobblyDisableSnapping (d, NULL, 0, NULL, 0);
-+ else
-+ wobblyEnableSnapping (d, NULL, 0, NULL, 0);
-+ }
- else
-- wobblyDisableSnapping (d, NULL, 0, NULL, 0);
-+ {
-+ if (inverted)
-+ wobblyEnableSnapping (d, NULL, 0, NULL, 0);
-+ else
-+ wobblyDisableSnapping (d, NULL, 0, NULL, 0);
-+ }
- }
- }
- break;
-@@ -2851,10 +2866,13 @@ wobblySetDisplayOption (CompDisplay
- if (compSetActionOption (o, value))
- return TRUE;
- break;
-+ case WOBBLY_DISPLAY_OPTION_SNAP_INVERTED:
-+ if (compSetBoolOption (o, value))
-+ return TRUE;
-+ break;
- case WOBBLY_DISPLAY_OPTION_SHIVER:
- if (setDisplayAction (display, o, value))
- return TRUE;
-- break;
- default:
- break;
- }
-@@ -2881,6 +2899,13 @@ wobblyDisplayInitOptions (WobblyDisplay
- o->value.action.key.modifiers = WOBBLY_SNAP_MODIFIERS_DEFAULT;
- o->value.action.key.keycode = 0;
-
-+ o = &wd->opt[WOBBLY_DISPLAY_OPTION_SNAP_INVERTED];
-+ o->name = "snap_inverted";
-+ o->shortDesc = N_("Snap Inverted");
-+ o->longDesc = N_("Inverted window snapping");
-+ o->type = CompOptionTypeBool;
-+ o->value.b = WOBBLY_SNAP_INVERTED_DEFAULT;
-+
- o = &wd->opt[WOBBLY_DISPLAY_OPTION_SHIVER];
- o->name = "shiver";
- o->shortDesc = N_("Shiver");
Modified:
branches/experimental/app/compiz/debian/patches/011_snap-by-default.patch
===================================================================
--- branches/experimental/app/compiz/debian/patches/011_snap-by-default.patch
2006-11-14 01:20:33 UTC (rev 3991)
+++ branches/experimental/app/compiz/debian/patches/011_snap-by-default.patch
2006-11-14 01:29:44 UTC (rev 3992)
@@ -5,7 +5,7 @@
--- a/plugins/compiz.schemas.in 2006-10-09 11:28:27.000000000 +0200
+++ b/plugins/compiz.schemas.in 2006-10-09 11:28:53.000000000 +0200
-@@ -10742,7 +10742,7 @@
+@@ -10654,7 +10658,7 @@
<applyto>/apps/compiz/plugins/wobbly/allscreens/options/snap_inverted</applyto>
<owner>compiz</owner>
<type>bool</type>
Modified:
branches/experimental/app/compiz/debian/patches/012_metacity-theme-support.patch
===================================================================
---
branches/experimental/app/compiz/debian/patches/012_metacity-theme-support.patch
2006-11-14 01:20:33 UTC (rev 3991)
+++
branches/experimental/app/compiz/debian/patches/012_metacity-theme-support.patch
2006-11-14 01:29:44 UTC (rev 3992)
@@ -9,7 +9,7 @@
--- a/gtk/window-decorator/gtk-window-decorator.c
+++ b/gtk/window-decorator/gtk-window-decorator.c
-@@ -2803,7 +2803,7 @@
+@@ -3044,7 +3044,7 @@
MetaFrameFlags flags;
MetaTheme *theme;
GdkRectangle clip;
@@ -18,7 +18,7 @@
theme = meta_theme_get_current ();
-@@ -2823,10 +2823,10 @@
+@@ -3064,10 +3064,10 @@
break;
}
@@ -35,7 +35,7 @@
--- a/configure.ac
+++ b/configure.ac
-@@ -228,7 +228,7 @@
+@@ -231,7 +231,7 @@
LIBS="$save_LIBS"
if test "x$use_metacity" = "xyes"; then
@@ -46,7 +46,7 @@
--- a/configure
+++ b/configure
-@@ -24628,12 +24628,12 @@
+@@ -24635,12 +24635,12 @@
pkg_cv_METACITY_CFLAGS="$METACITY_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
@@ -62,7 +62,7 @@
else
pkg_failed=yes
fi
-@@ -24646,12 +24646,12 @@
+@@ -24653,12 +24653,12 @@
pkg_cv_METACITY_LIBS="$METACITY_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -78,7 +78,7 @@
else
pkg_failed=yes
fi
-@@ -24670,9 +24670,9 @@
+@@ -24677,9 +24677,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
