summaryrefslogtreecommitdiffstats
path: root/openembedded
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2006-03-20 12:38:36 +0000
committerRoss Burton <ross@openedhand.com>2006-03-20 12:38:36 +0000
commitcabdbad38c08f22566a36487e8919455738b9966 (patch)
treee2cee1fd52388bc5a3357b94e9e8ae70cb1d60d9 /openembedded
parente65bb68b3f05a763c89b55988919f219279d75b5 (diff)
downloadpoky-cabdbad38c08f22566a36487e8919455738b9966.tar.gz
Don't assume diet-libx11 has been used, check at build time
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@299 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded')
-rw-r--r--openembedded/packages/gtk+/gtk+-2.8.9/no-xwc.patch84
1 files changed, 56 insertions, 28 deletions
diff --git a/openembedded/packages/gtk+/gtk+-2.8.9/no-xwc.patch b/openembedded/packages/gtk+/gtk+-2.8.9/no-xwc.patch
index affb4a303e..318b150359 100644
--- a/openembedded/packages/gtk+/gtk+-2.8.9/no-xwc.patch
+++ b/openembedded/packages/gtk+/gtk+-2.8.9/no-xwc.patch
@@ -1,11 +1,31 @@
1diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 1Index: configure.in
2--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00 2===================================================================
3+++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2005-01-02 15:38:06 +00:00 3RCS file: /cvs/gnome/gtk+/configure.in,v
4@@ -576,12 +576,14 @@ 4retrieving revision 1.469.2.22
5diff -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
17Index: gdk/x11/gdkdrawable-x11.c
18===================================================================
19RCS file: /cvs/gnome/gtk+/gdk/x11/gdkdrawable-x11.c,v
20retrieving revision 1.58
21diff -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 @@
5 GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2); 25 GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2);
6 } 26 }
7 } 27 }
8+#ifdef HAVE_XWC 28+#ifdef HAVE_XMBDRAWSTRING
9 else if (font->type == GDK_FONT_FONTSET) 29 else if (font->type == GDK_FONT_FONTSET)
10 { 30 {
11 XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font); 31 XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font);
@@ -16,15 +36,15 @@ diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/
16 else 36 else
17 g_error("undefined font type\n"); 37 g_error("undefined font type\n");
18 } 38 }
19@@ -613,6 +615,7 @@ 39@@ -616,6 +618,7 @@
20 GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length); 40 GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length);
21 g_free (text_8bit); 41 g_free (text_8bit);
22 } 42 }
23+#ifdef HAVE_XWC 43+#ifdef HAVE_XMBDRAWSTRING
24 else if (font->type == GDK_FONT_FONTSET) 44 else if (font->type == GDK_FONT_FONTSET)
25 { 45 {
26 if (sizeof(GdkWChar) == sizeof(wchar_t)) 46 if (sizeof(GdkWChar) == sizeof(wchar_t))
27@@ -633,6 +636,7 @@ 47@@ -636,6 +639,7 @@
28 g_free (text_wchar); 48 g_free (text_wchar);
29 } 49 }
30 } 50 }
@@ -32,14 +52,18 @@ diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/
32 else 52 else
33 g_error("undefined font type\n"); 53 g_error("undefined font type\n");
34 } 54 }
35diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c 55Index: gdk/x11/gdkfont-x11.c
36--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00 56===================================================================
37+++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2005-01-02 15:45:39 +00:00 57RCS file: /cvs/gnome/gtk+/gdk/x11/gdkfont-x11.c,v
38@@ -525,10 +525,12 @@ 58retrieving revision 1.48.2.1
59diff -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 @@
39 width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2); 63 width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2);
40 } 64 }
41 break; 65 break;
42+#ifdef HAVE_XWC 66+#ifdef HAVE_XMBDRAWSTRING
43 case GDK_FONT_FONTSET: 67 case GDK_FONT_FONTSET:
44 fontset = (XFontSet) private->xfont; 68 fontset = (XFontSet) private->xfont;
45 width = XmbTextEscapement (fontset, text, text_length); 69 width = XmbTextEscapement (fontset, text, text_length);
@@ -48,15 +72,15 @@ diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/
48 default: 72 default:
49 width = 0; 73 width = 0;
50 } 74 }
51@@ -578,6 +580,7 @@ 75@@ -580,6 +582,7 @@
52 width = 0; 76 width = 0;
53 } 77 }
54 break; 78 break;
55+#ifdef HAVE_XWC 79+#ifdef HAVE_XMBDRAWSTRING
56 case GDK_FONT_FONTSET: 80 case GDK_FONT_FONTSET:
57 if (sizeof(GdkWChar) == sizeof(wchar_t)) 81 if (sizeof(GdkWChar) == sizeof(wchar_t))
58 { 82 {
59@@ -595,6 +598,7 @@ 83@@ -597,6 +600,7 @@
60 g_free (text_wchar); 84 g_free (text_wchar);
61 } 85 }
62 break; 86 break;
@@ -64,15 +88,15 @@ diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/
64 default: 88 default:
65 width = 0; 89 width = 0;
66 } 90 }
67@@ -667,6 +671,7 @@ 91@@ -669,6 +673,7 @@
68 if (descent) 92 if (descent)
69 *descent = overall.descent; 93 *descent = overall.descent;
70 break; 94 break;
71+#ifdef HAVE_XWC 95+#ifdef HAVE_XMBDRAWSTRING
72 case GDK_FONT_FONTSET: 96 case GDK_FONT_FONTSET:
73 fontset = (XFontSet) private->xfont; 97 fontset = (XFontSet) private->xfont;
74 XmbTextExtents (fontset, text, text_length, &ink, &logical); 98 XmbTextExtents (fontset, text, text_length, &ink, &logical);
75@@ -681,6 +686,7 @@ 99@@ -683,6 +688,7 @@
76 if (descent) 100 if (descent)
77 *descent = ink.y + ink.height; 101 *descent = ink.y + ink.height;
78 break; 102 break;
@@ -80,15 +104,15 @@ diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/
80 } 104 }
81 105
82 } 106 }
83@@ -753,6 +759,7 @@ 107@@ -755,6 +761,7 @@
84 *descent = overall.descent; 108 *descent = overall.descent;
85 break; 109 break;
86 } 110 }
87+#ifdef HAVE_XWC 111+#ifdef HAVE_XMBDRAWSTRING
88 case GDK_FONT_FONTSET: 112 case GDK_FONT_FONTSET:
89 fontset = (XFontSet) private->xfont; 113 fontset = (XFontSet) private->xfont;
90 114
91@@ -780,6 +787,7 @@ 115@@ -782,6 +789,7 @@
92 if (descent) 116 if (descent)
93 *descent = ink.y + ink.height; 117 *descent = ink.y + ink.height;
94 break; 118 break;
@@ -96,14 +120,18 @@ diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/
96 } 120 }
97 121
98 } 122 }
99diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c 123Index: gdk/x11/gdkim-x11.c
100--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00 124===================================================================
101+++ gtk+-2.6.0/gdk/x11/gdkim-x11.c 2005-01-02 15:42:04 +00:00 125RCS file: /cvs/gnome/gtk+/gdk/x11/gdkim-x11.c,v
126retrieving revision 1.38
127diff -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
102@@ -48,6 +48,7 @@ 130@@ -48,6 +48,7 @@
103 void 131 void
104 _gdk_x11_initialize_locale (void) 132 _gdk_x11_initialize_locale (void)
105 { 133 {
106+#ifdef HAVE_XWC 134+#ifdef HAVE_XMBDRAWSTRING
107 wchar_t result; 135 wchar_t result;
108 gchar *current_locale; 136 gchar *current_locale;
109 static char *last_locale = NULL; 137 static char *last_locale = NULL;
@@ -121,7 +149,7 @@ diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gd
121 { 149 {
122 gchar *mbstr; 150 gchar *mbstr;
123 151
124+#ifdef HAVE_XWC 152+#ifdef HAVE_XMBDRAWSTRING
125 if (gdk_use_mb) 153 if (gdk_use_mb)
126 { 154 {
127 GdkDisplay *display = find_a_display (); 155 GdkDisplay *display = find_a_display ();
@@ -137,7 +165,7 @@ diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gd
137 gint 165 gint
138 gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max) 166 gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max)
139 { 167 {
140+#ifdef HAVE_XWC 168+#ifdef HAVE_XMBDRAWSTRING
141 if (gdk_use_mb) 169 if (gdk_use_mb)
142 { 170 {
143 GdkDisplay *display = find_a_display (); 171 GdkDisplay *display = find_a_display ();
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-23 20:47:07 +0000