rpms/colord-gtk
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Backport a patch from git master that fixes an include issue with

Browse Source 
projects that want to use colord-gtk.h and colord.h at the same time.
This commit is contained in:
Richard Hughes 2012-06-27 10:02:40 +01:00
parent 336842d281
commit c659dcba16
2 changed files with 92 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
0001-Do-not-reuse-__COLORD_H_INSIDE__-as-this-causes-incl.patch Normal file
View File

@ -0,0 +1,83 @@
From 71510fc785e440c068cc42dbd294dba5d74eeaff Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Wed, 27 Jun 2012 09:00:15 +0100
Subject: [PATCH] Do not reuse __COLORD_H_INSIDE__ as this causes #include
insanity
---
libcolord-gtk/cd-version.h.in | 2 +-
libcolord-gtk/cd-window-sync.h | 2 +-
libcolord-gtk/cd-window.h | 2 +-
libcolord-gtk/colord-gtk.h | 9 +++------
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/libcolord-gtk/cd-version.h.in b/libcolord-gtk/cd-version.h.in
index 5ad7569..555556a 100644
--- a/libcolord-gtk/cd-version.h.in
+++ b/libcolord-gtk/cd-version.h.in
@@ -29,7 +29,7 @@
* See also: #CdClient, #CdDevice
*/
-#if !defined (__COLORD_H_INSIDE__) && !defined (CD_COMPILATION)
+#if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION)
#error "Only <colord.h> can be included directly."
#endif
diff --git a/libcolord-gtk/cd-window-sync.h b/libcolord-gtk/cd-window-sync.h
index 6afe83b..47b8254 100644
--- a/libcolord-gtk/cd-window-sync.h
+++ b/libcolord-gtk/cd-window-sync.h
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#if !defined (__COLORD_H_INSIDE__) && !defined (CD_COMPILATION)
+#if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION)
#error "Only <colord.h> can be included directly."
#endif
diff --git a/libcolord-gtk/cd-window.h b/libcolord-gtk/cd-window.h
index 3b993a8..dbdab3e 100644
--- a/libcolord-gtk/cd-window.h
+++ b/libcolord-gtk/cd-window.h
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#if !defined (__COLORD_H_INSIDE__) && !defined (CD_COMPILATION)
+#if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION)
#error "Only <colord-gtk.h> can be included directly."
#endif
diff --git a/libcolord-gtk/colord-gtk.h b/libcolord-gtk/colord-gtk.h
index 658ec60..4080667 100644
--- a/libcolord-gtk/colord-gtk.h
+++ b/libcolord-gtk/colord-gtk.h
@@ -31,20 +31,17 @@
#ifndef __COLORD_GTK_H__
#define __COLORD_GTK_H__
-#define __COLORD_H_INSIDE__
+#define __COLORD_GTK_H_INSIDE__
#include <gtk/gtk.h>
-
#include <colord.h>
-//#include <colord/cd-device.h>
-//#include <colord/cd-profile.h>
-//#include <colord/cd-color.h>
+
#include <colord-gtk/cd-sample-window.h>
#include <colord-gtk/cd-version.h>
#include <colord-gtk/cd-window.h>
#include <colord-gtk/cd-window-sync.h>
-#undef __COLORD_H_INSIDE__
+#undef __COLORD_GTK_H_INSIDE__
#endif /* __COLORD_GTK_H__ */
--
1.7.10.2

10
colord-gtk.spec
View File

@ -1,11 +1,14 @@
Summary: GTK support library for colord
Name: colord-gtk
Version: 0.1.22
Release: 1%{?dist}
Release: 2%{?dist}
License: LGPLv2+
URL: http://www.freedesktop.org/software/colord/
Source0: http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz
# Upstream already
Patch0: 0001-Do-not-reuse-__COLORD_H_INSIDE__-as-this-causes-incl.patch
BuildRequires: docbook-utils
BuildRequires: gettext
BuildRequires: glib2-devel
@ -30,6 +33,7 @@ Files for development with %{name}.
%prep
%setup -q
%patch0 -p1 -b .includes
%build
%configure \
@ -72,6 +76,10 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';'
%dir %{_datadir}/gtk-doc/html
%changelog
* Wed Jun 27 2012 Richard Hughes <richard@hughsie.com> 0.1.22-2
- Backport a patch from git master that fixes an include issue with
projects that want to use colord-gtk.h and colord.h at the same time.
* Tue Jun 26 2012 Richard Hughes <richard@hughsie.com> 0.1.22-1
- New version after Fedora package review.