From f51268259621a21d14e40b8a41c5803a5c2ce706 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 18 Feb 2013 09:48:46 +0100
Subject: git update fontconfig libX11 mesa xkeyboard-config 18 Feb 2013

xkeyboard-config commit 5102e074fea319c10243579955b64366f11009fd
libX11           commit deedeada53676ee529d700bf96fde0b29a3a1def
fontconfig       commit 2c696255749683e9a084f797eb033d222510a275
mesa             commit dd599188d2868838541859a76800a8420958d358
---
 fontconfig/conf.d/10-autohint.conf             |  2 +-
 fontconfig/conf.d/10-no-sub-pixel.conf         |  2 +-
 fontconfig/conf.d/10-sub-pixel-bgr.conf        |  2 +-
 fontconfig/conf.d/10-sub-pixel-rgb.conf        |  2 +-
 fontconfig/conf.d/10-sub-pixel-vbgr.conf       |  2 +-
 fontconfig/conf.d/10-sub-pixel-vrgb.conf       |  2 +-
 fontconfig/conf.d/10-unhinted.conf             |  2 +-
 fontconfig/conf.d/11-lcdfilter-default.conf    |  2 +-
 fontconfig/conf.d/11-lcdfilter-legacy.conf     |  2 +-
 fontconfig/conf.d/11-lcdfilter-light.conf      |  2 +-
 fontconfig/src/fcfreetype.c                    |  5 +-
 libX11/src/FontInfo.c                          | 13 +++--
 mesalib/include/GL/gl.h                        |  1 -
 mesalib/src/mesa/main/getstring.c              |  2 +-
 mesalib/src/mesa/state_tracker/st_extensions.c |  7 ++-
 xorg-server/xkeyboard-config/rules/base.xml.in |  6 ++
 xorg-server/xkeyboard-config/symbols/de        | 78 ++++++++++++++++++++++++++
 17 files changed, 109 insertions(+), 23 deletions(-)

diff --git a/fontconfig/conf.d/10-autohint.conf b/fontconfig/conf.d/10-autohint.conf
index bf08de83e..f9032ba31 100644
--- a/fontconfig/conf.d/10-autohint.conf
+++ b/fontconfig/conf.d/10-autohint.conf
@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <!--  Use the Autohinter --> 
-  <match target="font">
+  <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.
       We shouldn't overwrite it with "assign" unconditionally.
diff --git a/fontconfig/conf.d/10-no-sub-pixel.conf b/fontconfig/conf.d/10-no-sub-pixel.conf
index e650160a5..cf1246561 100644
--- a/fontconfig/conf.d/10-no-sub-pixel.conf
+++ b/fontconfig/conf.d/10-no-sub-pixel.conf
@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <!--  Enable sub-pixel rendering --> 
-  <match target="font">
+  <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.
       We shouldn't overwrite it with "assign" unconditionally.
diff --git a/fontconfig/conf.d/10-sub-pixel-bgr.conf b/fontconfig/conf.d/10-sub-pixel-bgr.conf
index 74574ad3f..1378195dd 100644
--- a/fontconfig/conf.d/10-sub-pixel-bgr.conf
+++ b/fontconfig/conf.d/10-sub-pixel-bgr.conf
@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <!--  Enable sub-pixel rendering --> 
-  <match target="font">
+  <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.
       We shouldn't overwrite it with "assign" unconditionally.
diff --git a/fontconfig/conf.d/10-sub-pixel-rgb.conf b/fontconfig/conf.d/10-sub-pixel-rgb.conf
index 3c558e5df..757c3b6a7 100644
--- a/fontconfig/conf.d/10-sub-pixel-rgb.conf
+++ b/fontconfig/conf.d/10-sub-pixel-rgb.conf
@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <!--  Enable sub-pixel rendering --> 
-  <match target="font">
+  <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.
       We shouldn't overwrite it with "assign" unconditionally.
diff --git a/fontconfig/conf.d/10-sub-pixel-vbgr.conf b/fontconfig/conf.d/10-sub-pixel-vbgr.conf
index 392634d53..c807e5c05 100644
--- a/fontconfig/conf.d/10-sub-pixel-vbgr.conf
+++ b/fontconfig/conf.d/10-sub-pixel-vbgr.conf
@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <!--  Enable sub-pixel rendering --> 
-  <match target="font">
+  <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.
       We shouldn't overwrite it with "assign" unconditionally.
