xserver: Branch 'server-1.14-branch' - 3 commits

[Matt Dew]

 hw/xquartz/bundle/Info.plist.cpp |    4 ++--
 miext/damage/damage.c            |    5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 833639d2653a869c2ec8692640213e2ffa16fbb4
Merge: cf684f0 94b7f26
Author: Matt Dew <marcoz at osource.org>
Date:   Tue Nov 5 20:06:28 2013 -0700

    Merge commit '94b7f26aeda31cf55ff9b7c04f390ba6d35977e4' into server-1.14-branch

commit 94b7f26aeda31cf55ff9b7c04f390ba6d35977e4
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Thu Oct 31 08:57:56 2013 -0700

    miext/damage: Partial revert of "Only wrap into the GC ops chain if there's a listener (v3)"
    
    Fixes regression from: 4dc2a76740d921c824a4d8193f39dd373475f02a
    
    http://lists.x.org/archives/xorg-devel/2013-May/036241.html
    https://trac.macports.org/ticket/38993
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>
    (cherry picked from commit abf5d5ac12437ebe156b4dd500c2acd69eea3654)

diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index a98c20e..3dc3180 100644
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -439,10 +439,7 @@ damageValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
     drawableDamage(pDrawable);
     DAMAGE_GC_FUNC_PROLOGUE(pGC);
     (*pGC->funcs->ValidateGC) (pGC, changes, pDrawable);
-    if (pDamage)
-        pGCPriv->ops = pGC->ops; /* so it's not NULL, so FUNC_EPILOGUE does work */
-    else
-        pGCPriv->ops = NULL;
+    pGCPriv->ops = pGC->ops; /* just so it's not NULL */
     DAMAGE_GC_FUNC_EPILOGUE(pGC);
 }
 
commit 0a1628bca7b6c85054041312987b73e701aecb80
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Tue Oct 29 11:06:55 2013 -0700

    XQuartz: Bump bundle version to 2.7.5
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp
index b0106c6..905952a 100644
--- a/hw/xquartz/bundle/Info.plist.cpp
+++ b/hw/xquartz/bundle/Info.plist.cpp
@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 		<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-		<string>2.7.4</string>
+		<string>2.7.5</string>
 	<key>CFBundleVersion</key>
-		<string>2.7.4</string>
+		<string>2.7.5</string>
 	<key>CFBundleSignature</key>
 		<string>x11a</string>
 	<key>CSResourcesFileMapped</key>