lp:~vcs-imports/xorg-server/master

Branch merges

This import branch has no branches proposed for merge into it.

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

6345. By Keith Packard on 2011-06-07

Merge remote-tracking branch 'kibi/master'

6344. By Keith Packard on 2011-06-07

Merge remote-tracking branch 'whot/for-keith'

6343. By Nicolas Kaiser on 2011-06-06

randr: void function cannot return value

Providing an argument to return in a function with void return type
is not allowed by the C standard, and makes the Sun compilers unhappy.

Signed-off-by: Nicolas Kaiser <email address hidden>
Reviewed-by: Jeremy Huddleston <email address hidden>
Reviewed-by: Alan Coopersmith <email address hidden>
Signed-off-by: Keith Packard <email address hidden>

6342. By Jeremy Sequoia on 2011-06-03

XQuartz: AIGLX: Remove unnecessary includes in indirect.c

Signed-off-by: Jeremy Huddleston <email address hidden>

6341. By Jeremy Sequoia on 2011-06-03

XQuartz: AIGLX: Setup dispatch table based on runtime capabilities rather than buildtime

This will allow XQuartz built on older systems to pickup capabilities on
newer systems and prevent runtime failures when building on newer systems and
running on older ones.

Signed-off-by: Jeremy Huddleston <email address hidden>

6340. By Jeremy Sequoia on 2011-06-03

XQuartz: Remove explicit link against libGL

This was indented to force a link against OpenGL.framework's libGL, but it
actually resulted in linking against mesa's libGL due to the ordering of -L

Signed-off-by: Jeremy Huddleston <email address hidden>

6339. By Cyril Brulebois on 2011-06-03

Xephyr: Mention Xserver's options are also accepted.

Originally reported in the Debian BTS:
  http://bugs.debian.org/582650

Reviewed-by: Peter Hutterer <email address hidden>
Signed-off-by: Jari Aalto <email address hidden>
Signed-off-by: Cyril Brulebois <email address hidden>

6338. By Cyril Brulebois on 2011-06-03

xkb: Fix case checks for Latin 8.

Spotted by -Wlogical-op:
| CC xkbfmisc.lo
| xkbfmisc.c: In function '_XkbKSCheckCase':
| xkbfmisc.c:104:3: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op]
| xkbfmisc.c:118:3: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op]

A quick look at the keysymdef.h file (from xproto) suggests the
implementor chose to use interval checks to determine the case, but
since lines weren't sorted by codepoints, checks were quite wrong.

Implement _XkbKSUpper/_XkbKSLower checks based on a grep for
CAPITAL/SMALL (respectively) on the Latin 8 part of the said file.

Reviewed-by: Daniel Stone <email address hidden>
Signed-off-by: Cyril Brulebois <email address hidden>

6337. By Peter Hutterer on 2011-06-03

test: fix memset size for WindowRec (#37801)

X.Org Bug 37801 <http://bugs.freedesktop.org/show_bug.cgi?id=37801>

Signed-off-by: Peter Hutterer <email address hidden>
Reviewed-by: Jeremy Huddleston <email address hidden>
Reviewed-by: Daniel Stone <email address hidden>
Reviewed-by: Cyril Brulebois <email address hidden>
Signed-off-by: Keith Packard <email address hidden>

6336. By Jeremy Sequoia on 2011-06-02

XQuartz: xpbproxy: Correct NSUInteger format strings

Signed-off-by: Jeremy Huddleston <email address hidden>