Attachment 23446 Details for Bug 20427 – Proposed patch

[patch] Proposed patch

0001-Removed-non-CAIROMM_-prefixed-defines-from-cairommco.patch (text/plain), 4.66 KB, created by Armin Burgmeier on 2009-03-02 07:50:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Armin Burgmeier

Created: 2009-03-02 07:50:51 UTC

Size: 4.66 KB

patch

obsolete

>From 2309a41c4ce3236c8b1546fdae6d4bd932aa911c Mon Sep 17 00:00:00 2001
>From: Armin Burgmeier <armin@arbur.net>
>Date: Mon, 2 Mar 2009 16:33:15 +0100
>Subject: [PATCH] Removed non-CAIROMM_-prefixed defines from cairommconfig.h
>
>2009-03-02  Armin Burgmeier  <armin@openismus.com>
>
>	* configure.in: Added config.h to AC_CONFIG_HEADER.
>
>	* cairomm/cairommconfig.h.in: Added, containing only the #defines
>	prefixed with CAIROMM_.
>
>	* cairomm/context.cc: Use <config.h> instead of <cairommconfig.h>, so
>	that HAVE_MATH_H is available.
>
>	* cairomm/context_surface_quartz.cc:
>	* cairomm/context_surface_win32.cc:
>	* cairomm/context_surface_xlib.cc: Removed the <cairommconfig.h>
>	include, as it is not required.
>---
> .gitignore                        |    4 +++-
> ChangeLog                         |   15 +++++++++++++++
> cairomm/cairommconfig.h.in        |   13 +++++++++++++
> cairomm/context.cc                |    3 ++-
> cairomm/context_surface_quartz.cc |    1 -
> cairomm/context_surface_win32.cc  |    1 -
> cairomm/context_surface_xlib.cc   |    1 -
> configure.in                      |    2 +-
> 8 files changed, 34 insertions(+), 6 deletions(-)
> create mode 100644 cairomm/cairommconfig.h.in
>
>diff --git a/.gitignore b/.gitignore
>index bf32af4..9373e0d 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -18,6 +18,8 @@ data/cairomm-quartz-font-1.0.pc
> data/cairomm-quartz-image-1.0.pc
> .deps
> .libs
>+config.h
>+config.h.in
> config.guess
> config.log
> config.status
>@@ -60,7 +62,7 @@ tests/test-font-options
> tests/test-matrix
> tests/test-user-font
> 
>-cairomm/cairommconfig.h*
>+cairomm/cairommconfig.h
> cairomm/stamp-*
> m4/libtool.m4
> m4/lt*.m4
>diff --git a/ChangeLog b/ChangeLog
>index e2dca10..bd80407 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,18 @@
>+2009-03-02  Armin Burgmeier  <armin@openismus.com>
>+
>+	* configure.in: Added config.h to AC_CONFIG_HEADER.
>+
>+	* cairomm/cairommconfig.h.in: Added, containing only the #defines
>+	prefixed with CAIROMM_.
>+
>+	* cairomm/context.cc: Use <config.h> instead of <cairommconfig.h>, so
>+	that HAVE_MATH_H is available.
>+
>+	* cairomm/context_surface_quartz.cc:
>+	* cairomm/context_surface_win32.cc:
>+	* cairomm/context_surface_xlib.cc: Removed the <cairommconfig.h>
>+	include, as it is not required.
>+
> 2009-01-26  Jonathon Jongsma  <jonathon@quotidian.org>
> 
> 	* NEWS:
>diff --git a/cairomm/cairommconfig.h.in b/cairomm/cairommconfig.h.in
>new file mode 100644
>index 0000000..73808c8
>--- /dev/null
>+++ b/cairomm/cairommconfig.h.in
>@@ -0,0 +1,13 @@
>+
>+/* Defined when the --enable-api-exceptions configure argument was given */
>+#undef CAIROMM_EXCEPTIONS_ENABLED
>+
>+/* cairomm major version */
>+#undef CAIROMM_MAJOR_VERSION
>+
>+/* cairomm micro version */
>+#undef CAIROMM_MICRO_VERSION
>+
>+/* cairomm minor version */
>+#undef CAIROMM_MINOR_VERSION
>+
>diff --git a/cairomm/context.cc b/cairomm/context.cc
>index 8db25eb..6f4a477 100644
>--- a/cairomm/context.cc
>+++ b/cairomm/context.cc
>@@ -16,7 +16,8 @@
>  * 02110-1301, USA.
>  */
> 
>-#include <cairomm/cairommconfig.h>
>+#include <config.h> // For HAVE_MATH_H
>+
> #include <cairomm/context.h>
> #include <cairomm/context_private.h>
> #include <cairomm/private.h>
>diff --git a/cairomm/context_surface_quartz.cc b/cairomm/context_surface_quartz.cc
>index 540dca3..b64e730 100644
>--- a/cairomm/context_surface_quartz.cc
>+++ b/cairomm/context_surface_quartz.cc
>@@ -16,7 +16,6 @@
>  * 02110-1301, USA.
>  */
> 
>-#include <cairomm/cairommconfig.h>
> #include <cairomm/context_private.h>
> #include <cairomm/quartz_surface.h>
> 
>diff --git a/cairomm/context_surface_win32.cc b/cairomm/context_surface_win32.cc
>index 61837bd..4c1afc8 100644
>--- a/cairomm/context_surface_win32.cc
>+++ b/cairomm/context_surface_win32.cc
>@@ -16,7 +16,6 @@
>  * 02110-1301, USA.
>  */
> 
>-#include <cairomm/cairommconfig.h>
> #include <cairomm/context_private.h>
> #include <cairomm/win32_surface.h>
> 
>diff --git a/cairomm/context_surface_xlib.cc b/cairomm/context_surface_xlib.cc
>index dfb0872..f544e74 100644
>--- a/cairomm/context_surface_xlib.cc
>+++ b/cairomm/context_surface_xlib.cc
>@@ -16,7 +16,6 @@
>  * 02110-1301, USA.
>  */
> 
>-#include <cairomm/cairommconfig.h>
> #include <cairomm/context_private.h>
> #include <cairomm/xlib_surface.h>
> 
>diff --git a/configure.in b/configure.in
>index c558a9a..075bc9d 100644
>--- a/configure.in
>+++ b/configure.in
>@@ -33,7 +33,7 @@ AM_INIT_AUTOMAKE(cairomm, $GENERIC_VERSION)
> AC_DEFINE_UNQUOTED([CAIROMM_MAJOR_VERSION], $GENERIC_MAJOR_VERSION, [cairomm major version])
> AC_DEFINE_UNQUOTED([CAIROMM_MINOR_VERSION], $GENERIC_MINOR_VERSION, [cairomm minor version])
> AC_DEFINE_UNQUOTED([CAIROMM_MICRO_VERSION], $GENERIC_MICRO_VERSION, [cairomm micro version])
>-AC_CONFIG_HEADER(cairomm/cairommconfig.h)
>+AC_CONFIG_HEADER(config.h cairomm/cairommconfig.h)
> 
> AC_PROG_CXX
> AC_PROG_CXXCPP
>-- 
>1.6.1.3
>

Actions: View | Splinter Review

Attachments on bug 20427: 23446

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.