File compiz-050-fixes.diff of Package compiz

Overview Repositories Revisions Requests Users Attributes Meta

File compiz-050-fixes.diff of Package compiz (Revision 6d41b3678f0576a1e503a9c6f683de02)

Currently displaying revision 6d41b3678f0576a1e503a9c6f683de02 , Show latest

diff -urp ../compiz-0.5.0.old/configure ./configure
--- ../compiz-0.5.0.old/configure	2007-04-02 20:50:34.000000000 +0200
+++ ./configure	2007-04-12 15:36:38.000000000 +0200
@@ -23853,6 +23853,42 @@ else
 echo "${ECHO_T}yes" >&6; }
 	use_fuse=yes
 fi
+  cat >conftest.$ac_ext <<_ACEOF
+#define _FILE_OFFSET_BITS 64
+#define FUSE_USE_VERSION 26
+#include <fuse.h>
+#if FUSE_VERSION < 26
+#error "Fuse too old"
+#endif
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	{ echo "$as_me:$LINENO: WARNING: Fuse is too old for compiz" >&5
+echo "$as_me: WARNING: Fuse is too old for compiz" >&2;};use_fuse=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 
diff -urp ../compiz-0.5.0.old/configure.ac ./configure.ac
--- ../compiz-0.5.0.old/configure.ac	2007-04-02 20:48:18.000000000 +0200
+++ ./configure.ac	2007-04-12 15:36:01.000000000 +0200
@@ -210,6 +210,13 @@ AC_ARG_ENABLE(fuse,
 
 if test "x$use_fuse" = "xyes"; then
   PKG_CHECK_MODULES(FUSE, fuse, [use_fuse=yes], [use_fuse=no])
+  AC_COMPILE_IFELSE([#define _FILE_OFFSET_BITS 64
+#define FUSE_USE_VERSION 26
+#include <fuse.h>
+#if FUSE_VERSION < 26
+#error "Fuse too old"
+#endif
+                    ], ,[AC_MSG_WARN([Fuse is too old for compiz]);use_fuse=no])
 fi
 
 AM_CONDITIONAL(FUSE_PLUGIN, test "x$use_fuse" = "xyes")
diff -urp ../compiz-0.5.0.old/plugins/fuse.c ./plugins/fuse.c
--- ../compiz-0.5.0.old/plugins/fuse.c	2007-04-02 20:15:28.000000000 +0200
+++ ./plugins/fuse.c	2007-04-12 12:08:03.000000000 +0200
@@ -26,6 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <poll.h>
 #include <signal.h>
 #include <sys/mount.h>
diff -urp ../compiz-0.5.0.old/src/cursor.c ./src/cursor.c
--- ../compiz-0.5.0.old/src/cursor.c	2007-04-02 20:15:30.000000000 +0200
+++ ./src/cursor.c	2007-04-12 14:04:33.000000000 +0200
@@ -53,7 +53,9 @@ addCursor (CompScreen *s)
 
 	updateCursor (c, 0, 0, 0);
 
+#if XFIXES_MAJOR >= 4
 	XFixesHideCursor (s->display->display, s->root);
+#endif
     }
 }

Places

File compiz-050-fixes.diff of Package compiz (Revision 6d41b3678f0576a1e503a9c6f683de02)

Places