[Xquartz-changes] xserver: Branch 'master' - 2 commits

Jeremy Huddleston jeremyhu at freedesktop.org
Mon Sep 16 07:07:31 PDT 2013


Rebased ref, commits from common ancestor:
commit 8010d3a48bd0b224dcb0883e39c2351ad364d846
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Sun Sep 15 08:10:33 2013 -0700

    XQuartz: pbproxy: Fix build with -DDEBUG
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

diff --git a/hw/xquartz/pbproxy/x-selection.m b/hw/xquartz/pbproxy/x-selection.m
index 57ddb74..f4f4de8 100644
--- a/hw/xquartz/pbproxy/x-selection.m
+++ b/hw/xquartz/pbproxy/x-selection.m
@@ -85,8 +85,7 @@ static struct propdata null_propdata = {
 static void
 dump_prefs()
 {
-    ErrorF(fp,
-           "pbproxy preferences:\n"
+    ErrorF("pbproxy preferences:\n"
            "\tactive %u\n"
            "\tprimary_on_grab %u\n"
            "\tclipboard_to_pasteboard %u\n"
commit 39c548da0cf0522ad246630605b96751ab6d39c0
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Sun Sep 15 08:07:44 2013 -0700

    XQuartz: Fix build with moved pseudoramiX
    
    Regression from: e716baedc4d8e52a60f43ef21aba771b340d8c8b
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    Reviewed-by: Jon TURNEY <jon.turney at dronecode.org.uk>

diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index 2e894d7..2ca953c 100644
--- a/hw/xquartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
 	-DUSE_NEW_CLUT \
 	-DXFree86Server \
 	-I$(top_srcdir)/miext/rootless \
+	-I$(top_builddir)/pseudoramiX \
 	-DX11LIBDIR=\"$(libdir)\"
 
 if GLX
diff --git a/hw/xquartz/xpr/Makefile.am b/hw/xquartz/xpr/Makefile.am
index 763a7cd..c654ee5 100644
--- a/hw/xquartz/xpr/Makefile.am
+++ b/hw/xquartz/xpr/Makefile.am
@@ -3,6 +3,7 @@ noinst_LTLIBRARIES = libXquartzXpr.la
 AM_CFLAGS =  $(DIX_CFLAGS)
 AM_CPPFLAGS = \
 	-I$(srcdir) -I$(srcdir)/.. \
+	-I$(top_builddir)/pseudoramiX \
 	-I$(top_srcdir)/miext \
 	-I$(top_srcdir)/miext/rootless
 


More information about the Xquartz-changes mailing list