Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/glsl/link_functions.cpp
	mesalib/src/glsl/linker.cpp
	mesalib/src/glsl/main.cpp
	mesalib/src/mesa/program/ir_to_mesa.cpp
	xorg-server/composite/compalloc.c
	xorg-server/configure.ac
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/hw/xquartz/bundle/Makefile.am
	xorg-server/hw/xquartz/xpr/xprFrame.c
	xorg-server/include/windowstr.h

3 files changed, 16 insertions, 4 deletions

diff --git a/xorg-server/hw/xquartz/X11Application.m b/xorg-server/hw/xquartz/X11Application.m
index 38c17665b..1dec6c03a 100644
--- a/xorg-server/hw/xquartz/X11Application.m
+++ b/xorg-server/hw/xquartz/X11Application.m
@@ -1014,7 +1014,7 @@ void X11ApplicationMain (int argc, char **argv, char **envp) {
 

     if (app_prefs_domain_cfstr == NULL) {

         ErrorF("X11ApplicationMain: Unable to determine bundle identifier.  Your installation of XQuartz may be broken.\n");

-        app_prefs_domain_cfstr = @BUNDLE_ID_PREFIX".X11";

+        app_prefs_domain_cfstr = CFSTR(BUNDLE_ID_PREFIX".X11");

     }

 

     [NSApp read_defaults];

diff --git a/xorg-server/hw/xquartz/bundle/Makefile.am b/xorg-server/hw/xquartz/bundle/Makefile.am
index a455b147d..2f86cdc95 100644
--- a/xorg-server/hw/xquartz/bundle/Makefile.am
+++ b/xorg-server/hw/xquartz/bundle/Makefile.am
@@ -40,6 +40,9 @@ EXTRA_DIST = \
 	Resources/Dutch.lproj/InfoPlist.strings \

 	Resources/Dutch.lproj/Localizable.strings \

 	Resources/Dutch.lproj/main.nib/keyedobjects.nib \

+	Resources/el.lproj/InfoPlist.strings \

+	Resources/el.lproj/Localizable.strings \

+	Resources/el.lproj/main.nib/keyedobjects.nib \

 	Resources/English.lproj/InfoPlist.strings \

 	Resources/English.lproj/Localizable.strings \

 	Resources/English.lproj/main.nib/designable.nib \

@@ -53,6 +56,9 @@ EXTRA_DIST = \
 	Resources/German.lproj/InfoPlist.strings \

 	Resources/German.lproj/Localizable.strings \

 	Resources/German.lproj/main.nib/keyedobjects.nib \

+	Resources/he.lproj/InfoPlist.strings \

+	Resources/he.lproj/Localizable.strings \

+	Resources/he.lproj/main.nib/keyedobjects.nib \

 	Resources/Italian.lproj/InfoPlist.strings \

 	Resources/Italian.lproj/Localizable.strings \

 	Resources/Italian.lproj/main.nib/keyedobjects.nib \

@@ -77,6 +83,9 @@ EXTRA_DIST = \
 	Resources/ru.lproj/InfoPlist.strings \

 	Resources/ru.lproj/Localizable.strings \

 	Resources/ru.lproj/main.nib/keyedobjects.nib \

+	Resources/sk.lproj/InfoPlist.strings \

+	Resources/sk.lproj/Localizable.strings \

+	Resources/sk.lproj/main.nib/keyedobjects.nib \

 	Resources/Spanish.lproj/InfoPlist.strings \

 	Resources/Spanish.lproj/Localizable.strings \

 	Resources/Spanish.lproj/main.nib/keyedobjects.nib \

diff --git a/xorg-server/hw/xquartz/xpr/xprFrame.c b/xorg-server/hw/xquartz/xpr/xprFrame.c
index 1d90d8a3d..4214eff33 100644
--- a/xorg-server/hw/xquartz/xpr/xprFrame.c
+++ b/xorg-server/hw/xquartz/xpr/xprFrame.c
@@ -223,7 +223,7 @@ xprDestroyFrame(RootlessFrameID wid)
 

     err = xp_destroy_window(x_cvt_vptr_to_uint(wid));

     if (err != Success)

-        FatalError("Could not destroy window %i.", (int)x_cvt_vptr_to_uint(wid));

+        FatalError("Could not destroy window %d (%d).", (int)x_cvt_vptr_to_uint(wid), (int)err);

 }

 

 

@@ -364,7 +364,7 @@ xprStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow)
 

     err = xp_lock_window(x_cvt_vptr_to_uint(wid), NULL, NULL, data, rowbytes, NULL);

     if (err != Success)

-        FatalError("Could not lock window %i for drawing.", (int)x_cvt_vptr_to_uint(wid));

+        FatalError("Could not lock window %d for drawing (%d).", (int)x_cvt_vptr_to_uint(wid), (int)err);

 

     *pixelData = data[0];

     *bytesPerRow = rowbytes[0];

@@ -380,8 +380,11 @@ xprStopDrawing(RootlessFrameID wid, Bool flush)
     xp_error err;

 

     err = xp_unlock_window(x_cvt_vptr_to_uint(wid), flush);

+    /* This should be a FatalError, but we started tripping over it.  Make it a

+     * FatalError after http://xquartz.macosforge.org/trac/ticket/482 is fixed.

+     */

     if(err != Success)

-        FatalError("Could not unlock window %i after drawing.", (int)x_cvt_vptr_to_uint(wid));

+        ErrorF("Could not unlock window %d after drawing (%d).", (int)x_cvt_vptr_to_uint(wid), (int)err);

 }