File U_Fix-compilation-with-newer-Xorg-versions.patch of Package xf86-video-qxl
From a184774ad161031cceed264d62d48ebd019ac800 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Mon, 3 Aug 2015 20:12:05 +0200
Subject: [PATCH] Fix compilation with newer Xorg versions
Xorg 1.18 stopped exporting some xfont related symbols in its
headers/shared libraries, which causes QXL to fail to build:
uxa-damage.c:947:5: error: implicit declaration of function 'QueryGlyphExtents' [-Werror=implicit-function-declaration]
QueryGlyphExtents(font, charinfo, n, &extents);
The missing definition can be found in xfont, so this commit addes the
needed configure.ac checks and includes.
Note that dixfontstr.h must be included before the xfont headers or this
will cause compile-time warnings on older Xorg versions (eg 1.17)
---
configure.ac | 2 +-
src/uxa/uxa-damage.c | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
Index: xf86-video-qxl-0.1.4/configure.ac
===================================================================
--- xf86-video-qxl-0.1.4.orig/configure.ac
+++ xf86-video-qxl-0.1.4/configure.ac
@@ -61,7 +61,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
# Obtain compiler/linker options for the driver dependencies
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES)
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto xfont $REQUIRED_MODULES)
save_CFLAGS="$CFLAGS"
Index: xf86-video-qxl-0.1.4/src/uxa/uxa-damage.c
===================================================================
--- xf86-video-qxl-0.1.4.orig/src/uxa/uxa-damage.c
+++ xf86-video-qxl-0.1.4/src/uxa/uxa-damage.c
@@ -30,6 +30,9 @@
#include <X11/X.h>
#include "scrnintstr.h"
#include "windowstr.h"
+#include <X11/fonts/font.h>
+#include <X11/fonts/fontstruct.h>
+#include <X11/fonts/fontutil.h>
#include "dixfontstr.h"
#include "gcstruct.h"
#include "picturestr.h"