diff --git a/fontconfig/conf.d/10-sub-pixel-vrgb.conf b/fontconfig/conf.d/10-sub-pixel-vrgb.conf
index 1b7b5f6d5..b5985e03c 100644
--- a/fontconfig/conf.d/10-sub-pixel-vrgb.conf
+++ b/fontconfig/conf.d/10-sub-pixel-vrgb.conf
@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <!--  Enable sub-pixel rendering --> 
-  <match target="font">
+  <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.
       We shouldn't overwrite it with "assign" unconditionally.
diff --git a/fontconfig/conf.d/10-unhinted.conf b/fontconfig/conf.d/10-unhinted.conf
index 67037b435..a25e3b1dc 100644
--- a/fontconfig/conf.d/10-unhinted.conf
+++ b/fontconfig/conf.d/10-unhinted.conf
@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <!--  Disable hinting --> 
-  <match target="font">
+  <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.
       We shouldn't overwrite it with "assign" unconditionally.
diff --git a/fontconfig/conf.d/11-lcdfilter-default.conf b/fontconfig/conf.d/11-lcdfilter-default.conf
index e251edd4d..9d7d11f90 100644
--- a/fontconfig/conf.d/11-lcdfilter-default.conf
+++ b/fontconfig/conf.d/11-lcdfilter-default.conf
@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <!--  Use lcddefault as default for LCD filter -->
-  <match target="font">
+  <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.
       We shouldn't overwrite it with "assign" unconditionally.
diff --git a/fontconfig/conf.d/11-lcdfilter-legacy.conf b/fontconfig/conf.d/11-lcdfilter-legacy.conf
index 63a4116e2..7e2b25675 100644
--- a/fontconfig/conf.d/11-lcdfilter-legacy.conf
+++ b/fontconfig/conf.d/11-lcdfilter-legacy.conf
@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <!--  Use lcdlegacy as default for LCD filter -->
-  <match target="font">
+  <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.
       We shouldn't overwrite it with "assign" unconditionally.
diff --git a/fontconfig/conf.d/11-lcdfilter-light.conf b/fontconfig/conf.d/11-lcdfilter-light.conf
index af50b2c2e..0dd0a9007 100644
--- a/fontconfig/conf.d/11-lcdfilter-light.conf
+++ b/fontconfig/conf.d/11-lcdfilter-light.conf
@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <!--  Use lcdlight as default for LCD filter -->
-  <match target="font">
+  <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.
       We shouldn't overwrite it with "assign" unconditionally.
diff --git a/fontconfig/src/fcfreetype.c b/fontconfig/src/fcfreetype.c
index 267df8715..9bd789ca3 100644
--- a/fontconfig/src/fcfreetype.c
+++ b/fontconfig/src/fcfreetype.c
@@ -2561,7 +2561,8 @@ FcFreeTypeCharSet (FT_Face face, FcBlanks *blanks)
  * except for 'DFLT'.
  */
 #define FcIsSpace(x)	    (040 == (x))
-#define FcIsValidScript(x)  (FcIsLower(x) || FcIsUpper (x) || FcIsSpace(x))
+#define FcIsDigit(c)	    (('0' <= (c) && (c) <= '9'))
+#define FcIsValidScript(x)  (FcIsLower(x) || FcIsUpper (x) || FcIsDigit(x) || FcIsSpace(x))
 			
 static void
 addtag(FcChar8 *complex_, FT_ULong tag)
@@ -2574,7 +2575,7 @@ addtag(FcChar8 *complex_, FT_ULong tag)
     tagstring[3] = (FcChar8)(tag);
     tagstring[4] = '\0';
 
-    /* skip tags which aren't alphabetic, under the assumption that
+    /* skip tags which aren't alphanumeric, under the assumption that
      * they're probably broken
      */
     if (!FcIsValidScript(tagstring[0]) ||
diff --git a/libX11/src/FontInfo.c b/libX11/src/FontInfo.c
index a3ab65be5..97de40e0e 100644
--- a/libX11/src/FontInfo.c
+++ b/libX11/src/FontInfo.c
@@ -90,6 +90,11 @@ XFontStruct **info)	/* RETURN */
 		    Xrealloc ((char *) flist,
 			      (unsigned) (sizeof(char *) * (size+1)));
 
