xorg-server: Changes to 'ubuntu'
debian/changelog | 6 ++++++
debian/patches/xmir.patch | 11 ++++-------
2 files changed, 10 insertions(+), 7 deletions(-)
New commits:
commit 489dc081ec8b76fd29d288a4b5527224b44ee1a9
Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Date: Mon Dec 15 16:45:00 2014 +0100
Fix FTBFS caused by the previous patch.
diff --git a/debian/changelog b/debian/changelog
index 908b4a9..e6615e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.16.2.901-1ubuntu3) vivid; urgency=medium
+
+ * Fix FTBFS caused by the previous patch.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 15 Dec 2014 16:11:00 +0100
+
xorg-server (2:1.16.2.901-1ubuntu2) vivid; urgency=medium
* Fix FTBFS with the bool redefinition by undef'ing it after including mir.
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 23a620a..538c58b 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -980,7 +980,7 @@
+}
--- /dev/null
+++ b/hw/xfree86/xmir/xmir-private.h
-@@ -0,0 +1,106 @@
+@@ -0,0 +1,105 @@
+/*
+ * Copyright © 2012 Canonical, Inc
+ *
@@ -1016,7 +1016,6 @@
+#ifndef _XMIR_PRIVATE_H
+#define _XMIR_PRIVATE_H
+
-+#include <mir_toolkit/mir_client_library.h>
+#include "xmir.h"
+#include "xf86str.h"
+#include "list.h"
@@ -1828,7 +1827,7 @@
+}
--- /dev/null
+++ b/hw/xfree86/xmir/xmir.h
-@@ -0,0 +1,106 @@
+@@ -0,0 +1,104 @@
+/*
+ * Copyright © 2012 Canonical, Inc
+ *
@@ -1865,15 +1864,13 @@
+#define _XMIR_H
+
+#include <stdint.h>
-+#include <mir_toolkit/mir_client_library.h>
-+
-+/* Fix because the library defines one of its members as having the name bool */
-+#undef bool
+
+#include "xf86str.h"
+#include "scrnintstr.h"
+#include "window.h"
+
++#include <mir_toolkit/mir_client_library.h>
++
+typedef struct xmir_screen xmir_screen;
+typedef struct xmir_window xmir_window;
+
Reply to: