Rebased ref, commits from common ancestor: commit bb184eb52fdfbfeaf507038f09bdcca29e410099 Author: Cyril Brulebois <k...@debian.org> Date: Tue May 1 01:58:07 2012 +0200
Upload to unstable. diff --git a/debian/changelog b/debian/changelog index c86e547..e655d89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -xorg-server (2:1.12.1-1) UNRELEASED; urgency=low +xorg-server (2:1.12.1-1) unstable; urgency=low * New upstream release. + * Upload to unstable. - -- Cyril Brulebois <k...@debian.org> Tue, 01 May 2012 01:56:10 +0200 + -- Cyril Brulebois <k...@debian.org> Tue, 01 May 2012 01:56:32 +0200 xorg-server (2:1.12.0.902-1) experimental; urgency=low commit 8d079dc2a8b9e82f6e6207fc3b1ada62db410681 Author: Cyril Brulebois <k...@debian.org> Date: Tue May 1 01:56:30 2012 +0200 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index 93f6c91..1c66cf3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +commit 38e73f7fc29fe8e9defa8a0516a50ac3a84e10c2 +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Fri Apr 13 15:44:08 2012 -0700 + + configure.ac: Bump to 1.12.1 + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + commit d603515dbfef94ec9cf7f5538815a954511e9e70 Author: Jeremy Huddleston <jerem...@apple.com> Date: Mon Apr 9 19:37:31 2012 -0700 diff --git a/debian/changelog b/debian/changelog index abead5d..c86e547 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.12.1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Cyril Brulebois <k...@debian.org> Tue, 01 May 2012 01:56:10 +0200 + xorg-server (2:1.12.0.902-1) experimental; urgency=low * New upstream release candidate (1.12.1 RC2). commit 38e73f7fc29fe8e9defa8a0516a50ac3a84e10c2 Author: Jeremy Huddleston <jerem...@apple.com> Date: Fri Apr 13 15:44:08 2012 -0700 configure.ac: Bump to 1.12.1 Signed-off-by: Jeremy Huddleston <jerem...@apple.com> diff --git a/configure.ac b/configure.ac index b26da71..a12783c 100644 --- a/configure.ac +++ b/configure.ac @@ -26,8 +26,8 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.60) -AC_INIT([xorg-server], 1.12.0.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -RELEASE_DATE="2012-04-09" +AC_INIT([xorg-server], 1.12.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +RELEASE_DATE="2012-04-13" AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit 037b983cfc7cd0c911ef515fc638390b409b79e2 Author: Cyril Brulebois <k...@debian.org> Date: Wed Apr 11 19:31:12 2012 +0000 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 83c6472..abead5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -xorg-server (2:1.12.0.902-1) UNRELEASED; urgency=low +xorg-server (2:1.12.0.902-1) experimental; urgency=low * New upstream release candidate (1.12.1 RC2). * Refresh patches, yay for automated re-indenting… - -- Cyril Brulebois <k...@debian.org> Mon, 02 Apr 2012 20:38:32 +0000 + -- Cyril Brulebois <k...@debian.org> Wed, 11 Apr 2012 19:31:09 +0000 xorg-server (2:1.12.0-1) experimental; urgency=low commit eac019850e93b32d37c972f25497b2435ff610c7 Author: Cyril Brulebois <k...@debian.org> Date: Wed Apr 11 19:30:43 2012 +0000 Refresh patches, yay for automated re-indenting… diff --git a/debian/changelog b/debian/changelog index c481a42..83c6472 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xorg-server (2:1.12.0.902-1) UNRELEASED; urgency=low * New upstream release candidate (1.12.1 RC2). + * Refresh patches, yay for automated re-indenting… -- Cyril Brulebois <k...@debian.org> Mon, 02 Apr 2012 20:38:32 +0000 diff --git a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff b/debian/patches/02_Add-libnettle-as-option-for-sha1.diff index bb0c338..daf4fc2 100644 --- a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff +++ b/debian/patches/02_Add-libnettle-as-option-for-sha1.diff @@ -8,11 +8,9 @@ Signed-off-by: Cyril Brulebois <k...@debian.org> [jcristau: forward-ported from 1.7 to 1.8] Signed-off-by: Julien Cristau <jcris...@debian.org> --- -Index: xorg-server/configure.ac -=================================================================== ---- xorg-server.orig/configure.ac -+++ xorg-server/configure.ac -@@ -1315,7 +1315,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(t +--- a/configure.ac ++++ b/configure.ac +@@ -1339,7 +1339,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(t # SHA1 hashing AC_ARG_WITH([sha1], @@ -21,7 +19,7 @@ Index: xorg-server/configure.ac [choose SHA1 implementation])]) AC_CHECK_FUNC([SHA1Init], [HAVE_SHA1_IN_LIBC=yes]) if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_LIBC" = xyes; then -@@ -1398,6 +1398,16 @@ if test "x$with_sha1" = xlibcrypto; then +@@ -1422,6 +1422,16 @@ if test "x$with_sha1" = xlibcrypto; then SHA1_CFLAGS="$OPENSSL_CFLAGS" fi fi @@ -38,11 +36,9 @@ Index: xorg-server/configure.ac AC_MSG_CHECKING([for SHA1 implementation]) if test "x$with_sha1" = x; then AC_MSG_ERROR([No suitable SHA1 implementation found]) -Index: xorg-server/include/dix-config.h.in -=================================================================== ---- xorg-server.orig/include/dix-config.h.in -+++ xorg-server/include/dix-config.h.in -@@ -175,6 +175,9 @@ +--- a/include/dix-config.h.in ++++ b/include/dix-config.h.in +@@ -157,6 +157,9 @@ /* Define to use libsha1 for SHA1 */ #undef HAVE_SHA1_IN_LIBSHA1 @@ -52,23 +48,21 @@ Index: xorg-server/include/dix-config.h.in /* Define to 1 if you have the `shmctl64' function. */ #undef HAVE_SHMCTL64 -Index: xorg-server/os/xsha1.c -=================================================================== ---- xorg-server.orig/os/xsha1.c -+++ xorg-server/os/xsha1.c -@@ -127,6 +127,31 @@ int x_sha1_final(void *ctx, unsigned cha +--- a/os/xsha1.c ++++ b/os/xsha1.c +@@ -148,6 +148,31 @@ x_sha1_final(void *ctx, unsigned char re return 1; } +#elif defined(HAVE_SHA1_IN_LIBNETTLE) + -+# include <nettle/sha.h> ++#include <nettle/sha.h> + +void *x_sha1_init(void) +{ + struct sha1_ctx *ctx = xalloc(sizeof(*ctx)); + if (!ctx) -+ return NULL; ++ return NULL; + sha1_init(ctx); + return ctx; +} @@ -85,6 +79,6 @@ Index: xorg-server/os/xsha1.c + return 1; +} + - #else /* Use OpenSSL's libcrypto */ + #else /* Use OpenSSL's libcrypto */ - # include <stddef.h> /* buggy openssl/sha.h wants size_t */ + #include <stddef.h> /* buggy openssl/sha.h wants size_t */ commit 0c3ca884e69315a4c8834ea0907a649ea3fc7223 Author: Cyril Brulebois <k...@debian.org> Date: Wed Apr 11 03:57:37 2012 +0200 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index 430eb81..93f6c91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,82 @@ +commit d603515dbfef94ec9cf7f5538815a954511e9e70 +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Mon Apr 9 19:37:31 2012 -0700 + + configure.ac: Bump to 1.12.0.902 (1.12.1 RC2) + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + +commit 7e62bc31c65aedcdf55cd7dc02b349b6b5c0812c +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Sat Apr 7 15:26:53 2012 -0700 + + test: Fix make dist + + I don't know why this fixes the problem with make dist, but it does... + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + +commit ad89533327919223204021738dd108d7dd814e8c +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Mon Apr 9 19:36:04 2012 -0700 + + Revert "xfree86: workaround crash on close" + + This reverts commit b704d9146336c3044be2be7ae38ce2c5b5a47f86. + + This was causing some regressions. Reverting as discussed on xorg-devel. + +commit 259aa5a69b69aa72be3fb7402b68560f9a6b05d6 +Author: Chase Douglas <chase.doug...@canonical.com> +Date: Thu Mar 29 18:06:03 2012 -0700 + + Implement passive touch ungrabbing + + Whoops. Forgot to implement this. The code currently generates an error + due to the unhandled grab type. + + X.Org Bug 48069 <https://bugs.freedesktop.org/show_bug.cgi?id=48069> + + Signed-off-by: Chase Douglas <chase.doug...@canonical.com> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + Signed-off-by: Keith Packard <kei...@keithp.com> + (cherry picked from commit 1110facdfeb95b1ad47d03c0ca3d73933b86dbd6) + +commit 42474e98ec4245c9e80fc0e9a4b287f3999324f2 +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Thu Apr 5 14:03:35 2012 -0700 + + XQuartz: Automatically start our virtual tablet devices + + Fixes: https://bugs.launchpad.net/inkscape/+bug/972914 + Regression introduced by: 7790dc86384cc451ac44663737fde84dd81ad4e1 + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + (cherry picked from commit e9d3848d7bda7f7de4c0f497aee4482d0b30ad49) + +commit 4b3ac1b563c3de32ad13e794fefabd5124648393 +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Fri Mar 30 14:29:48 2012 -0700 + + XQuartz: Tiger build fix + + Fixes: https://trac.macports.org/ticket/33818 + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + (cherry picked from commit 6cb83b78c47b80556cb4d573524d60f0cd1a64ac) + +commit b704d9146336c3044be2be7ae38ce2c5b5a47f86 +Author: Michal Suchanek <hramr...@gmail.com> +Date: Wed Mar 28 18:12:39 2012 -0700 + + xfree86: workaround crash on close + + Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=41653 + + Signed-off-by: Michal Suchanek <hramr...@gmail.com> + Reviewed-by: Jeremy Huddleston <jerem...@apple.com> + (cherry picked from commit 55f552adb651715d2620db7248cd5b9b8187654a) + commit 391f75e87515fcc89b8e5cd058401c4a056d9139 Author: Jeremy Huddleston <jerem...@apple.com> Date: Fri Mar 30 16:01:57 2012 -0700 diff --git a/debian/changelog b/debian/changelog index 893b3dd..c481a42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -xorg-server (2:1.12.0.901-1) UNRELEASED; urgency=low +xorg-server (2:1.12.0.902-1) UNRELEASED; urgency=low - * New upstream release candidate (1.12.1 RC1). + * New upstream release candidate (1.12.1 RC2). -- Cyril Brulebois <k...@debian.org> Mon, 02 Apr 2012 20:38:32 +0000 commit d603515dbfef94ec9cf7f5538815a954511e9e70 Author: Jeremy Huddleston <jerem...@apple.com> Date: Mon Apr 9 19:37:31 2012 -0700 configure.ac: Bump to 1.12.0.902 (1.12.1 RC2) Signed-off-by: Jeremy Huddleston <jerem...@apple.com> diff --git a/configure.ac b/configure.ac index cc21fd8..b26da71 100644 --- a/configure.ac +++ b/configure.ac @@ -26,8 +26,8 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.60) -AC_INIT([xorg-server], 1.12.0.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -RELEASE_DATE="2012-03-30" +AC_INIT([xorg-server], 1.12.0.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +RELEASE_DATE="2012-04-09" AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit 7e62bc31c65aedcdf55cd7dc02b349b6b5c0812c Author: Jeremy Huddleston <jerem...@apple.com> Date: Sat Apr 7 15:26:53 2012 -0700 test: Fix make dist I don't know why this fixes the problem with make dist, but it does... Signed-off-by: Jeremy Huddleston <jerem...@apple.com> diff --git a/test/Makefile.am b/test/Makefile.am index eb61470..32be00d 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -53,8 +53,6 @@ libxservertest_la_LIBADD += \ $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \ @XORG_LIBS@ -EXTRA_DIST = ddxstubs.c - else nodist_libxservertest_la_SOURCES = \ ddxstubs.c \ @@ -110,3 +108,6 @@ endif libxservertest_la_DEPENDENCIES = $(libxservertest_la_LIBADD) endif + +EXTRA_DIST = ddxstubs.c + commit ad89533327919223204021738dd108d7dd814e8c Author: Jeremy Huddleston <jerem...@apple.com> Date: Mon Apr 9 19:36:04 2012 -0700 Revert "xfree86: workaround crash on close" This reverts commit b704d9146336c3044be2be7ae38ce2c5b5a47f86. This was causing some regressions. Reverting as discussed on xorg-devel. diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c index f9602fa..85d7557 100644 --- a/hw/xfree86/modes/xf86Rotate.c +++ b/hw/xfree86/modes/xf86Rotate.c @@ -272,7 +272,6 @@ xf86RotateDestroy(xf86CrtcPtr crtc) ScrnInfoPtr pScrn = crtc->scrn; ScreenPtr pScreen = pScrn->pScreen; xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); - DrawablePtr screenDrawable = &pScreen->root->drawable; int c; /* Free memory from rotation */ @@ -290,7 +289,7 @@ xf86RotateDestroy(xf86CrtcPtr crtc) /* * Clean up damage structures when no crtcs are rotated */ - if (screenDrawable && xf86_config->rotation_damage) { + if (xf86_config->rotation_damage) { /* Free damage structure */ if (xf86_config->rotation_damage_registered) { DamageUnregister(&pScreen->root->drawable, commit 259aa5a69b69aa72be3fb7402b68560f9a6b05d6 Author: Chase Douglas <chase.doug...@canonical.com> Date: Thu Mar 29 18:06:03 2012 -0700 Implement passive touch ungrabbing Whoops. Forgot to implement this. The code currently generates an error due to the unhandled grab type. X.Org Bug 48069 <https://bugs.freedesktop.org/show_bug.cgi?id=48069> Signed-off-by: Chase Douglas <chase.doug...@canonical.com> Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> Signed-off-by: Keith Packard <kei...@keithp.com> (cherry picked from commit 1110facdfeb95b1ad47d03c0ca3d73933b86dbd6) diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c index 8a1c599..7130328 100644 --- a/Xi/xipassivegrab.c +++ b/Xi/xipassivegrab.c @@ -290,13 +290,15 @@ ProcXIPassiveUngrabDevice(ClientPtr client) if (stuff->grab_type != XIGrabtypeButton && stuff->grab_type != XIGrabtypeKeycode && stuff->grab_type != XIGrabtypeEnter && - stuff->grab_type != XIGrabtypeFocusIn) { + stuff->grab_type != XIGrabtypeFocusIn && + stuff->grab_type != XIGrabtypeTouchBegin) { client->errorValue = stuff->grab_type; return BadValue; } if ((stuff->grab_type == XIGrabtypeEnter || - stuff->grab_type == XIGrabtypeFocusIn) && stuff->detail != 0) { + stuff->grab_type == XIGrabtypeFocusIn || + stuff->grab_type == XIGrabtypeTouchBegin) && stuff->detail != 0) { client->errorValue = stuff->detail; return BadValue; } @@ -327,6 +329,9 @@ ProcXIPassiveUngrabDevice(ClientPtr client) case XIGrabtypeFocusIn: tempGrab->type = XI_FocusIn; break; + case XIGrabtypeTouchBegin: + tempGrab->type = XI_TouchBegin; + break; } tempGrab->grabtype = XI2; tempGrab->modifierDevice = mod_dev; commit 42474e98ec4245c9e80fc0e9a4b287f3999324f2 Author: Jeremy Huddleston <jerem...@apple.com> Date: Thu Apr 5 14:03:35 2012 -0700 XQuartz: Automatically start our virtual tablet devices Fixes: https://bugs.launchpad.net/inkscape/+bug/972914 Regression introduced by: 7790dc86384cc451ac44663737fde84dd81ad4e1 Signed-off-by: Jeremy Huddleston <jerem...@apple.com> (cherry picked from commit e9d3848d7bda7f7de4c0f497aee4482d0b30ad49) diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index ff6581c..2d5174a 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -539,15 +539,15 @@ InitInput(int argc, char **argv) gdkdev->info.source = GDK_SOURCE_PEN; */ - darwinTabletStylus = AddInputDevice(serverClient, DarwinTabletProc, FALSE); + darwinTabletStylus = AddInputDevice(serverClient, DarwinTabletProc, TRUE); assert(darwinTabletStylus); darwinTabletStylus->name = strdup("pen"); - darwinTabletCursor = AddInputDevice(serverClient, DarwinTabletProc, FALSE); + darwinTabletCursor = AddInputDevice(serverClient, DarwinTabletProc, TRUE); assert(darwinTabletCursor); darwinTabletCursor->name = strdup("cursor"); - darwinTabletEraser = AddInputDevice(serverClient, DarwinTabletProc, FALSE); + darwinTabletEraser = AddInputDevice(serverClient, DarwinTabletProc, TRUE); assert(darwinTabletEraser); darwinTabletEraser->name = strdup("eraser"); commit 4b3ac1b563c3de32ad13e794fefabd5124648393 Author: Jeremy Huddleston <jerem...@apple.com> Date: Fri Mar 30 14:29:48 2012 -0700 XQuartz: Tiger build fix Fixes: https://trac.macports.org/ticket/33818 Signed-off-by: Jeremy Huddleston <jerem...@apple.com> (cherry picked from commit 6cb83b78c47b80556cb4d573524d60f0cd1a64ac) diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am index 21ad5b5..77962b1 100644 --- a/hw/xquartz/mach-startup/Makefile.am +++ b/hw/xquartz/mach-startup/Makefile.am @@ -23,7 +23,7 @@ nodist_X11_bin_SOURCES = \ mach_startupServer.c \ mach_startupUser.c -X11_bin_LDADD = \ +X11_bin_DEPENDENCIES = \ $(top_builddir)/hw/xquartz/libXquartz.la \ $(top_builddir)/hw/xquartz/xpr/libXquartzXpr.la \ $(top_builddir)/dix/dixfonts.lo \ @@ -31,8 +31,12 @@ X11_bin_LDADD = \ $(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \ $(XQUARTZ_LIBS) $(XSERVER_LIBS) +# $(XSERVER_SYS_LIBS) is placed here in order to set command line ordering +# to work around build issues on Tiger. +X11_bin_LDADD = $(X11_bin_DEPENDENCIES) $(XSERVER_SYS_LIBS) + X11_bin_LDFLAGS = \ - $(XSERVER_SYS_LIBS) -lXplugin \ + -lXplugin \ -XCClinker -Objc \ -Wl,-u,_miDCInitialize \ -Wl,-framework,Carbon \ @@ -41,7 +45,7 @@ X11_bin_LDFLAGS = \ -Wl,-framework,IOKit if GLX -X11_bin_LDADD += \ +X11_bin_DEPENDENCIES += \ $(top_builddir)/hw/xquartz/GL/libCGLCore.la \ $(top_builddir)/glx/libglx.la @@ -55,12 +59,10 @@ X11_bin_LDFLAGS += \ endif if RECORD -X11_bin_LDADD += \ +X11_bin_DEPENDENCIES += \ $(top_builddir)/record/librecord.la endif -X11_bin_DEPENDENCIES = $(X11_bin_LDADD) - bin_PROGRAMS = Xquartz dist_Xquartz_SOURCES = \ commit b704d9146336c3044be2be7ae38ce2c5b5a47f86 Author: Michal Suchanek <hramr...@gmail.com> Date: Wed Mar 28 18:12:39 2012 -0700 xfree86: workaround crash on close Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=41653 Signed-off-by: Michal Suchanek <hramr...@gmail.com> Reviewed-by: Jeremy Huddleston <jerem...@apple.com> (cherry picked from commit 55f552adb651715d2620db7248cd5b9b8187654a) diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c index 85d7557..f9602fa 100644 --- a/hw/xfree86/modes/xf86Rotate.c +++ b/hw/xfree86/modes/xf86Rotate.c @@ -272,6 +272,7 @@ xf86RotateDestroy(xf86CrtcPtr crtc) ScrnInfoPtr pScrn = crtc->scrn; ScreenPtr pScreen = pScrn->pScreen; xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); + DrawablePtr screenDrawable = &pScreen->root->drawable; int c; /* Free memory from rotation */ @@ -289,7 +290,7 @@ xf86RotateDestroy(xf86CrtcPtr crtc) /* * Clean up damage structures when no crtcs are rotated */ - if (xf86_config->rotation_damage) { + if (screenDrawable && xf86_config->rotation_damage) { /* Free damage structure */ if (xf86_config->rotation_damage_registered) { DamageUnregister(&pScreen->root->drawable, commit 574f2bd3ab836b34c494d23360cbb673b25e6d38 Author: Cyril Brulebois <k...@debian.org> Date: Mon Apr 2 20:39:18 2012 +0000 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index cd36840..430eb81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,587 @@ +commit 391f75e87515fcc89b8e5cd058401c4a056d9139 +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Fri Mar 30 16:01:57 2012 -0700 + + configure.ac: Bump to 1.12.0.901 (1.12.1 RC1) + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + +commit 5eb20062208177172ff3443e522096a2e8f2f1e8 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Wed Mar 21 14:05:29 2012 +1000 + + dix: set raw event values before adding up relative values (#46976) + + Regression introduced in 4e52cc0ef48145134cd58d357fb7289e6f8bb709 + + Raw event values are values as-is from the driver, modified only be + transformation or acceleration. 4e52cc caused the mask to be updated from + relative to absolute coordinates which then got written into the raw events. + + Move the raw event update into the respective branches for absolute/relative + events. + + X.Org Bug 46976 <http://bugs.freedesktop.org/show_bug.cgi?id=46976> + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + Reviewed-by: Daniel Stone <dan...@fooishbar.org> + Tested-by: Sven Arvidsson <s...@whiz.se> + Reviewed-by: Simon Thum <simon.t...@gmx.de> + (cherry picked from commit 908ab3d580188533168c8cdfd2cab9dc689b4218) + +commit a095f7ae96a353073add83e78f88f29d854d289d +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Wed Mar 21 14:03:27 2012 +1000 + + dix: fix compiler warning "unused variable 'scr'" + + getevents.c: In function 'updateSlaveDeviceCoords': + getevents.c:326:15: warning: unused variable 'scr' [-Wunused-variable] + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + (cherry picked from commit 9c3bd3ae652af386b6821b197d24528f20ba867d) + +commit d0a6d9bcefaf56aa63708ea69e5c399dbf266d63 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Mon Mar 12 16:26:29 2012 +1000 + + Xext: drop InitServertime() declaration. + + Not implemented anywhere. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Jeremy Huddleston <jerem...@apple.com> + Reviewed-by: Bryce Harrington <br...@canonical.com> + (cherry picked from commit 5910f2df58beaae2187438fef0b62c29a563e853) + +commit f8446ad3d71cdf9c2200f5584bd156c629fe3c90 +Author: Chase Douglas <chase.doug...@canonical.com> +Date: Wed Mar 7 16:06:27 2012 -0800 + + Use a new sprite trace for indirect touches when all touches have physically ended + + All touches of an indirect device, such as a trackpad, are sent to the + same window set. When there are no active touches, a new window set is + created; otherwise, the window set of an existing touch is copied. + + The current code checks for any logically active touches. This includes + touches that have physically ended but are still logically active due to + unhandled touch grabs. Instead, we want a new window set whenever there + are no physically active touches. + + This change skips over logically active but pending end touches, which + are touches that have physically ended. + + Signed-off-by: Chase Douglas <chase.doug...@canonical.com> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + (cherry picked from commit 31df08a449cf9b6e1740e1c02257997490630d93) + +commit 5a3ec826e653377e8b70e7553d1f0ca72210447c +Author: Chase Douglas <chase.doug...@canonical.com> +Date: Wed Mar 7 16:06:26 2012 -0800 + + Xi: Fix TouchEnd to TouchUpdate change for one accepted grab + + If there is only one listener of a touch, the listener is a grab, and is + accepted before the touch has ended, the current code will not end the + touch record when the touch does end. + + This change adds a listener state for when a touch is accepted but has + not yet ended. We now keep the touch record alive in this state, but end + it when the touch ends. + + Signed-off-by: Chase Douglas <chase.doug...@canonical.com> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + (cherry picked from commit 58427e08a4a36ce9e213e4b4fe5249d5db2c764d) + +commit a8c9a93c66edce893af3ba460d728fe2bc48c2af +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Mon Feb 27 10:09:44 2012 +1000 + + dix: when rescaling from master, rescale from desktop dimensions (#46657) + + master->last.valuators[] is in desktop dimensions, so use those as + rescale axis ranges, not the screen. Otherwise, a rescale on any screen + not the top-left will cause out-of-bounds coordinates which will always + map to the bottom-right screen, causing the device to be stuck on that + screen. + + X.Org Bug 46657 <http://bugs.freedesktop.org/show_bug.cgi?id=46657> + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + (cherry picked from commit eb84c154ed38194c32651727b6dfe2d1bde4c599) + +commit bc8dc7183b50800470080eaa9c04cfd6ecc3591b +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Thu Feb 16 15:11:40 2012 +1000 + + Xext: return BadAccess if PickPointer fails (#45796) + + PickPointer or PickKeyboard return NULL, all MDs are currently disabled and + we cannot emulate a core event. This wasn't anticipated by the protocol, so + we don't really have an error code we may use here - BadAccess is simply the + least bad of the possible ones. + + And returning BadAccess beats crashing the server. + + X.Org Bug 45796 <http://bugs.freedesktop.org/show_bug.cgi?id=45796> + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + (cherry picked from commit 6b6afd3d013e3f4910fae3520d1d786df2b0e47a) + +commit 1e2a7462bec388342424f22ebf77a6fd3f177d7d +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Sun Mar 25 23:33:54 2012 -0700 + + XQuartz: Use scrolling valuators + + This lets use send more accurate data to Xi clients and uses dix + for legacy scroll buttons rather than reinventing the wheel. + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + Acked-by: Peter Hutterer <peter.hutte...@who-t.net> + (cherry picked from commit 31646d8fa9524adca1d7bc2cd2db90d47c2eb96e) + +commit 67d20e393fdbcc0702a9b3e9848faaa3571d8534 +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Sun Mar 25 22:30:55 2012 -0700 + + XQuartz: Use AllocDevicePair to allocate our keyboard and mouse at the same time + + Also correct isMaster to FALSE while we're here. + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + Acked-by: Peter Hutterer <peter.hutte...@who-t.net> + (cherry picked from commit 7790dc86384cc451ac44663737fde84dd81ad4e1) + +commit 3ee84899b1a3ea5d12e384046c52c7262af78395 +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Sun Mar 25 22:16:22 2012 -0700 + + XQuartz: Call update_desktop_dimensions() after updating our screen coordinates + + Fixes: http://xquartz.macosforge.org/trac/ticket/555 + Regression from: 8bebb4b4896d8b6ba3309b5b28fce883bb9f8a96 + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + Acked-by: Peter Hutterer <peter.hutte...@who-t.net> + (cherry picked from commit 74fb534bf15687610367248071341fe4bfd1d8bf) + +commit 815414858b918c39fdfb5f7500e2eec5d4946fba +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Sun Mar 25 23:05:43 2012 -0700 + + XQuartz: Formatting cleanup for sendX11NSEvent + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + (cherry picked from commit 41a46546e92b66fed323b5845dd71a6385feb418) + +commit 3413570318ccb9fefb87169d6e7ea4b3391f4002 +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Fri Mar 23 19:58:49 2012 -0700 + + XQuartz: Source formatting cleanup + + indent butchered Objective-C formatting. This patch was created by: + + 1) Reverting the indent changes in hw/xquartz + 2) Editing X11Application.m and chaning some #ifdef logic to work + with uncrustify + 3) Hand edited some (c) notifications + 4) Opened all XQuartz sources in XCode and re-indented (^I) + 5) Ran uncrustify with this configuration + (as close to the indent rules as I could get): + + tok_split_gte=false + utf8_byte=true + utf8_force=true + indent_cmt_with_tabs=false + indent_align_string=false + indent_braces=false + indent_braces_no_func=false + indent_braces_no_class=false + indent_braces_no_struct=false + indent_brace_parent=false + indent_namespace=false + indent_extern=false + indent_class=false + indent_class_colon=false + indent_else_if=false + indent_var_def_cont=false + indent_func_call_param=false + indent_func_def_param=false + indent_func_proto_param=false + indent_func_class_param=false + indent_func_ctor_var_param=false + indent_template_param=false + indent_func_param_double=false + indent_relative_single_line_comments=false + indent_col1_comment=false + indent_access_spec_body=false + indent_paren_nl=false + indent_comma_paren=false + indent_bool_paren=false + indent_first_bool_expr=false + indent_square_nl=false + indent_preserve_sql=false + indent_align_assign=true + sp_balance_nested_parens=false + align_keep_tabs=false + align_with_tabs=false + align_on_tabstop=false + align_number_left=false + align_func_params=false + align_same_func_call_params=false + align_var_def_colon=true + align_var_def_attribute=true + align_var_def_inline=true + align_right_cmt_mix=false + align_on_operator=false + align_mix_var_proto=false + align_single_line_func=false + align_single_line_brace=false + align_nl_cont=false + align_left_shift=true + align_oc_decl_colon=true + nl_collapse_empty_body=true + nl_assign_leave_one_liners=true + nl_class_leave_one_liners=true + nl_enum_leave_one_liners=true + nl_getset_leave_one_liners=true + nl_func_leave_one_liners=true + nl_if_leave_one_liners=true + nl_multi_line_cond=false + nl_multi_line_define=false + nl_before_case=true + nl_after_case=true + nl_after_return=false + nl_after_semicolon=true + nl_after_brace_open=true + nl_after_brace_open_cmt=false + nl_after_vbrace_open=false + nl_after_vbrace_open_empty=false + nl_after_brace_close=false + nl_after_vbrace_close=false + nl_define_macro=false + nl_squeeze_ifdef=false + nl_ds_struct_enum_cmt=false + nl_ds_struct_enum_close_brace=false + nl_create_if_one_liner=false + nl_create_for_one_liner=false + nl_create_while_one_liner=false + ls_for_split_full=false + ls_func_split_full=false + nl_after_multiline_comment=false + eat_blanks_after_open_brace=false + eat_blanks_before_close_brace=false + mod_full_brace_if_chain=false + mod_pawn_semicolon=false + mod_full_paren_if_bool=false + mod_remove_extra_semicolon=false + mod_sort_import=false + mod_sort_using=false + mod_sort_include=false + mod_move_case_break=false + mod_remove_empty_return=false + cmt_indent_multi=true + cmt_c_group=false + cmt_c_nl_start=false + cmt_c_nl_end=false + cmt_cpp_group=false + cmt_cpp_nl_start=false + cmt_cpp_nl_end=false + cmt_cpp_to_c=false + cmt_star_cont=false + cmt_multi_check_last=true + cmt_insert_before_preproc=false + pp_indent_at_level=false + pp_region_indent_code=false + pp_if_indent_code=false + pp_define_at_level=false + indent_columns=4 + indent_brace=0 + indent_switch_case=0 + align_struct_init_span=2 + align_pp_define_gap=0 + align_pp_define_span=2 + align_oc_msg_colon_span=16 + nl_end_of_file_min=1 + nl_func_var_def_blk=0 + code_width=78 + nl_max=2 + newlines=auto + indent_with_tabs=0 + sp_arith=force + sp_assign=force + sp_assign_default=force + sp_before_assign=force + sp_after_assign=force + sp_enum_assign=force + sp_enum_before_assign=force + sp_enum_after_assign=force + sp_pp_stringify=add + sp_bool=force + sp_compare=force + sp_inside_paren=remove + sp_paren_paren=remove + sp_paren_brace=force + sp_before_ptr_star=ignore + sp_before_unnamed_ptr_star=force + sp_before_byref=force + sp_before_unnamed_byref=force + sp_after_byref=remove + sp_after_type=force + sp_before_sparen=force + sp_inside_sparen=remove + sp_inside_sparen_close=remove + sp_after_sparen=force + sp_sparen_brace=force + sp_special_semi=force + sp_before_semi=remove + sp_after_semi=force + sp_after_semi_for=force + sp_after_semi_for_empty=remove + sp_before_square=remove + sp_inside_square=remove + sp_after_comma=force + sp_before_comma=remove + sp_paren_comma=force + sp_before_ellipsis=force + sp_after_class_colon=force + sp_before_class_colon=force + sp_before_case_colon=remove + sp_after_cast=remove + sp_inside_paren_cast=remove + sp_sizeof_paren=remove + sp_inside_braces_enum=force + sp_inside_braces_struct=force + sp_inside_braces=force + sp_inside_braces_empty=remove + sp_func_proto_paren=remove + sp_func_def_paren=remove + sp_inside_fparens=remove + sp_inside_fparen=remove + sp_square_fparen=remove + sp_fparen_brace=force + sp_func_call_paren=remove + sp_func_call_paren_empty=remove + sp_return_paren=force + sp_attribute_paren=remove + sp_defined_paren=remove + sp_macro=force + sp_macro_func=force + sp_else_brace=force + sp_brace_else=force + sp_brace_typedef=force + sp_not=remove + sp_inv=remove + nl_start_of_file=remove + nl_end_of_file=force + nl_assign_square=remove + nl_after_square_assign=remove + nl_fcall_brace=remove + nl_enum_brace=remove + nl_struct_brace=remove + nl_union_brace=remove + nl_if_brace=remove + nl_brace_else=force + nl_elseif_brace=remove + nl_else_brace=remove + nl_else_if=remove + nl_for_brace=remove + nl_do_brace=remove + nl_brace_while=remove + nl_switch_brace=remove + nl_case_colon_brace=force + nl_func_type_name=force + nl_func_type_name_class=force + nl_func_proto_type_name=force + nl_func_paren=remove + nl_func_def_paren=remove + nl_func_decl_start=remove + nl_func_def_start=remove -- 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/e1sp17b-0001gb...@vasks.debian.org