configure.ac | 6 +++--- miext/damage/damage.c | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-)
New commits: commit e3769c20d5f656f76e2c475a722db97c58089260 Author: Jeremy Huddleston <jerem...@apple.com> Date: Sat Oct 30 19:49:42 2010 -0700 Bump version to 1.9.2 Signed-off-by: Jeremy Huddleston <jerem...@apple.com> diff --git a/configure.ac b/configure.ac index b1f6282..77cad54 100644 --- a/configure.ac +++ b/configure.ac @@ -26,8 +26,8 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) -AC_INIT([xorg-server], 1.9.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -RELEASE_DATE="2010-10-22" +AC_INIT([xorg-server], 1.9.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +RELEASE_DATE="2010-10-30" AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit e0ab016d85f828a78cb53ee9bcb171535de6032e Author: Jeremy Huddleston <jerem...@apple.com> Date: Sat Oct 30 19:48:22 2010 -0700 Revert "rootless: Remove ROOTLESS_WORKAROUND" Christof Wolf has reported a regression that seems to be caused by this change, so reverting the change in the 1.9 branch. We'll investigate a proper fix in master for 1.10. This reverts commit c89f0521044083a11d538ebfeaabee6fc7fb9a03. diff --git a/configure.ac b/configure.ac index a3843dc..b1f6282 100644 --- a/configure.ac +++ b/configure.ac @@ -1926,7 +1926,7 @@ if test "x$XQUARTZ" = xyes; then AC_CHECK_LIB([Xplugin],[xp_init],[:]) - CFLAGS="${CFLAGS} -DROOTLESS_SAFEALPHA -DNO_ALLOCA" + CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DROOTLESS_SAFEALPHA -DNO_ALLOCA" PKG_CHECK_MODULES(XPBPROXY, $APPLEWMPROTO $LIBAPPLEWM xfixes x11) diff --git a/miext/damage/damage.c b/miext/damage/damage.c index e0e96f2..1cf0513 100644 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -89,7 +89,11 @@ getDrawableDamageRef (DrawablePtr pDrawable) ScreenPtr pScreen = pDrawable->pScreen; pPixmap = 0; - if (pScreen->GetWindowPixmap) + if (pScreen->GetWindowPixmap +#ifdef ROOTLESS_WORKAROUND + && ((WindowPtr)pDrawable)->viewable +#endif + ) pPixmap = (*pScreen->GetWindowPixmap) ((WindowPtr)pDrawable); if (!pPixmap) commit 6e1f78bddfb854933206f9f5fd8d1dfc66ba8820 Author: Jeremy Huddleston <jerem...@apple.com> Date: Fri Oct 22 20:18:38 2010 -0700 Bump version to 1.9.1 Signed-off-by: Jeremy Huddleston <jerem...@apple.com> diff --git a/configure.ac b/configure.ac index fd533a5..a3843dc 100644 --- a/configure.ac +++ b/configure.ac @@ -26,8 +26,8 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) -AC_INIT([xorg-server], 1.9.0.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -RELEASE_DATE="2010-10-15" +AC_INIT([xorg-server], 1.9.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +RELEASE_DATE="2010-10-22" AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pfy4r-00028o...@alioth.debian.org