xserver: Branch 'xorg-server-1.4-apple' - 2 commits

[Jeremy Huddleston]

 hw/xfree86/loader/Makefile.am |    2 --
 hw/xquartz/darwinEvents.c     |    3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 4901b8147e593d26d7a31a9b73a201254b948916
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Tue Feb 24 23:12:57 2009 -0800

    XQuartz: Re-enable support for capslock

diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c
index 45995be..f663457 100644
--- a/hw/xquartz/darwinEvents.c
+++ b/hw/xquartz/darwinEvents.c
@@ -155,6 +155,7 @@ int darwin_modifier_mask_list[] = {
 #else
     NX_CONTROLMASK, NX_SHIFTMASK, NX_COMMANDMASK, NX_ALTERNATEMASK,
 #endif
+    NX_ALPHASHIFTMASK,
     0
 };
 
@@ -174,7 +175,7 @@ static void DarwinUpdateModifiers(
     }
     
     for(f=darwin_modifier_mask_list; *f; f++)
-        if(*f & flags) {
+        if(*f & flags && *f != NX_ALPHASHIFTMASK) {
             key = DarwinModifierNXMaskToNXKey(*f);
             if(key == -1)
                 ErrorF("DarwinUpdateModifiers: Unsupported NXMask: 0x%x\n", *f);
commit 9f6e855f4e861e44ea6b252c92c4a32b22c364bb
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Jul 16 16:37:14 2008 -0400

    Build fixes
    (cherry picked from commit 95000e34df9ba066905430eb0eb39a616567183e)

diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am
index ef9ab9a..62f90fb 100644
--- a/hw/xfree86/loader/Makefile.am
+++ b/hw/xfree86/loader/Makefile.am
@@ -23,12 +23,10 @@ libloader_a_SOURCES = \
 	loaderProcs.h \
 	loadext.c \
         loadmod.c \
-	loadfont.c \
         dlloader.c \
 	os.c \
 	dixsym.c \
 	extsym.c \
-	fontsym.c \
 	misym.c \
 	xf86sym.c \
 	sym.h \