compiz: Changes to 'debian-unstable'
debian/changelog | 13 +++++++
debian/control | 1
debian/patches/012_snap-by-default.patch | 4 +-
debian/patches/014_fix-no-border-window-shadow.patch | 6 +--
debian/patches/015_optional-fbo.patch | 12 +++---
debian/patches/compiz-manager-nvidia-settings-optional.patch | 15 ++++++++
debian/patches/compiz-manager-posixly-correct.patch | 4 +-
debian/patches/series | 1
kde/window-decorator/decorator.cpp | 2 -
kde/window-decorator/window.cpp | 20 +++++++----
kde/window-decorator/window.h | 3 +
11 files changed, 59 insertions(+), 22 deletions(-)
New commits:
commit 7dbdc4f0a0486b14725ae43d33533ac4056f0f08
Author: Sean Finney <seanius@seanius.net>
Date: Wed Feb 27 08:14:12 2008 +0100
200*8*, d'oh.
diff --git a/debian/changelog b/debian/changelog
index c2b80bf..c5dbb7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-compiz (0.6.3~git20070115.0ea58487-1) unstable; urgency=low
+compiz (0.6.3~git20080115.0ea58487-1) unstable; urgency=low
* New upstream (git snapshot) release. Refreshed quilt patches.
* Contains upstream fix for kde-window-decorator problems with not properly
commit a2742e1968adb398aea210eb11f1c9ec442333d1
Author: Sean Finney <seanius@seanius.net>
Date: Wed Feb 27 07:51:02 2008 +0100
fix compiz-manager wrt nvidia-settings possibly not present. add note about
more upstream closed bugs.
diff --git a/debian/changelog b/debian/changelog
index b03482f..c2b80bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
compiz (0.6.3~git20070115.0ea58487-1) unstable; urgency=low
* New upstream (git snapshot) release. Refreshed quilt patches.
+ * Contains upstream fix for kde-window-decorator problems with not properly
+ mapping/rendering titlebars. closes: #458464, #460186.
* Remove timestamps from quilt patches (package maintainers, you
should put QUILT_NO_DIFF_TIMESTAMPS=1 in your ~/.quiltrc).
* add compizconfig-settings-manager to Suggests field for compiz.
+ * don't blindly assume that the nvidia-settings program is present.
+ patch: compiz-manager-nvidia-settings-optional.patch. closes: #463645.
-- sean finney <seanius@debian.org> Tue, 26 Feb 2008 20:08:31 +0100
diff --git a/debian/patches/compiz-manager-nvidia-settings-optional.patch b/debian/patches/compiz-manager-nvidia-settings-optional.patch
new file mode 100644
index 0000000..4e18cff
--- /dev/null
+++ b/debian/patches/compiz-manager-nvidia-settings-optional.patch
@@ -0,0 +1,15 @@
+Index: compiz/debian/compiz-manager
+===================================================================
+--- compiz.orig/debian/compiz-manager
++++ compiz/debian/compiz-manager
+@@ -198,6 +198,10 @@
+ # Check if the nVidia card has enough video ram to make sense
+ check_nvidia_memory()
+ {
++ if ! which $NVIDIA_SETTINGS >/dev/null 2>&1; then
++ verbose "No $NVIDIA_SETTINGS program available to determine VideoRam."
++ return 0
++ fi
+ MEM=$(${NVIDIA_SETTINGS} -q VideoRam | egrep Attribute\ \'VideoRam\'\ .*: | cut -d: -f3 | sed 's/[^0-9]//g')
+ if [ $MEM -lt $NVIDIA_MEMORY ]; then
+ verbose "Less than ${NVIDIA_MEMORY}kb of memory and nVidia";
diff --git a/debian/patches/series b/debian/patches/series
index 2dcdef2..6868ebe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
014_fix-no-border-window-shadow.patch
015_optional-fbo.patch
compiz-manager-posixly-correct.patch
+compiz-manager-nvidia-settings-optional.patch
commit 8218d3663dce6a4b1ecb3e4071473ca97123cd9a
Author: Sean Finney <seanius@seanius.net>
Date: Tue Feb 26 23:29:18 2008 +0100
add ccsm to suggests
diff --git a/debian/changelog b/debian/changelog
index f2f3966..b03482f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ compiz (0.6.3~git20070115.0ea58487-1) unstable; urgency=low
* New upstream (git snapshot) release. Refreshed quilt patches.
* Remove timestamps from quilt patches (package maintainers, you
should put QUILT_NO_DIFF_TIMESTAMPS=1 in your ~/.quiltrc).
+ * add compizconfig-settings-manager to Suggests field for compiz.
-- sean finney <seanius@debian.org> Tue, 26 Feb 2008 20:08:31 +0100
diff --git a/debian/control b/debian/control
index 3dff286..544f5b4 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Standards-Version: 3.7.3
Package: compiz
Architecture: all
Depends: compiz-core (>= ${source:Version}), compiz-plugins (>= ${source:Version}), compiz-gtk (>= ${source:Version}), compiz-gnome (>= ${source:Version})
+Suggests: compizconfig-settings-manager
Description: OpenGL window and compositing manager
Compiz brings to life a variety of visual effects that make the Linux desktop
easier to use, more powerful and intuitive, and more accessible for users
commit ae13ff6289d66ef42c6ae053cbd07da1a9d2a548
Author: Sean Finney <seanius@seanius.net>
Date: Tue Feb 26 20:10:58 2008 +0100
new upstream snapshot, refresh quilt patches and drop quilt timestamps
diff --git a/debian/changelog b/debian/changelog
index ea49635..f2f3966 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+compiz (0.6.3~git20070115.0ea58487-1) unstable; urgency=low
+
+ * New upstream (git snapshot) release. Refreshed quilt patches.
+ * Remove timestamps from quilt patches (package maintainers, you
+ should put QUILT_NO_DIFF_TIMESTAMPS=1 in your ~/.quiltrc).
+
+ -- sean finney <seanius@debian.org> Tue, 26 Feb 2008 20:08:31 +0100
+
compiz (0.6.3~git20071222.061ff159-1) unstable; urgency=low
* New upstream (git snapshot) release. Refreshed quilt patches.
diff --git a/debian/patches/012_snap-by-default.patch b/debian/patches/012_snap-by-default.patch
index b09342d..f79ef07 100644
--- a/debian/patches/012_snap-by-default.patch
+++ b/debian/patches/012_snap-by-default.patch
@@ -5,8 +5,8 @@ Not submitted to upstream.
Index: compiz/metadata/wobbly.xml.in
===================================================================
---- compiz.orig/metadata/wobbly.xml.in 2007-08-18 23:30:00.000000000 -0700
-+++ compiz/metadata/wobbly.xml.in 2007-08-18 23:30:14.000000000 -0700
+--- compiz.orig/metadata/wobbly.xml.in
++++ compiz/metadata/wobbly.xml.in
@@ -21,7 +21,7 @@
<option name="snap_inverted" type="bool">
<_short>Snap Inverted</_short>
diff --git a/debian/patches/014_fix-no-border-window-shadow.patch b/debian/patches/014_fix-no-border-window-shadow.patch
index eef2b1a..f897e99 100644
--- a/debian/patches/014_fix-no-border-window-shadow.patch
+++ b/debian/patches/014_fix-no-border-window-shadow.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix no border window shadow
libdecoration/decoration.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
-Index: compiz.git/libdecoration/decoration.c
+Index: compiz/libdecoration/decoration.c
===================================================================
---- compiz.git.orig/libdecoration/decoration.c 2007-04-03 07:00:04.000000000 +0200
-+++ compiz.git/libdecoration/decoration.c 2007-04-05 10:12:47.000000000 +0200
+--- compiz.orig/libdecoration/decoration.c
++++ compiz/libdecoration/decoration.c
@@ -1243,7 +1243,9 @@
}
diff --git a/debian/patches/015_optional-fbo.patch b/debian/patches/015_optional-fbo.patch
index a37e24a..03d1b85 100644
--- a/debian/patches/015_optional-fbo.patch
+++ b/debian/patches/015_optional-fbo.patch
@@ -1,7 +1,7 @@
Index: compiz/include/compiz.h
===================================================================
---- compiz.orig/include/compiz.h 2007-12-22 11:13:38.000000000 +0100
-+++ compiz/include/compiz.h 2007-12-22 11:13:49.000000000 +0100
+--- compiz.orig/include/compiz.h
++++ compiz/include/compiz.h
@@ -226,6 +226,7 @@
extern Bool noDetection;
extern Bool useDesktopHints;
@@ -12,8 +12,8 @@ Index: compiz/include/compiz.h
extern char *defaultTextureFilter;
Index: compiz/src/main.c
===================================================================
---- compiz.orig/src/main.c 2007-12-22 11:13:38.000000000 +0100
-+++ compiz/src/main.c 2007-12-22 11:13:49.000000000 +0100
+--- compiz.orig/src/main.c
++++ compiz/src/main.c
@@ -62,6 +62,7 @@
Bool noDetection = FALSE;
Bool useDesktopHints = TRUE;
@@ -43,8 +43,8 @@ Index: compiz/src/main.c
else if (!strcmp (argv[i], "--use-root-window"))
Index: compiz/src/screen.c
===================================================================
---- compiz.orig/src/screen.c 2007-12-22 11:13:38.000000000 +0100
-+++ compiz/src/screen.c 2007-12-22 11:13:49.000000000 +0100
+--- compiz.orig/src/screen.c
++++ compiz/src/screen.c
@@ -1877,7 +1877,7 @@
}
diff --git a/debian/patches/compiz-manager-posixly-correct.patch b/debian/patches/compiz-manager-posixly-correct.patch
index 61bfdb2..4b0d4b5 100644
--- a/debian/patches/compiz-manager-posixly-correct.patch
+++ b/debian/patches/compiz-manager-posixly-correct.patch
@@ -2,8 +2,8 @@ debian bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=456628
reported upstream: http://bugs.opencompositing.org/show_bug.cgi?id=708
Index: compiz/debian/compiz-manager
===================================================================
---- compiz.orig/debian/compiz-manager 2007-12-22 11:18:59.000000000 +0100
-+++ compiz/debian/compiz-manager 2007-12-22 11:19:29.000000000 +0100
+--- compiz.orig/debian/compiz-manager
++++ compiz/debian/compiz-manager
@@ -150,7 +150,7 @@
check_tfp()
{
commit 0ea58487fd2b0db25fae93ff08ae6680d1ad6557
Author: Dennis Kasprzyk <onestone@opencompositing.org>
Date: Tue Jan 15 14:53:46 2008 +0100
Wait for the proper configure (and map) events before rebinding the decoration pixmap.
- On some systems the decoration widget window gets mapped first and resized after the map. KWD used a wrong window pixmap in this case.
diff --git a/kde/window-decorator/decorator.cpp b/kde/window-decorator/decorator.cpp
index df2d188..980233b 100644
--- a/kde/window-decorator/decorator.cpp
+++ b/kde/window-decorator/decorator.cpp
@@ -589,7 +589,7 @@ KWD::Decorator::x11EventFilter (XEvent *xevent)
else
break;
- if (client->handleConfigure ())
+ if (client->handleConfigure (QSize (xce->width, xce->height)))
{
if (!mIdleTimer.isActive ())
mIdleTimer.start (0, TRUE);
diff --git a/kde/window-decorator/window.cpp b/kde/window-decorator/window.cpp
index 5165995..75f149d 100644
--- a/kde/window-decorator/window.cpp
+++ b/kde/window-decorator/window.cpp
@@ -1144,15 +1144,18 @@ KWD::Window::resizeDecoration (bool force)
mPicture = 0;
}
+ if (w != width() || h != height())
+ {
+ mPendingConfigure = 1;
+ }
+
setGeometry (QRect (mGeometry.x () + ROOT_OFF_X - mBorder.left,
mGeometry.y () + ROOT_OFF_Y - mBorder.top,
w, h));
- if (mMapped)
- {
- mPendingConfigure++;
- }
- else
+ mSize = QSize (w, h);
+
+ if (!mMapped)
{
mPendingMap = 1;
@@ -1219,12 +1222,15 @@ KWD::Window::handleMap (void)
}
bool
-KWD::Window::handleConfigure (void)
+KWD::Window::handleConfigure (QSize size)
{
if (!mPendingConfigure)
return FALSE;
- mPendingConfigure--;
+ if (size != mSize)
+ return FALSE;
+
+ mPendingConfigure = 0;
if (mPendingConfigure || mPendingMap)
return FALSE;
diff --git a/kde/window-decorator/window.h b/kde/window-decorator/window.h
index eb4a8d3..d22cff2 100644
--- a/kde/window-decorator/window.h
+++ b/kde/window-decorator/window.h
@@ -156,7 +156,7 @@ class Window:public QWidget, public KDecorationBridge {
mDamage += QRegion (x, y, w, h);
}
bool handleMap (void);
- bool handleConfigure (void);
+ bool handleConfigure (QSize size);
void processDamage (void);
decor_context_t *context (void)
{
@@ -235,6 +235,7 @@ class Window:public QWidget, public KDecorationBridge {
bool mMapped;
int mPendingMap;
int mPendingConfigure;
+ QSize mSize;
KProcess *mProcessKiller;
};
}
Reply to: