compiz: Changes to 'debian-unstable'
Makefile.am | 8
NEWS | 74
autogen.sh | 2
configure.ac | 15
debian/changelog | 14
debian/compiz-core.install | 1
debian/compiz-gnome.install | 2
debian/compiz-kde.install | 5
debian/compiz-manager | 37
debian/control | 8
debian/gbp.conf | 8
debian/patches/012_snap-by-default.patch | 2
debian/patches/015_optional-fbo.patch | 22
debian/patches/compiz-manager-nvidia-settings-optional.patch | 2
debian/patches/compiz-manager-posixly-correct.patch | 13
debian/patches/disable-libx11-xcb-support.patch | 46
debian/patches/series | 3
debian/patches/whitelist-fglrx.patch | 2
debian/patches/xscreensaver-damage-fix.patch | 18
debian/rules | 6
gtk/gnome/50-compiz-desktop-key.xml.in | 10
gtk/gnome/Makefile.am | 23
gtk/gnome/compiz-window-manager.c | 86
gtk/gnome/compiz-wm.desktop.in | 17
gtk/gnome/compiz.desktop.in | 8
gtk/window-decorator/Makefile.am | 1
gtk/window-decorator/gtk-window-decorator.c | 369 -
include/compiz-core.h | 222
include/compiz-scale.h | 6
include/compiz.h | 3
kde/window-decorator-kde4/Makefile.am | 12
kde/window-decorator-kde4/decorator.cpp | 9
kde/window-decorator-kde4/switcher.cpp | 19
kde/window-decorator-kde4/switcher.h | 4
kde/window-decorator-kde4/utils.cpp | 6
kde/window-decorator-kde4/utils.h | 2
kde/window-decorator-kde4/window.cpp | 112
kde/window-decorator-kde4/window.h | 17
kde/window-decorator/Makefile.am | 6
kde/window-decorator/decorator.cpp | 14
kde/window-decorator/utils.cpp | 6
kde/window-decorator/utils.h | 2
libdecoration/decoration.c | 2
metadata/Makefile.am | 75
metadata/annotate.xml.in | 1
metadata/blur.xml.in | 3
metadata/clone.xml.in | 1
metadata/commands.xml.in | 225
metadata/core.xml.in | 487 --
metadata/core.xml.in.in | 335 +
metadata/cube.xml.in | 236 -
metadata/dbus.xml.in | 1
metadata/decoration.xml.in | 1
metadata/fade.xml.in | 52
metadata/fs.xml.in | 1
metadata/glib.xml.in | 1
metadata/gnomecompat.xml.in | 52
metadata/inotify.xml.in | 1
metadata/minimize.xml.in | 1
metadata/move.xml.in | 1
metadata/obs.xml.in | 169
metadata/place.xml.in | 83
metadata/png.xml.in | 1
metadata/regex.xml.in | 1
metadata/resize.xml.in | 64
metadata/rotate.xml.in | 339 -
metadata/scale.xml.in | 312 -
metadata/screenshot.xml.in | 1
metadata/svg.xml.in | 1
metadata/switcher.xml.in | 142
metadata/video.xml.in | 1
metadata/water.xml.in | 1
metadata/wobbly.xml.in | 2
metadata/zoom.xml.in | 1
plugins/Makefile.am | 13
plugins/annotate.c | 5
plugins/blur.c | 36
plugins/clone.c | 6
plugins/commands.c | 352 +
plugins/cube.c | 17
plugins/dbus.c | 201
plugins/decoration.c | 107
plugins/fade.c | 346 +
plugins/gconf.c | 19
plugins/glib.c | 4
plugins/gnomecompat.c | 344 +
plugins/ini.c | 30
plugins/kconfig.cpp | 8
plugins/minimize.c | 96
plugins/move.c | 23
plugins/obs.c | 746 +++
plugins/place.c | 258 -
plugins/regex.c | 4
plugins/resize.c | 49
plugins/rotate.c | 30
plugins/scale.c | 107
plugins/screenshot.c | 7
plugins/svg.c | 3
plugins/switcher.c | 44
plugins/video.c | 14
plugins/water.c | 19
plugins/wobbly.c | 3
plugins/zoom.c | 3
po/POTFILES.in | 6
po/af.po | 1597 ++++--
po/ar.po | 1530 ++++--
po/bg.po | 2338 +++++----
po/bn.po | 1734 ++++---
po/bn_IN.po | 1732 ++++---
po/bs.po | 1579 ++++--
po/ca.po | 1755 ++++---
po/cs.po | 1667 ++++---
po/cy.po | 1618 ++++--
po/da.po | 1747 ++++---
po/de.po | 1755 ++++---
po/el.po | 1768 ++++---
po/en_GB.po | 1661 ++++---
po/en_US.po | 1555 ++++--
po/es.po | 1842 +++++--
po/et.po | 1658 ++++---
po/eu.po | 1983 +++++---
po/fi.po | 1975 +++++---
po/fr.po | 1792 ++++---
po/gl.po | 2574 ++++++-----
po/gu.po | 1688 ++++---
po/he.po | 1721 ++++---
po/hi.po | 1756 ++++---
po/hr.po | 1677 ++++---
po/hu.po | 1673 ++++---
po/id.po | 1566 ++++--
po/it.po | 1796 ++++---
po/ja.po | 1722 ++++---
po/ka.po | 1530 ++++--
po/km.po | 1663 ++++---
po/ko.po | 1696 ++++---
po/lo.po | 1530 ++++--
po/lt.po | 1655 ++++---
po/mk.po | 1533 ++++--
po/mr.po | 1599 ++++--
po/nb.po | 1707 ++++---
po/nl.po | 1723 ++++---
po/or.po | 1689 ++++---
po/pa.po | 1739 ++++---
po/pl.po | 1791 ++++---
po/pt.po | 1771 ++++---
po/pt_BR.po | 1731 ++++---
po/ro.po | 1723 ++++---
po/ru.po | 1724 ++++---
po/sk.po | 1664 ++++---
po/sl.po | 1796 ++++---
po/sr.po | 1718 ++++---
po/sv.po | 1709 ++++---
po/ta.po | 1536 ++++--
po/tr.po | 1855 +++++--
po/uk.po | 1873 +++++---
po/vi.po | 1530 ++++--
po/xh.po | 1599 ++++--
po/zh_CN.po | 2552 ++++++----
po/zh_TW.po | 1720 ++++---
po/zu.po | 1599 ++++--
src/action.c | 6
src/core.c | 13
src/display.c | 337 -
src/event.c | 422 +
src/fragment.c | 6
src/main.c | 53
src/match.c | 19
src/metadata.c | 24
src/option.c | 12
src/paint.c | 9
src/plugin.c | 91
src/screen.c | 372 -
src/session.c | 62
src/texture.c | 8
src/window.c | 854 ++-
175 files changed, 67770 insertions(+), 38668 deletions(-)
New commits:
commit d372247e73e42a5267a6dcad0fc439e7b03444a6
Author: Sean Finney <seanius@debian.org>
Date: Sun Apr 5 18:22:09 2009 +0200
update offsets in remaining compiz-manager patches
diff --git a/debian/patches/compiz-manager-nvidia-settings-optional.patch b/debian/patches/compiz-manager-nvidia-settings-optional.patch
index 11e11fe..3e1c2a7 100644
--- a/debian/patches/compiz-manager-nvidia-settings-optional.patch
+++ b/debian/patches/compiz-manager-nvidia-settings-optional.patch
@@ -1,6 +1,6 @@
--- 0-compiz.orig/debian/compiz-manager
+++ 0-compiz/debian/compiz-manager
-@@ -197,6 +197,10 @@ check_xgl()
+@@ -206,6 +206,10 @@ check_xgl()
# Check if the nVidia card has enough video ram to make sense
check_nvidia_memory()
{
diff --git a/debian/patches/whitelist-fglrx.patch b/debian/patches/whitelist-fglrx.patch
index ba593c9..eea2abb 100644
--- a/debian/patches/whitelist-fglrx.patch
+++ b/debian/patches/whitelist-fglrx.patch
@@ -2,7 +2,7 @@ whitelist the fglrx driver too
see #495539
--- 0-compiz.orig/debian/compiz-manager
+++ 0-compiz/debian/compiz-manager
-@@ -51,7 +51,7 @@ FALLBACKWM="${METACITY}"
+@@ -59,7 +59,7 @@ fi
FALLBACKWM_OPTIONS="--replace $@"
# Driver whitelist
commit b92a4f7b92c85971d62e86a81796adacb354d31c
Author: Sean Finney <seanius@debian.org>
Date: Sun Apr 5 18:20:49 2009 +0200
compiz-manager-posixly-correct.patch is now incorporated upstream
diff --git a/debian/patches/compiz-manager-posixly-correct.patch b/debian/patches/compiz-manager-posixly-correct.patch
deleted file mode 100644
index e913f4a..0000000
--- a/debian/patches/compiz-manager-posixly-correct.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-debian bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=456628
-reported upstream: http://bugs.opencompositing.org/show_bug.cgi?id=708
---- 0-compiz.orig/debian/compiz-manager
-+++ 0-compiz/debian/compiz-manager
-@@ -149,7 +149,7 @@ check_fbconfig()
- check_tfp()
- {
- verbose "Checking for texture_from_pixmap: "
-- if [ $($GLXINFO 2>/dev/null | grep GLX_EXT_texture_from_pixmap -c) -gt 2 ] ; then
-+ if [ $($GLXINFO 2>/dev/null | grep -c GLX_EXT_texture_from_pixmap) -gt 2 ] ; then
- verbose "present. \n"
- return 0;
- else
diff --git a/debian/patches/series b/debian/patches/series
index 0feab7e..19d8697 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
012_snap-by-default.patch
014_fix-no-border-window-shadow.patch
015_optional-fbo.patch
-compiz-manager-posixly-correct.patch
compiz-manager-nvidia-settings-optional.patch
whitelist-fglrx.patch
commit c3ee16e2cd783829f0b0b104bc32430cf7da51c5
Author: Sean Finney <seanius@debian.org>
Date: Sun Apr 5 18:18:58 2009 +0200
update compiz-manager to upstream's 223180bf
diff --git a/debian/compiz-manager b/debian/compiz-manager
index c5e3d7c..91605c0 100644
--- a/debian/compiz-manager
+++ b/debian/compiz-manager
@@ -27,12 +27,13 @@
#
-COMPIZ_BIN_PATH="/usr/bin/" # For window decorators and compiz
-PLUGIN_PATH="/usr/lib/compiz/"
+COMPIZ_BIN_PATH="/usr/local/bin/" # For window decorators and compiz
+PLUGIN_PATH="/usr/local/lib/compiz/"
GLXINFO="/usr/bin/glxinfo"
KWIN="/usr/bin/kwin"
METACITY="/usr/bin/metacity"
-COMPIZ_NAME="compiz.real" # Final name for compiz (compiz.real)
+XFWM="/usr/bin/xfwm"
+COMPIZ_NAME="compiz" # Final name for compiz (compiz.real)
# For Xgl LD_PRELOAD
LIBGL_NVIDIA="/usr/lib/nvidia/libGL.so.1.2.xlibmesa"
@@ -46,8 +47,15 @@ NVIDIA_SETTINGS="nvidia-settings" # Assume it's in the path by default
# For detecting what driver is in use, the + is for one or more /'s
XORG_DRIVER_PATH="/usr/lib/xorg/modules/drivers/+"
+FALLBACKWM="xterm"
+if [ x"$KDE_FULL_SESSION" = x"true" ]; then
+ FALLBACKWM="${KWIN}";
+elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then
+ FALLBACKWM="${METACITY}"
+elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then
+ FALLBACKWM="${XFWM}"
+fi
-FALLBACKWM="${METACITY}"
FALLBACKWM_OPTIONS="--replace $@"
# Driver whitelist
@@ -63,6 +71,7 @@ unset T
COMPIZ_OPTIONS="--ignore-desktop-hints --replace"
COMPIZ_PLUGINS=""
+ENV=""
# Use emerald by default if it exist
USE_EMERALD="yes"
@@ -149,7 +158,7 @@ check_fbconfig()
check_tfp()
{
verbose "Checking for texture_from_pixmap: "
- if [ $($GLXINFO 2>/dev/null | grep GLX_EXT_texture_from_pixmap -c) -gt 2 ] ; then
+ if [ $($GLXINFO 2>/dev/null | grep -c GLX_EXT_texture_from_pixmap) -gt 2 ] ; then
verbose "present. \n"
return 0;
else
@@ -281,23 +290,27 @@ have_blacklisted_pciid()
build_env()
{
if check_nvidia; then
- export __GL_YIELD=NOTHING
+ ENV="__GL_YIELD=NOTHING "
fi
if [ "$INDIRECT" = "yes" ]; then
- export LIBGL_ALWAYS_INDIRECT=1
+ ENV="$ENV LIBGL_ALWAYS_INDIRECT=1 "
fi
if check_xgl; then
if [ -f ${LIBGL_NVIDIA} ]; then
- export LD_PRELOAD="${LD_PRELOAD:+${LD_PRELOAD} }${LIBGL_NVIDIA}"
+ ENV="$ENV LD_PRELOAD=${LIBGL_NVIDIA}"
verbose "Enabling Xgl with nVidia drivers...\n"
fi
if [ -f ${LIBGL_FGLRX} ]; then
- export LD_PRELOAD="${LD_PRELOAD:+${LD_PRELOAD} }${LIBGL_FGLRX}"
+ ENV="$ENV LD_PRELOAD=${LIBGL_FGLRX}"
verbose "Enabling Xgl with fglrx ATi drivers...\n"
fi
fi
- export FROM_WRAPPER=yes
+ ENV="$ENV FROM_WRAPPER=yes"
+
+ if [ -n "$ENV" ]; then
+ export $ENV
+ fi
}
build_args()
@@ -305,6 +318,9 @@ build_args()
if [ "x$INDIRECT" = "xyes" ]; then
COMPIZ_OPTIONS="$COMPIZ_OPTIONS --indirect-rendering "
fi
+ if [ ! -z "$DESKTOP_AUTOSTART_ID" ]; then
+ COMPIZ_OPTIONS="$COMPIZ_OPTIONS --sm-client-id $DESKTOP_AUTOSTART_ID"
+ fi
if check_nvidia; then
if [ "x$INDIRECT" != "xyes" ]; then
COMPIZ_OPTIONS="$COMPIZ_OPTIONS --loose-binding"
@@ -371,6 +387,7 @@ build_args
if [ "x$CM_DRY" = "xyes" ]; then
verbose "Dry run finished: everything should work with regards to Compiz and 3D.\n"
+ verbose "Execute: ${COMPIZ_BIN_PATH}${COMPIZ_NAME} $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS \n"
exit 0;
fi
# start the gtk-window-decorator if present
commit cfb88175cb9070564d79776c644e9fa458e86aaa
Author: Sean Finney <seanius@debian.org>
Date: Sun Apr 5 18:17:55 2009 +0200
lintian: update Standards-Version to 3.8.1
diff --git a/debian/control b/debian/control
index c35b7c3..699ffad 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: autoconf, automake1.9, autotools-dev,
libxdamage-dev (>=1:1.0.3), libxfixes-dev (>= 1:4.0.1), libxinerama-dev,
libxml-parser-perl, libxrandr-dev (>= 2:1.1.0.2), libxrender-dev (>= 1:0.9.1),
quilt (>= 0.40), x11proto-gl-dev (>= 1.4.8), xsltproc
-Standards-Version: 3.7.3
+Standards-Version: 3.8.1
Package: compiz
Architecture: all
commit 194a3e8db4a40a2ff2f49adb34a66521218a9c69
Author: Sean Finney <seanius@debian.org>
Date: Sun Apr 5 18:17:32 2009 +0200
lintian: add misc:Depends to compiz
diff --git a/debian/control b/debian/control
index fe63311..c35b7c3 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,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})
+Depends: compiz-core (>= ${source:Version}), compiz-plugins (>= ${source:Version}), compiz-gtk (>= ${source:Version}), compiz-gnome (>= ${source:Version}), ${misc:Depends}
Suggests: compizconfig-settings-manager
Description: OpenGL window and compositing manager
Compiz brings to life a variety of visual effects that make the Linux desktop
commit c3803dd9d4e7f7bf2414a1701228a7879f53c4ec
Author: Sean Finney <seanius@debian.org>
Date: Sun Apr 5 16:32:40 2009 +0200
unconditionally remove kconfig shared objects
currently the libkconfig shared objects are not built, because
they don't build in a kde4 system. therefore do not fail when
unable to remove them in debian/rules as they may not exist.
diff --git a/debian/rules b/debian/rules
index 8acf5f2..0c45835 100755
--- a/debian/rules
+++ b/debian/rules
@@ -114,8 +114,8 @@ binary-arch: build install
dh_install --sourcedir=$(DESTDIR) --fail-missing
# the gconf and kconfig plugins are seperately installed into
# the -gnome and -kde packages respectively
- rm $(CURDIR)/debian/tmp/usr/lib/compiz/libkconfig.so
- rm $(CURDIR)/debian/compiz-plugins/usr/lib/compiz/libkconfig.so
+ rm -f $(CURDIR)/debian/tmp/usr/lib/compiz/libkconfig.so
+ rm -f $(CURDIR)/debian/compiz-plugins/usr/lib/compiz/libkconfig.so
rm $(CURDIR)/debian/tmp/usr/lib/compiz/libgconf.so
rm $(CURDIR)/debian/compiz-plugins/usr/lib/compiz/libgconf.so
dh_installman
commit a39b79053583c42a79519f2994a5fd0f3a333916
Author: Sean Finney <seanius@debian.org>
Date: Sun Apr 5 16:29:46 2009 +0200
update list of installed files for kde4 compiz-kde
diff --git a/debian/compiz-kde.install b/debian/compiz-kde.install
index 0b2c67f..5ecba97 100644
--- a/debian/compiz-kde.install
+++ b/debian/compiz-kde.install
@@ -1,4 +1 @@
-usr/bin/kde-window-decorator
-usr/lib/compiz/libkconfig.so
-usr/share/config.kcfg/*.kcfg
-etc/kde3/compizrc
+usr/bin/kde4-window-decorator
commit e10727af35cfb3b594f68bf9b81b0140dfb01a02
Author: Sean Finney <seanius@debian.org>
Date: Wed Apr 1 00:01:41 2009 +0200
changelog with initial 0.8.2-1 updates (not yet ready)
diff --git a/debian/changelog b/debian/changelog
index 797dde1..66ed902 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+compiz (0.8.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * remove obsolete disable-libx11-xcb-support.patch
+ * remove xscreensaver-damage-fix.patch (incorporated upstream)
+ * massage offsets/context for remaining patches
+ * update location of compiz-gnome desktop file
+ * add new app desktop file for compiz to compiz-core
+ * update build-deps to use kdebase-workspace-dev
+ * disable kde3 decorator and enable kde4 decorator
+ * include a gbp.conf for use with git-buildpackage
+
+ -- Sean Finney <seanius@debian.org> Wed, 01 Apr 2009 00:00:10 +0200
+
compiz (0.7.6-8) unstable; urgency=low
* Don't run glib-gettextize, to fix FTBFS caused by intltoolize changes
commit 37fdacc3963bea64a30b22b086ec034e92bc4c51
Author: Sean Finney <seanius@debian.org>
Date: Tue Mar 31 23:48:51 2009 +0200
include a gbp.conf for use with git-buildpackage
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..be98ba2
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,8 @@
+[DEFAULT]
+debian-branch = debian-unstable
+debian-tag = compiz-%(version)s
+upstream-branch = upstream-unstable
+upstream-tag = compiz-%(version)s
+
+[git-dch]
+meta = 1
commit 8492e7abec4526d63763cd41ec6dd699ecd690a6
Author: Sean Finney <seanius@debian.org>
Date: Tue Mar 31 23:43:37 2009 +0200
disable kde3 decorator and enable kde4 decorator
diff --git a/debian/rules b/debian/rules
index 894c1c1..8acf5f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,8 @@ INSTALL = /usr/bin/install
confflags += --disable-static \
--disable-fuse \
+ --disable-kde \
+ --enable-kde4 \
--enable-librsvg \
--enable-gconf \
--enable-gconf-dump
commit eaf245f5618f04efde331331f2c0e045ee9c1aa3
Author: Sean Finney <seanius@debian.org>
Date: Tue Mar 31 23:24:50 2009 +0200
update build-deps to use kdebase-workspace-dev
diff --git a/debian/control b/debian/control
index bc9af64..fe63311 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,9 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Thierry Reding <thierry@gilfi.de>, David Nusinow <dnusinow@debian.org>, Sean Finney <seanius@debian.org>
Build-Depends: autoconf, automake1.9, autotools-dev,
- debhelper (>= 5), intltool, kdebase-dev, libcairo-dev, libdbus-qt-1-dev,
+ debhelper (>= 5), intltool,
+ kdebase-workspace-dev,
+ libcairo-dev, libdbus-qt-1-dev,
libdbus-glib-1-dev, libgconf2-dev,
libgl1-mesa-dev (>= 6.5.1) | libgl-dev, libglib2.0-dev, libgnome-desktop-dev,
libgnome-window-settings-dev, libgtk2.0-dev, libice-dev (>= 1:1.0.1),
commit e29a81dbb85b700988a5543d06ae0b568c50c0e3
Author: Sean Finney <seanius@debian.org>
Date: Tue Mar 31 23:10:33 2009 +0200
add new app desktop file for compiz to compiz-core
diff --git a/debian/compiz-core.install b/debian/compiz-core.install
index 97bdc2a..092e068 100644
--- a/debian/compiz-core.install
+++ b/debian/compiz-core.install
@@ -1,3 +1,4 @@
usr/bin/compiz*
usr/share/compiz
usr/share/locale
+usr/share/applications/compiz.desktop
commit 0056dcb350d1ec2fad740ec5ea83bd8ddfbb9c2d
Author: Sean Finney <seanius@debian.org>
Date: Tue Mar 31 23:03:08 2009 +0200
update location of compiz-gnome desktop file
diff --git a/debian/compiz-gnome.install b/debian/compiz-gnome.install
index 1da10d6..dfd4ec7 100644
--- a/debian/compiz-gnome.install
+++ b/debian/compiz-gnome.install
@@ -1,2 +1,2 @@
usr/lib/window-manager-settings/libcompiz.so usr/lib/libgnome-window-settings1
-usr/share/gnome/wm-properties/compiz.desktop
+usr/share/gnome/wm-properties/compiz-wm.desktop
commit 2248bad1804bdde2ebc019f1aefac8c7933d30dd
Author: Sean Finney <seanius@debian.org>
Date: Tue Mar 31 22:48:28 2009 +0200
massage offsets/context for remaining patches
diff --git a/debian/patches/012_snap-by-default.patch b/debian/patches/012_snap-by-default.patch
index b4e6d54..fb6b362 100644
--- a/debian/patches/012_snap-by-default.patch
+++ b/debian/patches/012_snap-by-default.patch
@@ -5,7 +5,7 @@ Not submitted to upstream.
--- 0-compiz.orig/metadata/wobbly.xml.in
+++ 0-compiz/metadata/wobbly.xml.in
-@@ -18,7 +18,7 @@
+@@ -20,7 +20,7 @@
<option name="snap_inverted" type="bool">
<_short>Snap Inverted</_short>
<_long>Inverted window snapping</_long>
diff --git a/debian/patches/015_optional-fbo.patch b/debian/patches/015_optional-fbo.patch
index a084eda..213c7b0 100644
--- a/debian/patches/015_optional-fbo.patch
+++ b/debian/patches/015_optional-fbo.patch
@@ -10,23 +10,23 @@
extern char *defaultTextureFilter;
--- 0-compiz.orig/src/main.c
+++ 0-compiz/src/main.c
-@@ -62,6 +62,7 @@ Bool strictBinding = TRUE;
+@@ -63,6 +63,7 @@ Bool strictBinding = TRUE;
Bool noDetection = FALSE;
- Bool useDesktopHints = TRUE;
+ Bool useDesktopHints = FALSE;
Bool onlyCurrentScreen = FALSE;
+Bool noFBO = FALSE;
+ static Bool debugOutput = FALSE;
#ifdef USE_COW
- Bool useCow = TRUE;
-@@ -83,6 +84,7 @@ usage (void)
+@@ -84,6 +85,7 @@ usage (void)
+ "[--keep-desktop-hints] "
+ "[--loose-binding] "
+ "[--replace]\n "
++ "[--no-fbo] "
"[--sm-disable] "
"[--sm-client-id ID] "
- "[--no-detection]\n "
-+ "[--no-fbo] "
- "[--ignore-desktop-hints] "
- "[--only-current-screen]"
-
-@@ -329,6 +331,10 @@ main (int argc, char **argv)
+ "[--only-current-screen]\n "
+@@ -343,6 +345,10 @@ main (int argc, char **argv)
{
onlyCurrentScreen = TRUE;
}
@@ -39,7 +39,7 @@
else if (!strcmp (argv[i], "--use-root-window"))
--- 0-compiz.orig/src/screen.c
+++ 0-compiz/src/screen.c
-@@ -2060,7 +2060,7 @@ addScreen (CompDisplay *display,
+@@ -2063,7 +2063,7 @@ addScreen (CompDisplay *display,
}
s->fbo = 0;
commit 1dda147ab399efe39de8ce64897e1ab943496434
Author: Sean Finney <seanius@debian.org>
Date: Tue Mar 31 22:47:10 2009 +0200
remove xscreensaver-damage-fix.patch (incorporated upstream)
diff --git a/debian/patches/series b/debian/patches/series
index a7fe01d..0feab7e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,4 @@
015_optional-fbo.patch
compiz-manager-posixly-correct.patch
compiz-manager-nvidia-settings-optional.patch
-xscreensaver-damage-fix.patch
whitelist-fglrx.patch
diff --git a/debian/patches/xscreensaver-damage-fix.patch b/debian/patches/xscreensaver-damage-fix.patch
deleted file mode 100644
index a46a127..0000000
--- a/debian/patches/xscreensaver-damage-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-imported from upstream commit aed97c441881d9c382c7865d0305fc8f884c10ac
-fixes #483170
---- 0-compiz.orig/src/screen.c
-+++ 0-compiz/src/screen.c
-@@ -2420,6 +2420,13 @@ damageScreenRegion (CompScreen *screen,
- XUnionRegion (screen->damage, region, screen->damage);
-
- screen->damageMask |= COMP_SCREEN_DAMAGE_REGION_MASK;
-+
-+ /* if the number of damage rectangles grows two much between repaints,
-+ we have a lot of overhead just for doing the damage tracking -
-+ in order to make sure we're not having too much overhead, damage
-+ the whole screen if we have a lot of damage rects */
-+ if (screen->damage->numRects > 100)
-+ damageScreen (screen);
- }
-
- void
commit 74067f03e00304057f90d9e768ce580e83e713f9
Author: Sean Finney <seanius@debian.org>
Date: Tue Mar 31 22:46:26 2009 +0200
remove obsolete disable-libx11-xcb-support.patch
diff --git a/debian/patches/disable-libx11-xcb-support.patch b/debian/patches/disable-libx11-xcb-support.patch
deleted file mode 100644
index d56d624..0000000
--- a/debian/patches/disable-libx11-xcb-support.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-disable-libx11-xcb-support.patch
-origin: http://gitweb.opencompositing.org/?p=users/3v1n0/compiz-patches;a=blob_plain;f=disable-libx11-xcb-support.patch;hb=4b8e083acf9b1779a9de43ed295b6a4a86594f10
-locally modified to reflect 0.7.4 updates
---- 0-compiz.orig/configure.ac
-+++ 0-compiz/configure.ac
-@@ -118,8 +118,7 @@ AC_SUBST(imagedir)
- metadatadir=$datadir/compiz
- AC_SUBST(metadatadir)
-
--COMPIZ_REQUIRES="x11-xcb \
-- xcomposite \
-+COMPIZ_REQUIRES="xcomposite \
- xfixes \
- xdamage \
- xrandr \
---- 0-compiz.orig/include/compiz-core.h
-+++ 0-compiz/include/compiz-core.h
-@@ -33,7 +33,7 @@
- #include <stdio.h>
- #include <sys/time.h>
-
--#include <X11/Xlib-xcb.h>
-+#include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <X11/extensions/Xdamage.h>
- #include <X11/extensions/Xcomposite.h>
-@@ -897,8 +897,6 @@ struct _CompDisplay {
-
- CompDisplay *next;
-
-- xcb_connection_t *connection;
--
- Display *display;
- CompScreen *screens;
-
---- 0-compiz.orig/src/display.c
-+++ 0-compiz/src/display.c
-@@ -2054,8 +2054,6 @@ addDisplay (const char *name)
- return FALSE;
- }
-
-- d->connection = XGetXCBConnection (dpy);
--
- if (!compInitDisplayOptionsFromMetadata (d,
- &coreMetadata,
- coreDisplayOptionInfo,
diff --git a/debian/patches/series b/debian/patches/series
index 7cad7b6..a7fe01d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,5 @@
015_optional-fbo.patch
compiz-manager-posixly-correct.patch
compiz-manager-nvidia-settings-optional.patch
-disable-libx11-xcb-support.patch
xscreensaver-damage-fix.patch
whitelist-fglrx.patch
commit 4514310abe0697d2d73b0fefac5bbed17c7e7c63
Author: Danny Baumann <dannybaumann@web.de>
Date: Sun Mar 1 13:10:51 2009 +0100
Add NEWS entry and bump version for 0.8.2 release.
diff --git a/NEWS b/NEWS
index f5ca013..1c53d55 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+Release 0.8.2 (2009-03-01 Danny Baumann <dannybaumann@web.de>)
+==============================================================
+Maintenance release.
+
+Fixed issue in strut handling that could lead to struts being ignored
+for certain monitor configurations.
+
+Fixed window position constraining logic.
+
+Fixed kconfig xslt files missing from 0.8.0 tarball.
+
Release 0.8.0 (2009-02-20 Danny Baumann <dannybaumann@web.de>)
==============================================================
Fourth stable release of compiz.
diff --git a/configure.ac b/configure.ac
index 52c532c..0d3cb7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl An odd micro number indicates in-progress development.
dnl An even micro number indicates a released version.
m4_define(compiz_version_major, 0)
m4_define(compiz_version_minor, 8)
-m4_define(compiz_version_micro, 1)
+m4_define(compiz_version_micro, 2)
AC_INIT([compiz],
[compiz_version_major().compiz_version_minor().compiz_version_micro()],
commit 6a39fc1675b048377af51ad3847b5b22f838f022
Author: Danny Baumann <dannybaumann@web.de>
Date: Mon Feb 23 08:55:54 2009 +0100
Fix constraining logic.
If a window is completely offscreen, the constraining logic needs to
treat it as if it were onscreen.
diff --git a/plugins/place.c b/plugins/place.c
index e3fa46e..74ac388 100644
--- a/plugins/place.c
+++ b/plugins/place.c
@@ -1310,7 +1310,12 @@ placeValidateWindowResizeRequest (CompWindow *w,
sizes as we don't need to validate movements to other viewports;
we are only interested in inner-viewport movements */
x = xwc->x % s->width;
+ if ((x + xwc->width) < 0)
+ x += s->width;
+
y = xwc->y % s->height;
+ if ((y + xwc->height) < 0)
+ y += s->height;
left = x - w->input.left;
right = x + xwc->width + w->input.right;
commit 9810ccf4b9c3753a5cad22a31f6781dca4d3dddc
Author: Danny Baumann <dannybaumann@web.de>
Date: Mon Feb 23 08:37:24 2009 +0100
Fix off-by-one error in strut clipping.
This problem was visible for e.g. 1680x1050 on the left, 1280x1024 on
the right configurations configurations.
diff --git a/src/window.c b/src/window.c
index 8a5df8b..b7ba7e0 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1880,7 +1880,7 @@ updateWindowStruts (CompWindow *w)
strutY2 = strutY1 + new.left.height;
if (strutX2 > x1 && strutX2 <= x2 &&
- strutY1 < y2 && strutY2 >= y1)
+ strutY1 < y2 && strutY2 > y1)
{
new.left.x = x1;
new.left.width = strutX2 - x1;
@@ -1892,7 +1892,7 @@ updateWindowStruts (CompWindow *w)
strutY2 = strutY1 + new.right.height;
if (strutX1 > x1 && strutX1 <= x2 &&
- strutY1 < y2 && strutY2 >= y1)
+ strutY1 < y2 && strutY2 > y1)
{
new.right.x = strutX1;
new.right.width = x2 - strutX1;
@@ -1903,7 +1903,7 @@ updateWindowStruts (CompWindow *w)
strutY1 = new.top.y;
strutY2 = strutY1 + new.top.height;
- if (strutX1 < x2 && strutX2 >= x1 &&
+ if (strutX1 < x2 && strutX2 > x1 &&
strutY2 > y1 && strutY2 <= y2)
{
new.top.y = y1;
@@ -1915,7 +1915,7 @@ updateWindowStruts (CompWindow *w)
strutY1 = new.bottom.y;
strutY2 = strutY1 + new.bottom.height;
- if (strutX1 < x2 && strutX2 >= x1 &&
+ if (strutX1 < x2 && strutX2 > x1 &&
strutY1 > y1 && strutY1 <= y2)
{
new.bottom.y = strutY1;
commit 168e136cb939b7d7eab2f44ec42adbfbcdaf1dd2
Author: Danny Baumann <dannybaumann@web.de>
Date: Fri Feb 20 18:45:11 2009 +0100
Post-release version increment.
diff --git a/configure.ac b/configure.ac
index f24216a..52c532c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl An odd micro number indicates in-progress development.
dnl An even micro number indicates a released version.
m4_define(compiz_version_major, 0)
m4_define(compiz_version_minor, 8)
-m4_define(compiz_version_micro, 0)
+m4_define(compiz_version_micro, 1)
AC_INIT([compiz],
[compiz_version_major().compiz_version_minor().compiz_version_micro()],
commit 3a8714dc82303db554291f1598803dba75fb5294
Author: Danny Baumann <dannybaumann@web.de>
Date: Fri Feb 20 18:23:00 2009 +0100
Add NEWS entry and bump version for 0.8.0 release.
diff --git a/NEWS b/NEWS
index cd4f549..f5ca013 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,40 @@
+Release 0.8.0 (2009-02-20 Danny Baumann <dannybaumann@web.de>)
+==============================================================
+Fourth stable release of compiz.
+
+New plugin "commands" that handles the bindings for arbitrary commands that
+previously were handled in core. In addition to the previously present key
+bindings button and edge bindings were added as well.
+
+New plugin "gnomecompat" which handles bindings that are exclusively used
+in the Gnome desktop environment and removed the corresponding bindings
+from core. This change fixes main menu and run dialog bindings for KDE users
+as those previously were conflicting between compiz and KDE. Gnome users
+upgrading should make sure to enable this plugin.
+
+Added support for _NET_WM_FULLSCREEN_MONITORS EWMH hint.
+
+Added support for reading the icon hint from the WM_HINTS property if
+_NET_WM_ICON is not available.
+
+Update Gnome support for Gnome 2.24.
+
+Added options to scale plugin that allow "toggle type" behaviour for
+key and button bindings.
+
+Several memory leak fixes.
+
+Adjusted gtk-window-decorator for newer libmetacity-private versions.
+
+Fixed gtk-window-decorator display for RTL languages.
+
+Adjusted kde4-window-decorator for KDE 4.2 API.
+
+Large number of minor bug fixes, especially in resize handling and
+stacking code.
+
+Translation updates
+
Release 0.7.8 (2008-09-17 Danny Baumann <dannybaumann@web.de>)
==============================================================
Development release.
diff --git a/configure.ac b/configure.ac
index 8663ead..f24216a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,8 +4,8 @@ dnl compiz package version number
dnl An odd micro number indicates in-progress development.
dnl An even micro number indicates a released version.
m4_define(compiz_version_major, 0)
-m4_define(compiz_version_minor, 7)
-m4_define(compiz_version_micro, 9)
+m4_define(compiz_version_minor, 8)
+m4_define(compiz_version_micro, 0)
AC_INIT([compiz],
[compiz_version_major().compiz_version_minor().compiz_version_micro()],
commit cf21b2384f3b34ec44f6bd40156963e8ccf03267
Author: Danny Baumann <dannybaumann@web.de>
Date: Fri Feb 20 15:30:17 2009 +0100
Set libwnck client type to "pager" so "move to desktop x" works properly
together with the constraining code in place plugin.
diff --git a/gtk/window-decorator/gtk-window-decorator.c b/gtk/window-decorator/gtk-window-decorator.c
index 0ab118c..61e60f7 100644
--- a/gtk/window-decorator/gtk-window-decorator.c
+++ b/gtk/window-decorator/gtk-window-decorator.c
@@ -7092,6 +7092,7 @@ main (int argc, char *argv[])
}
screen = wnck_screen_get_default ();
+ wnck_set_client_type (WNCK_CLIENT_TYPE_PAGER);
gdk_window_add_filter (NULL,
selection_event_filter_func,
commit 397d527bbd4d82853bda3525d78e02e0c2e33508
Author: Danny Baumann <dannybaumann@web.de>
Date: Thu Feb 19 09:14:41 2009 +0100
Update translation files to get "Run command 0" translated again.
diff --git a/po/af.po b/po/af.po
index da8d747..ace45bf 100644
--- a/po/af.po
+++ b/po/af.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-07 21:11+0530\n"
+"POT-Creation-Date: 2009-02-19 09:07+0100\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language@novell.com>\n"
"Language-Team: Novell Language <language@novell.com>\n"
@@ -32,7 +32,7 @@ msgid "None"
msgstr ""
#: ../gtk/gnome/compiz-window-manager.c:427
-#: ../gtk/window-decorator/gtk-window-decorator.c:4638
+#: ../gtk/window-decorator/gtk-window-decorator.c:4616
msgid "Shade"
msgstr ""
@@ -61,7 +61,7 @@ msgid "Lower"
msgstr ""
#: ../gtk/gnome/compiz-window-manager.c:434
-#: ../gtk/window-decorator/gtk-window-decorator.c:4619
+#: ../gtk/window-decorator/gtk-window-decorator.c:4597
#: ../metadata/core.xml.in.in.h:100
Reply to: