Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/colord-gtk/files: colord-gtk-0.1.22-includes-1.patch colord-gtk-0.1.22-includes-2.patch
Date: Sun, 26 Aug 2012 02:08:33
Message-Id: 20120826020812.9A11E20759@flycatcher.gentoo.org
1 tetromino 12/08/26 02:08:12
2
3 Added: colord-gtk-0.1.22-includes-1.patch
4 colord-gtk-0.1.22-includes-2.patch
5 Log:
6 Fix include guards to prevent gnome-color-manager-3.6 build failure; thanks to Frédéric Romagné for the report.
7
8 (Portage version: 2.2.0_alpha122/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 x11-libs/colord-gtk/files/colord-gtk-0.1.22-includes-1.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/colord-gtk/files/colord-gtk-0.1.22-includes-1.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/colord-gtk/files/colord-gtk-0.1.22-includes-1.patch?rev=1.1&content-type=text/plain
15
16 Index: colord-gtk-0.1.22-includes-1.patch
17 ===================================================================
18 From 71510fc785e440c068cc42dbd294dba5d74eeaff Mon Sep 17 00:00:00 2001
19 From: Richard Hughes <richard@×××××××.com>
20 Date: Wed, 27 Jun 2012 09:00:15 +0100
21 Subject: [PATCH 1/2] Do not reuse __COLORD_H_INSIDE__ as this causes #include
22 insanity
23
24 ---
25 libcolord-gtk/cd-version.h.in | 2 +-
26 libcolord-gtk/cd-window-sync.h | 2 +-
27 libcolord-gtk/cd-window.h | 2 +-
28 libcolord-gtk/colord-gtk.h | 9 +++------
29 4 files changed, 6 insertions(+), 9 deletions(-)
30
31 diff --git a/libcolord-gtk/cd-version.h.in b/libcolord-gtk/cd-version.h.in
32 index 5ad7569..555556a 100644
33 --- a/libcolord-gtk/cd-version.h.in
34 +++ b/libcolord-gtk/cd-version.h.in
35 @@ -29,7 +29,7 @@
36 * See also: #CdClient, #CdDevice
37 */
38
39 -#if !defined (__COLORD_H_INSIDE__) && !defined (CD_COMPILATION)
40 +#if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION)
41 #error "Only <colord.h> can be included directly."
42 #endif
43
44 diff --git a/libcolord-gtk/cd-window-sync.h b/libcolord-gtk/cd-window-sync.h
45 index 6afe83b..47b8254 100644
46 --- a/libcolord-gtk/cd-window-sync.h
47 +++ b/libcolord-gtk/cd-window-sync.h
48 @@ -19,7 +19,7 @@
49 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
50 */
51
52 -#if !defined (__COLORD_H_INSIDE__) && !defined (CD_COMPILATION)
53 +#if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION)
54 #error "Only <colord.h> can be included directly."
55 #endif
56
57 diff --git a/libcolord-gtk/cd-window.h b/libcolord-gtk/cd-window.h
58 index 3b993a8..dbdab3e 100644
59 --- a/libcolord-gtk/cd-window.h
60 +++ b/libcolord-gtk/cd-window.h
61 @@ -19,7 +19,7 @@
62 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
63 */
64
65 -#if !defined (__COLORD_H_INSIDE__) && !defined (CD_COMPILATION)
66 +#if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION)
67 #error "Only <colord-gtk.h> can be included directly."
68 #endif
69
70 diff --git a/libcolord-gtk/colord-gtk.h b/libcolord-gtk/colord-gtk.h
71 index 658ec60..4080667 100644
72 --- a/libcolord-gtk/colord-gtk.h
73 +++ b/libcolord-gtk/colord-gtk.h
74 @@ -31,20 +31,17 @@
75 #ifndef __COLORD_GTK_H__
76 #define __COLORD_GTK_H__
77
78 -#define __COLORD_H_INSIDE__
79 +#define __COLORD_GTK_H_INSIDE__
80
81 #include <gtk/gtk.h>
82 -
83 #include <colord.h>
84 -//#include <colord/cd-device.h>
85 -//#include <colord/cd-profile.h>
86 -//#include <colord/cd-color.h>
87 +
88 #include <colord-gtk/cd-sample-window.h>
89 #include <colord-gtk/cd-version.h>
90 #include <colord-gtk/cd-window.h>
91 #include <colord-gtk/cd-window-sync.h>
92
93 -#undef __COLORD_H_INSIDE__
94 +#undef __COLORD_GTK_H_INSIDE__
95
96 #endif /* __COLORD_GTK_H__ */
97
98 --
99 1.7.12
100
101
102
103
104 1.1 x11-libs/colord-gtk/files/colord-gtk-0.1.22-includes-2.patch
105
106 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/colord-gtk/files/colord-gtk-0.1.22-includes-2.patch?rev=1.1&view=markup
107 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/colord-gtk/files/colord-gtk-0.1.22-includes-2.patch?rev=1.1&content-type=text/plain
108
109 Index: colord-gtk-0.1.22-includes-2.patch
110 ===================================================================
111 From 6c18326f3dc3aeb2b80db167fab5a1001f6bbe4c Mon Sep 17 00:00:00 2001
112 From: Richard Hughes <richard@×××××××.com>
113 Date: Wed, 27 Jun 2012 09:02:17 +0100
114 Subject: [PATCH 2/2] trivial: add include guards to cd-sample-window.h
115
116 ---
117 libcolord-gtk/cd-sample-window.h | 4 ++++
118 libcolord-gtk/cd-window-sync.h | 2 +-
119 2 files changed, 5 insertions(+), 1 deletion(-)
120
121 diff --git a/libcolord-gtk/cd-sample-window.h b/libcolord-gtk/cd-sample-window.h
122 index c994409..d95dfbf 100644
123 --- a/libcolord-gtk/cd-sample-window.h
124 +++ b/libcolord-gtk/cd-sample-window.h
125 @@ -19,6 +19,10 @@
126 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
127 */
128
129 +#if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION)
130 +#error "Only <colord-gtk.h> can be included directly."
131 +#endif
132 +
133 #ifndef __CD_SAMPLE_WINDOW_H
134 #define __CD_SAMPLE_WINDOW_H
135
136 diff --git a/libcolord-gtk/cd-window-sync.h b/libcolord-gtk/cd-window-sync.h
137 index 47b8254..632ab55 100644
138 --- a/libcolord-gtk/cd-window-sync.h
139 +++ b/libcolord-gtk/cd-window-sync.h
140 @@ -20,7 +20,7 @@
141 */
142
143 #if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION)
144 -#error "Only <colord.h> can be included directly."
145 +#error "Only <colord-gtk.h> can be included directly."
146 #endif
147
148 #ifndef __CD_WINDOW_SYNC_H
149 --
150 1.7.12
Report Message
Find on MARC Find on Google Groups