From 4ea2991a40d547d3c7800f862206741625a84417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Thu, 24 Sep 2020 12:42:54 +0100
Subject: Retire dummy cairo-version.h header to fix meson subproject build

It was originally added to make bisecting easier,
but has outlived its usefuleness now.

Going forward we'll have just a single cairo-version.h
header file, the one with the real version numbers.

This is needed to fix the case where cairo is being
built as a Meson subproject, but also simplifies
things in general.

Fixes #421
---
 boilerplate/cairo-boilerplate-test-surfaces.c | 2 --
 boilerplate/cairo-boilerplate.c               | 6 ------
 boilerplate/check-link.c                      | 7 -------
 3 files changed, 15 deletions(-)

(limited to 'boilerplate')

diff --git a/boilerplate/cairo-boilerplate-test-surfaces.c b/boilerplate/cairo-boilerplate-test-surfaces.c
index 293b77fff..64e669783 100644
--- a/boilerplate/cairo-boilerplate-test-surfaces.c
+++ b/boilerplate/cairo-boilerplate-test-surfaces.c
@@ -24,8 +24,6 @@
  * Author: Carl D. Worth <cworth@cworth.org>
  */
 
-#include "../cairo-version.h"
-
 #include "cairo-boilerplate-private.h"
 
 #include <cairo-types-private.h>
diff --git a/boilerplate/cairo-boilerplate.c b/boilerplate/cairo-boilerplate.c
index 4804deaff..383606177 100644
--- a/boilerplate/cairo-boilerplate.c
+++ b/boilerplate/cairo-boilerplate.c
@@ -24,8 +24,6 @@
  * Author: Carl D. Worth <cworth@cworth.org>
  */
 
-#define CAIRO_VERSION_H 1
-
 #include "cairo-boilerplate-private.h"
 #include "cairo-boilerplate-scaled-font.h"
 
@@ -38,10 +36,6 @@
 #include <cairo-script.h>
 #endif
 
-/* get the "real" version info instead of dummy cairo-version.h */
-#undef CAIRO_VERSION_H
-#include "../cairo-version.h"
-
 #include <stddef.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/boilerplate/check-link.c b/boilerplate/check-link.c
index f16444878..688339a95 100644
--- a/boilerplate/check-link.c
+++ b/boilerplate/check-link.c
@@ -1,11 +1,4 @@
-#define CAIRO_VERSION_H 1
-
 #include <cairo-boilerplate.h>
-
-/* get the "real" version info instead of dummy cairo-version.h */
-#undef CAIRO_VERSION_H
-#include "../cairo-version.h"
-
 #include <stdio.h>
 
 int
-- 
cgit v1.2.1