+		if (tmp_finfo)
+		    finfo = tmp_finfo;
+		if (tmp_flist)
+		    flist = tmp_flist;
+
 		if ((! tmp_finfo) || (! tmp_flist)) {
 		    /* free all the memory that we allocated */
 		    for (j=(i-1); (j >= 0); j--) {
@@ -97,14 +102,10 @@ XFontStruct **info)	/* RETURN */
 			if (finfo[j].properties)
 			    Xfree((char *) finfo[j].properties);
 		    }
-		    if (tmp_flist) Xfree((char *) tmp_flist);
-		    else Xfree((char *) flist);
-		    if (tmp_finfo) Xfree((char *) tmp_finfo);
-		    else Xfree((char *) finfo);
+		    Xfree((char *) flist);
+		    Xfree((char *) finfo);
 		    goto clearwire;
 		}
-		finfo = tmp_finfo;
-		flist = tmp_flist;
 	    }
 	    else {
 		if (! (finfo = (XFontStruct *)
diff --git a/mesalib/include/GL/gl.h b/mesalib/include/GL/gl.h
index 97094fc59..e9dd921fa 100644
--- a/mesalib/include/GL/gl.h
+++ b/mesalib/include/GL/gl.h
@@ -1,6 +1,5 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.6
  *
  * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
  * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
diff --git a/mesalib/src/mesa/main/getstring.c b/mesalib/src/mesa/main/getstring.c
index aa3a528fd..5280b4dd3 100644
--- a/mesalib/src/mesa/main/getstring.c
+++ b/mesalib/src/mesa/main/getstring.c
@@ -137,7 +137,7 @@ _mesa_GetString( GLenum name )
          if (ctx->API == API_OPENGLES)
             break;
 	 return shading_language_version(ctx);
-      case GL_PROGRAM_ERROR_STRING_NV:
+      case GL_PROGRAM_ERROR_STRING_ARB:
          if (ctx->API == API_OPENGL_COMPAT &&
              (ctx->Extensions.ARB_fragment_program ||
               ctx->Extensions.ARB_vertex_program)) {
diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c
index 4d2d43d7e..11db9d3f3 100644
--- a/mesalib/src/mesa/state_tracker/st_extensions.c
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -421,6 +421,10 @@ void st_init_extensions(struct st_context *st)
       { { o(EXT_texture_integer) },
         { PIPE_FORMAT_R32G32B32A32_UINT,
           PIPE_FORMAT_R32G32B32A32_SINT } },
+
+      { { o(ARB_texture_rg) },
+        { PIPE_FORMAT_R8_UNORM,
+          PIPE_FORMAT_R8G8_UNORM } },
    };
 
    /* Required: depth stencil and sampler support */
@@ -444,9 +448,6 @@ void st_init_extensions(struct st_context *st)
           PIPE_FORMAT_RGTC2_UNORM,
           PIPE_FORMAT_RGTC2_SNORM } },
 
-      { { o(ARB_texture_rg) },
-        { PIPE_FORMAT_R8G8_UNORM } },
-
       { { o(EXT_texture_compression_latc) },
         { PIPE_FORMAT_LATC1_UNORM,
           PIPE_FORMAT_LATC1_SNORM,
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 19380fa82..83dc894e2 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -3146,6 +3146,12 @@
             <_description>German (eliminate dead keys)</_description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>T3</name>
+            <_description>German (T3)</_description>
+          </configItem>
+        </variant>
         <variant>
           <configItem>
             <name>ro</name>
diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de
index 6872f46ba..20689af30 100644
--- a/xorg-server/xkeyboard-config/symbols/de
+++ b/xorg-server/xkeyboard-config/symbols/de
@@ -104,6 +104,84 @@ xkb_symbols "deadacute" {
     key <BKSL>	{ [numbersign, apostrophe,   dead_grave,   dead_grave ]	};
 };
 
+
+partial alphanumeric_keys
+xkb_symbols "T3" {
+    include "latin(type4)"
+
+    name[Group1]="German (T3)";
+
+    key.type[Group1] = "EIGHT_LEVEL";
+    key <TLDE> { [ dead_circumflex,          degree,        multiply,        NoSymbol,           U204A,            hyphen,             bar,        NoSymbol ] };
+    key <AE01> { [               1,          exclam, rightsinglequotemark,   NoSymbol,     onesuperior,        exclamdown,           U02B9,        NoSymbol ] };
+    key <AE02> { [               2,        quotedbl,     twosuperior,        NoSymbol,     twosuperior,          currency,           U02BA,        NoSymbol ] };
+    key <AE03> { [               3,         section,   threesuperior,        NoSymbol,   threesuperior,          sterling,           U02BF,        NoSymbol ] };
+    key <AE04> { [               4,          dollar,          emdash,        NoSymbol,      onequarter,            0x20AC,           U02BE,        NoSymbol ] };
+    key <AE05> { [               5,         percent,      exclamdown,        NoSymbol,         onehalf,           uparrow,           U02C1,        NoSymbol ] };
+    key <AE06> { [               6,       ampersand,    questiondown,        NoSymbol,   threequarters,         downarrow,           U02C0,        NoSymbol ] };
+    key <AE07> { [               7,           slash,       braceleft,        NoSymbol,       oneeighth,         leftarrow,       braceleft,        NoSymbol ] };
+    key <AE08> { [               8,       parenleft,     bracketleft,        NoSymbol,    threeeighths,        rightarrow,      braceright,        NoSymbol ] };
+    key <AE09> { [               9,      parenright,    bracketright,        NoSymbol,     fiveeighths,         plusminus,     bracketleft,        NoSymbol ] };
+    key <AE10> { [               0,           equal,      braceright,        NoSymbol,    seveneighths,         trademark,    bracketright,        NoSymbol ] };
+    key <AE11> { [          ssharp,        question,       backslash,        NoSymbol,       backslash,      questiondown,           U02BB,        NoSymbol ] };
+    key <AE12> { [      dead_acute,      dead_grave,   dead_abovedot,        NoSymbol,    dead_cedilla,       dead_ogonek,         notsign,        NoSymbol ] };
+
+    key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC";
+    key <AD01> { [               q,               Q,              at,        NoSymbol,           U0242,           U0241,           U030D,        NoSymbol ] };
+    key <AD02> { [               w,               W,      dead_caron,        NoSymbol,           U02B7,           U2126,   dead_abovedot,        NoSymbol ] };
+    key <AD03> { [               e,               E,        EuroSign,        NoSymbol,              oe,              OE,      dead_breve,        NoSymbol ] };
+    key <AD04> { [               r,               R,  dead_diaeresis,        NoSymbol,       paragraph,      registered, dead_circumflex,        NoSymbol ] };
+    key <AD05> { [               t,               T,     dead_macron,        NoSymbol,           UA78C,           UA78B,  dead_diaeresis,        NoSymbol ] };
+    key <AD06> { [               z,               Z, dead_doubleacute,       NoSymbol,           U027C,             yen, dead_invertedbreve,     NoSymbol ] };
+    key <AD07> { [               u,               U,      dead_breve,        NoSymbol,           U0223,           U0222,      dead_caron,        NoSymbol ] };
+    key <AD08> { [               i,               I,      dead_tilde,        NoSymbol,        idotless,           U214D, dead_abovecomma,        NoSymbol ] };
+    key <AD09> { [               o,               O,  dead_abovering,        NoSymbol,          oslash,          Oslash,       dead_horn,        NoSymbol ] };
+    key <AD10> { [               p,               P,       dead_hook,        NoSymbol,           thorn,           THORN,       dead_hook,        NoSymbol ] };
+    key <AD11> { [      udiaeresis,      Udiaeresis,       dead_horn,        NoSymbol,           U017F,  dead_abovering,      dead_grave,        NoSymbol ] };
+    key.type[Group1] = "EIGHT_LEVEL";
+    key <AD12> { [            plus,        asterisk,      asciitilde,        NoSymbol,      dead_tilde,     dead_macron,              at,        NoSymbol ] };
+
+    key.type[Group1] = "ONE_LEVEL";
+    key <CAPS>  { [ Caps_Lock	]	};
+    key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC";
+    key <AC01> { [               a,               A,   lessthanequal,        NoSymbol,              ae,              AE,           U0329,        NoSymbol ] };
+    key <AC02> { [               s,               S, greaterthanequal,       NoSymbol,          ssharp,         section,   dead_belowdot,        NoSymbol ] };
+    key <AC03> { [               d,               D,           U2300,        NoSymbol,             eth,             ETH, dead_belowbreve,        NoSymbol ] };
+    key <AC04> { [               f,               F,         minutes,        NoSymbol,           U0294,     ordfeminine, dead_belowcircumflex,   NoSymbol ] };
+    key <AC05> { [               g,               G,         seconds,        NoSymbol,             eng,             ENG, dead_belowmacron,       NoSymbol ] };
+    key <AC06> { [               h,               H,           U1E9E,        NoSymbol,           U0272,           U019D,           U0332,        NoSymbol ] };
+    key <AC07> { [               j,               J,    dead_cedilla,        NoSymbol,           U0133,           U0132,  dead_belowring,        NoSymbol ] };
+    key <AC08> { [               k,               K, dead_belowcomma,        NoSymbol,             kra, dead_belowcomma,           U0335,        NoSymbol ] };
+    key <AC09> { [               l,               L,     dead_ogonek,        NoSymbol,         lstroke,         Lstroke,           U0338,        NoSymbol ] };
+    key <AC10> { [      odiaeresis,      Odiaeresis,   dead_belowdot,        NoSymbol,      dead_acute, dead_doubleacute,         degree,        NoSymbol ] };
+    key <AC11> { [      adiaeresis,      Adiaeresis,     dead_stroke,        NoSymbol,           U019B,           U1E9E,         minutes,        NoSymbol ] };
+    key.type[Group1] = "EIGHT_LEVEL";
+    key <BKSL> { [      numbersign,      apostrophe,      registered,        NoSymbol,           schwa,           SCHWA,         seconds,        NoSymbol ] };
+
+    key <LSGT> { [            less,         greater,             bar,        NoSymbol,           U0149,       brokenbar,           U266A,        NoSymbol ] };
+    key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC";
+    key <AB01> { [               y,               Y,           U203A,        NoSymbol,           U0292,           U01B7,   guillemotleft,        NoSymbol ] };
+    key <AB02> { [               x,               X,  guillemotright,        NoSymbol, doublelowquotemark, singlelowquotemark, guillemotright,   NoSymbol ] };
+    key <AB03> { [               c,               C,       copyright,        NoSymbol,            cent,       copyright,  Greek_horizbar,        NoSymbol ] };
+    key <AB04> { [               v,               V,   guillemotleft,        NoSymbol, leftdoublequotemark, leftsinglequotemark,   U2039,        NoSymbol ] };
+    key <AB05> { [               b,               B,           U2039,        NoSymbol, rightdoublequotemark, rightsinglequotemark, U203A,        NoSymbol ] };
+    key <AB06> { [               n,               N,          endash,        NoSymbol,           U019E,           U0220,          endash,        NoSymbol ] };
+    key <AB07> { [               m,               M,        Greek_mu,        NoSymbol,              mu,       masculine,          emdash,        NoSymbol ] };
+    key.type[Group1] = "EIGHT_LEVEL";
+    key <AB08> { [           comma,       semicolon,           U02BB,        NoSymbol,        ellipsis,        multiply,          dollar,        NoSymbol ] };
+    key <AB09> { [          period,           colon,           U200C,        NoSymbol,  periodcentered,        division,      numbersign,        NoSymbol ] };
+    key <AB10> { [           minus,      underscore,          hyphen,        NoSymbol,           U0140,           U013F,           U2011,        NoSymbol ] };
+
+    key <SPCE> { [           space,           space,    nobreakspace,        NoSymbol,           U202F,           U200C,    nobreakspace,        NoSymbol ] };
+
+    include "kpdl(comma)"
+
+    // We do not support the correct level selection mechanism yet, this is
+    //just for testing:
+    include "level5(rctrl_switch)"
+    include "level3(ralt_switch)"
+ };
+
 partial alphanumeric_keys
 xkb_symbols "ro" {
     // add romanian-specific letters to the basic German layout.
-- 
cgit v1.2.3