diff options
Diffstat (limited to 'meta/packages/gtk+/gtk+-2.8.20/no-xwc.patch')
-rw-r--r-- | meta/packages/gtk+/gtk+-2.8.20/no-xwc.patch | 179 |
1 files changed, 0 insertions, 179 deletions
diff --git a/meta/packages/gtk+/gtk+-2.8.20/no-xwc.patch b/meta/packages/gtk+/gtk+-2.8.20/no-xwc.patch deleted file mode 100644 index 318b150359..0000000000 --- a/meta/packages/gtk+/gtk+-2.8.20/no-xwc.patch +++ /dev/null | |||
@@ -1,179 +0,0 @@ | |||
1 | Index: configure.in | ||
2 | =================================================================== | ||
3 | RCS file: /cvs/gnome/gtk+/configure.in,v | ||
4 | retrieving revision 1.469.2.22 | ||
5 | diff -u -r1.469.2.22 configure.in | ||
6 | --- gtk/configure.in 16 Mar 2006 16:39:45 -0000 1.469.2.22 | ||
7 | +++ gtk/configure.in 20 Mar 2006 12:07:11 -0000 | ||
8 | @@ -1115,6 +1115,8 @@ | ||
9 | |||
10 | AC_CHECK_FUNCS(XConvertCase XInternAtoms) | ||
11 | |||
12 | + AC_CHECK_FUNCS(XmbDrawString) | ||
13 | + | ||
14 | # Generic X11R6 check needed for XIM support; we could | ||
15 | # probably use this to replace the above, but we'll | ||
16 | # leave the separate checks for XConvertCase and XInternAtoms | ||
17 | Index: gdk/x11/gdkdrawable-x11.c | ||
18 | =================================================================== | ||
19 | RCS file: /cvs/gnome/gtk+/gdk/x11/gdkdrawable-x11.c,v | ||
20 | retrieving revision 1.58 | ||
21 | diff -u -r1.58 gdkdrawable-x11.c | ||
22 | --- gtk/gdk/x11/gdkdrawable-x11.c 15 Aug 2005 19:04:54 -0000 1.58 | ||
23 | +++ gtk/gdk/x11/gdkdrawable-x11.c 20 Mar 2006 12:07:12 -0000 | ||
24 | @@ -579,12 +579,14 @@ | ||
25 | GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2); | ||
26 | } | ||
27 | } | ||
28 | +#ifdef HAVE_XMBDRAWSTRING | ||
29 | else if (font->type == GDK_FONT_FONTSET) | ||
30 | { | ||
31 | XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font); | ||
32 | XmbDrawString (xdisplay, impl->xid, | ||
33 | fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length); | ||
34 | } | ||
35 | +#endif | ||
36 | else | ||
37 | g_error("undefined font type\n"); | ||
38 | } | ||
39 | @@ -616,6 +618,7 @@ | ||
40 | GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length); | ||
41 | g_free (text_8bit); | ||
42 | } | ||
43 | +#ifdef HAVE_XMBDRAWSTRING | ||
44 | else if (font->type == GDK_FONT_FONTSET) | ||
45 | { | ||
46 | if (sizeof(GdkWChar) == sizeof(wchar_t)) | ||
47 | @@ -636,6 +639,7 @@ | ||
48 | g_free (text_wchar); | ||
49 | } | ||
50 | } | ||
51 | +#endif | ||
52 | else | ||
53 | g_error("undefined font type\n"); | ||
54 | } | ||
55 | Index: gdk/x11/gdkfont-x11.c | ||
56 | =================================================================== | ||
57 | RCS file: /cvs/gnome/gtk+/gdk/x11/gdkfont-x11.c,v | ||
58 | retrieving revision 1.48.2.1 | ||
59 | diff -u -r1.48.2.1 gdkfont-x11.c | ||
60 | --- gtk/gdk/x11/gdkfont-x11.c 20 Jan 2006 04:39:43 -0000 1.48.2.1 | ||
61 | +++ gtk/gdk/x11/gdkfont-x11.c 20 Mar 2006 12:07:12 -0000 | ||
62 | @@ -527,10 +527,12 @@ | ||
63 | width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2); | ||
64 | } | ||
65 | break; | ||
66 | +#ifdef HAVE_XMBDRAWSTRING | ||
67 | case GDK_FONT_FONTSET: | ||
68 | fontset = (XFontSet) private->xfont; | ||
69 | width = XmbTextEscapement (fontset, text, text_length); | ||
70 | break; | ||
71 | +#endif | ||
72 | default: | ||
73 | width = 0; | ||
74 | } | ||
75 | @@ -580,6 +582,7 @@ | ||
76 | width = 0; | ||
77 | } | ||
78 | break; | ||
79 | +#ifdef HAVE_XMBDRAWSTRING | ||
80 | case GDK_FONT_FONTSET: | ||
81 | if (sizeof(GdkWChar) == sizeof(wchar_t)) | ||
82 | { | ||
83 | @@ -597,6 +600,7 @@ | ||
84 | g_free (text_wchar); | ||
85 | } | ||
86 | break; | ||
87 | +#endif | ||
88 | default: | ||
89 | width = 0; | ||
90 | } | ||
91 | @@ -669,6 +673,7 @@ | ||
92 | if (descent) | ||
93 | *descent = overall.descent; | ||
94 | break; | ||
95 | +#ifdef HAVE_XMBDRAWSTRING | ||
96 | case GDK_FONT_FONTSET: | ||
97 | fontset = (XFontSet) private->xfont; | ||
98 | XmbTextExtents (fontset, text, text_length, &ink, &logical); | ||
99 | @@ -683,6 +688,7 @@ | ||
100 | if (descent) | ||
101 | *descent = ink.y + ink.height; | ||
102 | break; | ||
103 | +#endif | ||
104 | } | ||
105 | |||
106 | } | ||
107 | @@ -755,6 +761,7 @@ | ||
108 | *descent = overall.descent; | ||
109 | break; | ||
110 | } | ||
111 | +#ifdef HAVE_XMBDRAWSTRING | ||
112 | case GDK_FONT_FONTSET: | ||
113 | fontset = (XFontSet) private->xfont; | ||
114 | |||
115 | @@ -782,6 +789,7 @@ | ||
116 | if (descent) | ||
117 | *descent = ink.y + ink.height; | ||
118 | break; | ||
119 | +#endif | ||
120 | } | ||
121 | |||
122 | } | ||
123 | Index: gdk/x11/gdkim-x11.c | ||
124 | =================================================================== | ||
125 | RCS file: /cvs/gnome/gtk+/gdk/x11/gdkim-x11.c,v | ||
126 | retrieving revision 1.38 | ||
127 | diff -u -r1.38 gdkim-x11.c | ||
128 | --- gtk/gdk/x11/gdkim-x11.c 16 Mar 2005 03:17:27 -0000 1.38 | ||
129 | +++ gtk/gdk/x11/gdkim-x11.c 20 Mar 2006 12:07:12 -0000 | ||
130 | @@ -48,6 +48,7 @@ | ||
131 | void | ||
132 | _gdk_x11_initialize_locale (void) | ||
133 | { | ||
134 | +#ifdef HAVE_XMBDRAWSTRING | ||
135 | wchar_t result; | ||
136 | gchar *current_locale; | ||
137 | static char *last_locale = NULL; | ||
138 | @@ -93,7 +94,8 @@ | ||
139 | GDK_NOTE (XIM, | ||
140 | g_message ("%s multi-byte string functions.", | ||
141 | gdk_use_mb ? "Using" : "Not using")); | ||
142 | - | ||
143 | +#endif | ||
144 | + | ||
145 | return; | ||
146 | } | ||
147 | |||
148 | @@ -136,6 +138,7 @@ | ||
149 | { | ||
150 | gchar *mbstr; | ||
151 | |||
152 | +#ifdef HAVE_XMBDRAWSTRING | ||
153 | if (gdk_use_mb) | ||
154 | { | ||
155 | GdkDisplay *display = find_a_display (); | ||
156 | @@ -178,6 +181,7 @@ | ||
157 | XFree (tpr.value); | ||
158 | } | ||
159 | else | ||
160 | +#endif | ||
161 | { | ||
162 | gint length = 0; | ||
163 | gint i; | ||
164 | @@ -210,6 +214,7 @@ | ||
165 | gint | ||
166 | gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max) | ||
167 | { | ||
168 | +#ifdef HAVE_XMBDRAWSTRING | ||
169 | if (gdk_use_mb) | ||
170 | { | ||
171 | GdkDisplay *display = find_a_display (); | ||
172 | @@ -242,6 +247,7 @@ | ||
173 | return len_cpy; | ||
174 | } | ||
175 | else | ||
176 | +#endif | ||
177 | { | ||
178 | gint i; | ||
179 | |||