compiz: Changes to 'debian-unstable'
AUTHORS | 5
COPYING | 7
COPYING.LGPL | 510 +++
Makefile.am | 1
Makefile.in | 5
NEWS | 30
compiz.pc.in | 2
config.h.in | 6
configure | 239 +
configure.ac | 33
debian/changelog | 31
debian/compiz.links | 1
debian/control | 3
debian/patches/011_snap-by-default.patch | 12
debian/patches/012_debian-kde-includes-dir.patch | 34
debian/patches/013_set-qtdir-fallback.patch | 13
debian/patches/014_fix-no-border-window-shadow.patch | 13
debian/patches/015_optional-fbo.patch | 51
debian/patches/series | 2
debian/rules | 9
gtk/Makefile.in | 4
gtk/gnome/Makefile.in | 4
gtk/gnome/compiz-window-manager.c | 2
gtk/window-decorator/Makefile.in | 4
gtk/window-decorator/gtk-window-decorator.c | 342 +-
gtk/window-decorator/gwd.schemas.in | 11
images/Makefile.in | 4
include/Makefile.in | 4
include/compiz.h | 680 +++-
include/decoration.h | 36
kde/Makefile.in | 4
kde/window-decorator/Makefile.in | 4
kde/window-decorator/decorator.cpp | 49
kde/window-decorator/decorator.h | 8
kde/window-decorator/main.cpp | 16
kde/window-decorator/utils.cpp | 3
kde/window-decorator/utils.h | 1
kde/window-decorator/window.cpp | 177 +
kde/window-decorator/window.h | 4
libdecoration/Makefile.in | 4
libdecoration/decoration.c | 226 +
plugins/Makefile.am | 75
plugins/Makefile.in | 168 -
plugins/annotate.c | 11
plugins/blur.c | 2908 +++++++++++++++++++
plugins/clone.c | 45
plugins/compiz.schemas.in | 1320 +++++---
plugins/cube.c | 118
plugins/dbus.c | 166 -
plugins/decoration.c | 666 ++--
plugins/fade.c | 159 -
plugins/fuse.c | 1611 ++++++++++
plugins/gconf-dump.c | 17
plugins/gconf.c | 35
plugins/ini.c | 1473 +++++++++
plugins/inotify.c | 7
plugins/minimize.c | 114
plugins/move.c | 37
plugins/place.c | 543 +++
plugins/plane.c | 94
plugins/regex.c | 488 +++
plugins/resize.c | 55
plugins/rotate.c | 58
plugins/scale.c | 406 +-
plugins/screenshot.c | 48
plugins/switcher.c | 340 +-
plugins/video.c | 1265 ++++++++
plugins/water.c | 448 +-
plugins/wobbly.c | 464 +--
plugins/zoom.c | 11
po/POTFILES.in | 13
po/af.po | 1871 ++++++++++++
po/ar.po | 1859 ++++++++++++
po/bg.po | 2159 ++++++++++++++
po/bn.po | 1998 +++++++++++++
po/bs.po | 1924 ++++++++++++
po/ca.po | 1990 +++++++++++++
po/cs.po | 1994 +++++++++----
po/cy.po | 1965 ++++++++++++
po/da.po | 2080 +++++++++++++
po/de.po | 2086 +++++++++----
po/el.po | 2171 ++++++++++++++
po/en_GB.po | 2145 ++++++++++++++
po/en_US.po | 1878 ++++++++++++
po/es.po | 2098 ++++++++++---
po/et.po | 2218 ++++++++++++++
po/fi.po | 2112 +++++++++----
po/fr.po | 2002 +++++++++----
po/gl.po | 1962 ++++++++++++
po/gu.po | 1872 ++++++++++++
po/he.po | 2123 +++++++++++++
po/hi.po | 2114 +++++++++++++
po/hr.po | 2102 +++++++++++++
po/hu.po | 1526 ++++++---
po/id.po | 1900 ++++++++++++
po/it.po | 2049 +++++++++----
po/ja.po | 2096 +++++++++----
po/ka.po | 1856 ++++++++++++
po/km.po | 2156 ++++++++++++++
po/ko.po | 2230 ++++++++++++++
po/lo.po | 1854 ++++++++++++
po/lt.po | 2151 ++++++++++++++
po/mk.po | 1861 ++++++++++++
po/mr.po | 1881 ++++++++++++
po/nb.po | 2190 ++++++++++++++
po/nl.po | 2231 ++++++++++++++
po/pa.po | 2157 ++++++++++++++
po/pl.po | 1589 ++++++----
po/pt.po | 2513 ++++++++++++++++
po/pt_BR.po | 2067 +++++++++----
po/ro.po | 2002 +++++++++++++
po/ru.po | 2135 +++++++++++++
po/sk.po | 2212 ++++++++++++++
po/sl.po | 2170 ++++++++++++++
po/sr.po | 2265 ++++++++++++++
po/sv.po | 2506 +++++++++-------
po/ta.po | 1874 ++++++++++++
po/tr.po | 2257 ++++++++++++++
po/uk.po | 2141 +++++++++++++
po/vi.po | 1857 ++++++++++++
po/xh.po | 1871 ++++++++++++
po/zh_CN.po | 2027 +++++++++----
po/zh_TW.po | 2001 +++++++++----
po/zu.po | 1871 ++++++++++++
src/Makefile.am | 6
src/Makefile.in | 18
src/cursor.c | 196 +
src/display.c | 340 +-
src/event.c | 148
src/fragment.c | 1322 ++++++++
src/main.c | 37
src/match.c | 764 ++++
src/matrix.c | 322 ++
src/option.c | 115
src/paint.c | 727 ++--
src/screen.c | 538 ++-
src/session.c | 78
src/texture.c | 55
src/window.c | 608 ++-
139 files changed, 118196 insertions(+), 11054 deletions(-)
New commits:
commit dd3bb58c989f7bdfad8289c6b43a74d2d31d6b43
Author: Thierry Reding <thierry@gilfi.de>
Date: Sun May 13 16:45:04 2007 +0200
Target compiz 0.5.0.dfsg-1 at unstable.
diff --git a/debian/changelog b/debian/changelog
index b22664f..38f2ab9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-compiz (0.5.0.dfsg-1) UNRELEASED; urgency=low
+compiz (0.5.0.dfsg-1) unstable; urgency=low
* New upstream development release:
- Remove stencil buffer requirement.
@@ -24,7 +24,7 @@ compiz (0.5.0.dfsg-1) UNRELEASED; urgency=low
tarball.
* Pass QTDIR=/usr to the configure script so that the moc can be found.
- -- Thierry Reding <thierry@gilfi.de> Wed, 02 May 2007 07:48:02 +0200
+ -- Thierry Reding <thierry@gilfi.de> Sun, 13 May 2007 16:43:09 +0200
compiz (0.3.6-1) experimental; urgency=low
commit 51059f5da987c3ceacfcf1b81fd8d065900d2424
Author: Thierry Reding <thierry@gilfi.de>
Date: Wed May 2 07:48:17 2007 +0200
Pass QTDIR=/usr to the configure script so that the moc can be found.
diff --git a/debian/changelog b/debian/changelog
index 077a8f5..b22664f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,8 +22,9 @@ compiz (0.5.0.dfsg-1) UNRELEASED; urgency=low
(Closes: #408605)
* Drop po/*.gmo and kde/window-decorator/*.moc.cpp from the original
tarball.
+ * Pass QTDIR=/usr to the configure script so that the moc can be found.
- -- Thierry Reding <thierry@gilfi.de> Sun, 22 Apr 2007 13:42:50 +0200
+ -- Thierry Reding <thierry@gilfi.de> Wed, 02 May 2007 07:48:02 +0200
compiz (0.3.6-1) experimental; urgency=low
diff --git a/debian/rules b/debian/rules
index 87989d3..e69f0ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,7 @@ build-stamp:
mkdir obj-$(DEB_BUILD_GNU_TYPE)
cd obj-$(DEB_BUILD_GNU_TYPE) && \
../configure --prefix=/usr --sysconfdir=\$${prefix}/share $(confflags) \
- CFLAGS="$(CFLAGS)"
+ CFLAGS="$(CFLAGS)" QTDIR=/usr
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
touch $@
commit 45d061c38039a08e416b5b993ee11337673e0ec2
Author: Thierry Reding <thierry@gilfi.de>
Date: Sun Apr 22 13:45:09 2007 +0200
Drop po/*.gmo and kde/window-decorator/*.moc.cpp from the original tarball.
diff --git a/debian/changelog b/debian/changelog
index 44e70c0..077a8f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-compiz (0.5.0-1) UNRELEASED; urgency=low
+compiz (0.5.0.dfsg-1) UNRELEASED; urgency=low
* New upstream development release:
- Remove stencil buffer requirement.
@@ -20,8 +20,10 @@ compiz (0.5.0-1) UNRELEASED; urgency=low
unstable. (Closes: #411012)
* Add symlink to the compiz-core README to the compiz package.
(Closes: #408605)
+ * Drop po/*.gmo and kde/window-decorator/*.moc.cpp from the original
+ tarball.
- -- Thierry Reding <thierry@gilfi.de> Thu, 19 Apr 2007 17:44:56 +0200
+ -- Thierry Reding <thierry@gilfi.de> Sun, 22 Apr 2007 13:42:50 +0200
compiz (0.3.6-1) experimental; urgency=low
diff --git a/debian/rules b/debian/rules
index 10918a6..87989d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,7 +55,7 @@ build-stamp:
prune:
rm -f autogen.sh
find -name .cvsignore | xargs rm -f
- rm -f po/*.gmo
+ rm -f po/*.gmo kde/window-decorator/*.moc.cpp
clean: prune unpatch
dh_testdir
commit ead4d366bc6fdf7064a8163e42835953aa7807e3
Author: Thierry Reding <thierry@gilfi.de>
Date: Thu Apr 19 18:22:29 2007 +0200
Add symlink to the compiz-core README.Debian to the compiz package.
diff --git a/debian/changelog b/debian/changelog
index ec53c67..44e70c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,10 @@ compiz (0.5.0-1) UNRELEASED; urgency=low
* Add build-dependency on libfuse-dev needed by the fuse plugin.
* No longer conflict with metacity >= 2.15.21, now that metacity 2.18 is in
unstable. (Closes: #411012)
+ * Add symlink to the compiz-core README to the compiz package.
+ (Closes: #408605)
- -- Thierry Reding <thierry@gilfi.de> Thu, 19 Apr 2007 17:33:10 +0200
+ -- Thierry Reding <thierry@gilfi.de> Thu, 19 Apr 2007 17:44:56 +0200
compiz (0.3.6-1) experimental; urgency=low
diff --git a/debian/compiz.links b/debian/compiz.links
new file mode 100644
index 0000000..0353d95
--- /dev/null
+++ b/debian/compiz.links
@@ -0,0 +1 @@
+/usr/share/doc/compiz-core/README.Debian /usr/share/doc/compiz/README.Debian
commit 35e885efd05e869c4f868a6edd70dff2764f1fd0
Author: Thierry Reding <thierry@gilfi.de>
Date: Thu Apr 19 17:34:55 2007 +0200
Add closer for bug #411012. Thanks Brice.
diff --git a/debian/changelog b/debian/changelog
index 90aea8f..ec53c67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,9 +17,9 @@ compiz (0.5.0-1) UNRELEASED; urgency=low
* Use compiz' default set of plugins.
* Add build-dependency on libfuse-dev needed by the fuse plugin.
* No longer conflict with metacity >= 2.15.21, now that metacity 2.18 is in
- unstable.
+ unstable. (Closes: #411012)
- -- Thierry Reding <thierry@gilfi.de> Thu, 05 Apr 2007 18:22:10 +0200
+ -- Thierry Reding <thierry@gilfi.de> Thu, 19 Apr 2007 17:33:10 +0200
compiz (0.3.6-1) experimental; urgency=low
commit ce9bb3b523da5067c21a24f68ef0ebea1d96124f
Author: Thierry Reding <thierry@gilfi.de>
Date: Mon Apr 16 19:34:47 2007 +0200
No longer conflict with metacity >= 2.15.21.
Now that metacity 2.18 has entered unstable, compiz should build against it
instead.
diff --git a/debian/changelog b/debian/changelog
index 5e579b0..90aea8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ compiz (0.5.0-1) UNRELEASED; urgency=low
- Refresh other patches.
* Use compiz' default set of plugins.
* Add build-dependency on libfuse-dev needed by the fuse plugin.
+ * No longer conflict with metacity >= 2.15.21, now that metacity 2.18 is in
+ unstable.
-- Thierry Reding <thierry@gilfi.de> Thu, 05 Apr 2007 18:22:10 +0200
diff --git a/debian/control b/debian/control
index b2e8db0..f758706 100644
--- a/debian/control
+++ b/debian/control
@@ -51,7 +51,6 @@ Package: compiz-gtk
Architecture: any
Depends: compiz-core (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: gnome-themes
-Conflicts: libmetacity0 (>= 1:2.15.21)
Description: OpenGL window and compositing manager - Gtk window decorator
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 0a30ed9acfcf898003c0f5607fc6aca78eab45bd
Author: Thierry Reding <thierry@gilfi.de>
Date: Thu Apr 5 18:22:34 2007 +0200
Add build-dependency on libfuse-dev needed by the fuse plugin.
diff --git a/debian/changelog b/debian/changelog
index df0831e..5e579b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,9 @@ compiz (0.5.0-1) UNRELEASED; urgency=low
- Dropped 013_set-qtdir-fallback.patch, no longer needed.
- Refresh other patches.
* Use compiz' default set of plugins.
+ * Add build-dependency on libfuse-dev needed by the fuse plugin.
- -- Thierry Reding <thierry@gilfi.de> Thu, 05 Apr 2007 10:17:26 +0200
+ -- Thierry Reding <thierry@gilfi.de> Thu, 05 Apr 2007 18:22:10 +0200
compiz (0.3.6-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 3afb4e7..b2e8db0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Thierry Reding <thierry@gilfi.de>, David Nusinow <dnusinow@debian.org>
-Build-Depends: debhelper (>= 5), quilt (>= 0.40), libglib2.0-dev, libgconf2-dev, libpng12-dev | libpng-dev, libxcomposite-dev (>= 1:0.3-2), libxfixes-dev (>= 1:4.0.1), libxdamage-dev (>=1:1.0.3), libxrandr-dev (>= 2:1.1.0.2), libxrender-dev (>= 1:0.9.1), libice-dev (>= 1:1.0.1), libsm-dev (>= 1:1.0.1), libgl1-mesa-dev (>= 6.5.1) | libgl-dev, libcairo-dev, librsvg2-dev, libgnome-desktop-dev, libgnome-window-settings-dev, libdbus-glib-1-dev, libwnck-dev, libgtk2.0-dev, libpango1.0-dev, x11proto-gl-dev (>= 1.4.8-1), libxinerama-dev, libmetacity-dev, kdebase-dev, libdbus-qt-1-dev
+Build-Depends: debhelper (>= 5), quilt (>= 0.40), libglib2.0-dev, libgconf2-dev, libpng12-dev | libpng-dev, libxcomposite-dev (>= 1:0.3-2), libxfixes-dev (>= 1:4.0.1), libxdamage-dev (>=1:1.0.3), libxrandr-dev (>= 2:1.1.0.2), libxrender-dev (>= 1:0.9.1), libice-dev (>= 1:1.0.1), libsm-dev (>= 1:1.0.1), libgl1-mesa-dev (>= 6.5.1) | libgl-dev, libcairo-dev, librsvg2-dev, libgnome-desktop-dev, libgnome-window-settings-dev, libdbus-glib-1-dev, libwnck-dev, libgtk2.0-dev, libpango1.0-dev, x11proto-gl-dev (>= 1.4.8-1), libxinerama-dev, libmetacity-dev, kdebase-dev, libdbus-qt-1-dev, libfuse-dev
Standards-Version: 3.7.2
Package: compiz
commit 5c1bd8ed95fdf617fcc4f81060c875c41a623cf2
Author: Thierry Reding <thierry@gilfi.de>
Date: Thu Apr 5 10:21:51 2007 +0200
Autoreconf and remove obsolete patches.
diff --git a/Makefile.in b/Makefile.in
index be1e001..4ebb1af 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -135,6 +135,10 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+FUSE_CFLAGS = @FUSE_CFLAGS@
+FUSE_LIBS = @FUSE_LIBS@
+FUSE_PLUGIN_FALSE = @FUSE_PLUGIN_FALSE@
+FUSE_PLUGIN_TRUE = @FUSE_PLUGIN_TRUE@
GCONFTOOL = @GCONFTOOL@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_DUMP_PLUGIN_FALSE = @GCONF_DUMP_PLUGIN_FALSE@
@@ -275,6 +279,7 @@ SUBDIRS = include src libdecoration plugins images gtk kde po
EXTRA_DIST = \
COPYING \
COPYING.GPL \
+ COPYING.LGPL \
COPYING.MIT \
compiz.pc.in
diff --git a/config.h.in b/config.h.in
index 503c20e..8df56a2 100644
--- a/config.h.in
+++ b/config.h.in
@@ -72,6 +72,9 @@
/* Define to 1 if you have the `wnck_window_has_name' function. */
#undef HAVE_WNCK_WINDOW_HAS_NAME
+/* Define to 1 if xrender version >= 0.9.3 */
+#undef HAVE_XRENDER_0_9_3
+
/* Max reasonable desktops */
#undef MAX_DESKTOPS
@@ -108,6 +111,9 @@
/* Build dbus glib support */
#undef USE_DBUS_GLIB
+/* Build fuse plugin */
+#undef USE_FUSE
+
/* Build gconf plugin */
#undef USE_GCONF
diff --git a/configure b/configure
index b3ebdd8..30ddb72 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for compiz 0.3.6.
+# Generated by GNU Autoconf 2.61 for compiz 0.5.0.
#
# Report bugs to <davidr@novell.com>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='compiz'
PACKAGE_TARNAME='compiz'
-PACKAGE_VERSION='0.3.6'
-PACKAGE_STRING='compiz 0.3.6'
+PACKAGE_VERSION='0.5.0'
+PACKAGE_STRING='compiz 0.5.0'
PACKAGE_BUGREPORT='davidr@novell.com'
# Factoring default headers for most tests.
@@ -922,6 +922,10 @@ DBUS_GLIB_CFLAGS
DBUS_GLIB_LIBS
INOTIFY_PLUGIN_TRUE
INOTIFY_PLUGIN_FALSE
+FUSE_CFLAGS
+FUSE_LIBS
+FUSE_PLUGIN_TRUE
+FUSE_PLUGIN_FALSE
ANNOTATE_CFLAGS
ANNOTATE_LIBS
ANNOTATE_PLUGIN_TRUE
@@ -986,6 +990,8 @@ DBUS_CFLAGS
DBUS_LIBS
DBUS_GLIB_CFLAGS
DBUS_GLIB_LIBS
+FUSE_CFLAGS
+FUSE_LIBS
ANNOTATE_CFLAGS
ANNOTATE_LIBS
LIBRSVG_CFLAGS
@@ -1500,7 +1506,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures compiz 0.3.6 to adapt to many kinds of systems.
+\`configure' configures compiz 0.5.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1570,7 +1576,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of compiz 0.3.6:";;
+ short | recursive ) echo "Configuration of compiz 0.5.0:";;
esac
cat <<\_ACEOF
@@ -1593,12 +1599,13 @@ Optional Features:
--disable-dbus Disable dbus plugin
--disable-dbus-glib Disable dbus-glib support
--disable-inotify Disable inotify plugin
+ --disable-fuse Disable fuse plugin
--disable-annotate Disable annotate plugin
--enable-librsvg Enable svg support
--disable-gtk Disable gtk window decorator
--disable-metacity Disable metacity theme support
--disable-gnome Disable gnome settings module
- --disable-kde Enable kde window decorator
+ --disable-kde Disable kde window decorator
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1649,6 +1656,8 @@ Some influential environment variables:
C compiler flags for DBUS_GLIB, overriding pkg-config
DBUS_GLIB_LIBS
linker flags for DBUS_GLIB, overriding pkg-config
+ FUSE_CFLAGS C compiler flags for FUSE, overriding pkg-config
+ FUSE_LIBS linker flags for FUSE, overriding pkg-config
ANNOTATE_CFLAGS
C compiler flags for ANNOTATE, overriding pkg-config
ANNOTATE_LIBS
@@ -1739,7 +1748,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-compiz configure 0.3.6
+compiz configure 0.5.0
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1753,7 +1762,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by compiz $as_me 0.3.6, which was
+It was created by compiz $as_me 0.5.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2425,7 +2434,7 @@ fi
# Define the identity of the package.
PACKAGE='compiz'
- VERSION='0.3.6'
+ VERSION='0.5.0'
cat >>confdefs.h <<_ACEOF
@@ -2601,7 +2610,7 @@ fi
/* decorator interface version */
cat >>confdefs.h <<\_ACEOF
-#define DECOR_INTERFACE_VERSION 20061011
+#define DECOR_INTERFACE_VERSION 20070319
_ACEOF
@@ -6065,7 +6074,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6068 "configure"' > conftest.$ac_ext
+ echo '#line 6077 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8094,11 +8103,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8097: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8106: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8101: \$? = $ac_status" >&5
+ echo "$as_me:8110: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8362,11 +8371,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8365: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8374: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8369: \$? = $ac_status" >&5
+ echo "$as_me:8378: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8466,11 +8475,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8469: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8478: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8473: \$? = $ac_status" >&5
+ echo "$as_me:8482: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10763,7 +10772,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10766 "configure"
+#line 10775 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10863,7 +10872,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10866 "configure"
+#line 10875 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13199,11 +13208,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13202: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13211: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13206: \$? = $ac_status" >&5
+ echo "$as_me:13215: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13303,11 +13312,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13306: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13315: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13310: \$? = $ac_status" >&5
+ echo "$as_me:13319: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14864,11 +14873,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14867: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14876: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14871: \$? = $ac_status" >&5
+ echo "$as_me:14880: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14968,11 +14977,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14971: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14980: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14975: \$? = $ac_status" >&5
+ echo "$as_me:14984: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17155,11 +17164,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17158: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17167: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17162: \$? = $ac_status" >&5
+ echo "$as_me:17171: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17423,11 +17432,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17426: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17435: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17430: \$? = $ac_status" >&5
+ echo "$as_me:17439: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17527,11 +17536,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17530: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17539: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17534: \$? = $ac_status" >&5
+ echo "$as_me:17543: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -20500,7 +20509,7 @@ fi
done
-ALL_LINGUAS="cs de es fi fr hu it ja pl pt_BR sv zh_CN zh_TW"
+ALL_LINGUAS="cs de es fi fr hu it ja pl pt_BR sv zh_CN zh_TW af ar bg bn bs ca cy da el en_GB en_US et gl gu he hi hr id ka km ko lo lt mk mr nb nl pa pt ro ru sk sl sr ta tr uk vi xh zu"
@@ -22657,6 +22666,25 @@ echo "${ECHO_T}yes" >&6; }
fi
+if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrender >= 0.9.3\"") >&5
+ ($PKG_CONFIG --exists --print-errors "xrender >= 0.9.3") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ have_xrender_0_9_3=yes
+else
+ have_xrender_0_9_3=no
+fi
+
+if test "$have_xrender_0_9_3" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_XRENDER_0_9_3 1
+_ACEOF
+
+fi
+
{ echo "$as_me:$LINENO: checking for GL_CFLAGS" >&5
echo $ECHO_N "checking for GL_CFLAGS... $ECHO_C" >&6; }
@@ -23420,6 +23448,106 @@ _ACEOF
fi
+# Check whether --enable-fuse was given.
+if test "${enable_fuse+set}" = set; then
+ enableval=$enable_fuse; use_fuse=$enableval
+else
+ use_fuse=yes
+fi
+
+
+if test "x$use_fuse" = "xyes"; then
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for FUSE" >&5
+echo $ECHO_N "checking for FUSE... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$FUSE_CFLAGS"; then
+ pkg_cv_FUSE_CFLAGS="$FUSE_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fuse\"") >&5
+ ($PKG_CONFIG --exists --print-errors "fuse") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_FUSE_CFLAGS=`$PKG_CONFIG --cflags "fuse" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$FUSE_LIBS"; then
+ pkg_cv_FUSE_LIBS="$FUSE_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fuse\"") >&5
+ ($PKG_CONFIG --exists --print-errors "fuse") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_FUSE_LIBS=`$PKG_CONFIG --libs "fuse" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ FUSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "fuse"`
+ else
+ FUSE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fuse"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$FUSE_PKG_ERRORS" >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ use_fuse=no
+elif test $pkg_failed = untried; then
+ use_fuse=no
+else
+ FUSE_CFLAGS=$pkg_cv_FUSE_CFLAGS
+ FUSE_LIBS=$pkg_cv_FUSE_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ use_fuse=yes
+fi
+fi
+
+
+
+if test "x$use_fuse" = "xyes"; then
+ FUSE_PLUGIN_TRUE=
+ FUSE_PLUGIN_FALSE='#'
+else
+ FUSE_PLUGIN_TRUE='#'
+ FUSE_PLUGIN_FALSE=
+fi
+
+if test "$use_fuse" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_FUSE 1
+_ACEOF
+
+fi
+
# Check whether --enable-annotate was given.
if test "${enable_annotate+set}" = set; then
enableval=$enable_annotate; use_annotate=$enableval
@@ -24145,8 +24273,6 @@ if test "x$use_kde" = "xyes"; then
if test -n "$QTDIR" ; then
qt_incdirs="$QTDIR/include $qt_incdirs"
qt_libdirs="$QTDIR/lib $qt_libdirs"
- else
- QTDIR=/usr
fi
qt_test_include="qstyle.h"
@@ -24189,15 +24315,7 @@ echo "${ECHO_T}$qt_libdir" >&6; }
if test "x$use_kde" = xyes; then
kdedir=`kde-config --prefix --expandvars 2>/dev/null`
kdelibs=`kde-config --install lib --expandvars 2>/dev/null`
-
- kdeincdirs="$KDEINC $kdedir/include $kdedir/include/kde"
- for dir in $kdeincdirs; do
- if test -e "$dir/kapplication.h"; then
- kdeincs="$dir"
- break
- fi
- done
-
+ kdeincs=`kde-config --install include --expandvars 2>/dev/null`
if test -d $kdelibs; then
pkg_failed=no
@@ -24271,13 +24389,9 @@ echo "${ECHO_T}yes" >&6; }
use_kde=yes
fi
- KDE_CFLAGS="$QT_CXXFLAGS"
+ KDE_CFLAGS="$QT_CXXFLAGS -I$kdeincs"
KDE_LIBS="$QT_LIBS -L$kdelibs -lkdecore -lkdecorations -ldbus-qt-1"
- if test -n "$kdeincs"; then
- KDE_CFLAGS="$KDE_CFLAGS -I$kdeincs"
- fi
-
QT_MOC=$QTDIR/bin/moc
DCOPIDL=$kdedir/bin/dcopidl
DCOPIDL2CPP=$kdedir/bin/dcopidl2cpp
@@ -24503,6 +24617,13 @@ echo "$as_me: error: conditional \"INOTIFY_PLUGIN\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${FUSE_PLUGIN_TRUE}" && test -z "${FUSE_PLUGIN_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"FUSE_PLUGIN\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"FUSE_PLUGIN\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${ANNOTATE_PLUGIN_TRUE}" && test -z "${ANNOTATE_PLUGIN_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"ANNOTATE_PLUGIN\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -24845,7 +24966,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by compiz $as_me 0.3.6, which was
+This file was extended by compiz $as_me 0.5.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24898,7 +25019,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-compiz config.status 0.3.6
+compiz config.status 0.5.0
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -25289,6 +25410,10 @@ DBUS_GLIB_CFLAGS!$DBUS_GLIB_CFLAGS$ac_delim
DBUS_GLIB_LIBS!$DBUS_GLIB_LIBS$ac_delim
INOTIFY_PLUGIN_TRUE!$INOTIFY_PLUGIN_TRUE$ac_delim
INOTIFY_PLUGIN_FALSE!$INOTIFY_PLUGIN_FALSE$ac_delim
+FUSE_CFLAGS!$FUSE_CFLAGS$ac_delim
+FUSE_LIBS!$FUSE_LIBS$ac_delim
+FUSE_PLUGIN_TRUE!$FUSE_PLUGIN_TRUE$ac_delim
+FUSE_PLUGIN_FALSE!$FUSE_PLUGIN_FALSE$ac_delim
ANNOTATE_CFLAGS!$ANNOTATE_CFLAGS$ac_delim
ANNOTATE_LIBS!$ANNOTATE_LIBS$ac_delim
ANNOTATE_PLUGIN_TRUE!$ANNOTATE_PLUGIN_TRUE$ac_delim
@@ -25326,7 +25451,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -25345,7 +25470,7 @@ fi
cat >>$CONFIG_STATUS <<_ACEOF
cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
_ACEOF
sed '
s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
@@ -25358,8 +25483,6 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
' >>$CONFIG_STATUS <conf$$subs.sed
rm -f conf$$subs.sed
cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
CEOF$ac_eof
_ACEOF
@@ -25607,7 +25730,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed 's/|#_!!_#|//g' >$tmp/out
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
@@ -25928,6 +26051,8 @@ echo " place: $use_place"
echo " dbus: $use_dbus"
echo " annotate: $use_annotate"
echo " svg: $use_librsvg"
+echo " inotify: $use_inotify"
+echo " fuse: $use_fuse"
echo ""
echo "and the following optional features will be compiled:"
echo " svg: $use_librsvg"
diff --git a/debian/patches/012_debian-kde-includes-dir.patch b/debian/patches/012_debian-kde-includes-dir.patch
deleted file mode 100644
index d818896..0000000
--- a/debian/patches/012_debian-kde-includes-dir.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 0aede52..102df37 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -372,15 +372,27 @@ if test "x$use_kde" = "xyes"; then
- if test "x$use_kde" = xyes; then
- kdedir=`kde-config --prefix --expandvars 2>/dev/null`
- kdelibs=`kde-config --install lib --expandvars 2>/dev/null`
-- kdeincs=$kdedir/include
-+
-+ kdeincdirs="$KDEINC $kdedir/include $kdedir/include/kde"
-+ for dir in $kdeincdirs; do
-+ if test -e "$dir/kapplication.h"; then
-+ kdeincs="$dir"
Reply to: