summaryrefslogtreecommitdiffstats
path: root/meta/packages/xorg-lib/libx11
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:14:24 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:29:45 +0100
commit29d6678fd546377459ef75cf54abeef5b969b5cf (patch)
tree8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/packages/xorg-lib/libx11
parentda49de6885ee1bc424e70bc02f21f6ab920efb55 (diff)
downloadpoky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/xorg-lib/libx11')
-rw-r--r--meta/packages/xorg-lib/libx11/X18NCMSstubs.diff528
-rw-r--r--meta/packages/xorg-lib/libx11/fix-disable-xlocale.diff14
-rw-r--r--meta/packages/xorg-lib/libx11/fix-utf8-wrong-define.patch16
-rw-r--r--meta/packages/xorg-lib/libx11/include_fix.patch23
-rw-r--r--meta/packages/xorg-lib/libx11/nodolt.patch12
-rw-r--r--meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch29
-rw-r--r--meta/packages/xorg-lib/libx11/xim.patch55
7 files changed, 0 insertions, 677 deletions
diff --git a/meta/packages/xorg-lib/libx11/X18NCMSstubs.diff b/meta/packages/xorg-lib/libx11/X18NCMSstubs.diff
deleted file mode 100644
index 54b1727a95..0000000000
--- a/meta/packages/xorg-lib/libx11/X18NCMSstubs.diff
+++ /dev/null
@@ -1,528 +0,0 @@
1--- libX11-X11R7.0-1.0.0/src/imConv.c.orig 2006-03-08 09:46:03.000000000 +0100
2+++ libX11-X11R7.0-1.0.0/src/imConv.c 2006-03-08 10:50:10.000000000 +0100
3@@ -83,6 +83,7 @@
4 * from UCS char to specified charset char.
5 * This converter is needed for _XimGetCharCode subroutine.
6 */
7+#ifdef XLOCALE
8 XPointer
9 _XimGetLocaleCode (
10 _Xconst char* encoding_name)
11@@ -96,6 +97,7 @@
12 }
13 return cvt;
14 }
15+#endif
16
17 /*
18 * Returns the locale dependent representation of a keysym.
19@@ -107,6 +109,7 @@
20 * locale
21 */
22 /*ARGSUSED*/
23+#ifdef XLOCALE
24 int
25 _XimGetCharCode (
26 XPointer ucs_conv,
27@@ -135,6 +138,7 @@
28 buf[count]= '\0';
29 return count;
30 }
31+#endif
32
33 #ifdef XKB
34 static int lookup_string(
35--- libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c.orig 2006-03-08 08:43:19.000000000 +0100
36+++ libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c 2006-03-08 11:41:28.000000000 +0100
37@@ -0,0 +1,428 @@
38+/*
39+ * X18NCMSstubs.c
40+ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed
41+ *
42+ * Copyright © 2003 Matthew Allum
43+ *
44+ * Permission to use, copy, modify, distribute, and sell this software and its
45+ * documentation for any purpose is hereby granted without fee, provided that
46+ * the above copyright notice appear in all copies and that both that
47+ * copyright notice and this permission notice appear in supporting
48+ * documentation, and that the name of Matthew Allum not be used in
49+ * advertising or publicity pertaining to distribution of the software without
50+ * specific, written prior permission. Keith Packard and Compaq makes no
51+ * representations about the suitability of this software for any purpose. It
52+ * is provided "as is" without express or implied warranty.
53+ *
54+ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
55+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
56+ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
57+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
58+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
59+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
60+ * PERFORMANCE OF THIS SOFTWARE.
61+ */
62+
63+#include <stdlib.h>
64+#include "Xlibint.h"
65+#include "Xlcint.h"
66+#include <X11/Xlocale.h>
67+#include <X11/Xos.h>
68+#ifdef WIN32
69+#undef close
70+#endif
71+#include <X11/Xutil.h>
72+#include "XlcPubI.h"
73+
74+#include "Xcmsint.h" /* for XcmsCCC type */
75+#include "XlcPubI.h" /* for XLCd type */
76+#include "config.h"
77+
78+#if ! XLOCALE
79+
80+Bool
81+XSupportsLocale()
82+{
83+ return False;
84+}
85+
86+char *
87+XSetLocaleModifiers(
88+ const char *modifiers)
89+{
90+ return NULL;
91+}
92+
93+XLCd
94+_XOpenLC(
95+ char *name)
96+{
97+ return NULL;
98+}
99+
100+XLCd
101+_XlcCurrentLC()
102+{
103+ return NULL;
104+}
105+
106+void
107+_XlcVaToArgList(
108+ va_list var,
109+ int count,
110+ XlcArgList *args_ret)
111+{
112+ return;
113+}
114+
115+void
116+_XlcCountVaList(
117+ va_list var,
118+ int *count_ret)
119+{
120+ return;
121+}
122+
123+void
124+_XCloseLC(
125+ XLCd lcd)
126+{
127+ return;
128+}
129+
130+int
131+_XlcConvert(
132+ XlcConv conv,
133+ XPointer *from,
134+ int *from_left,
135+ XPointer *to,
136+ int *to_left,
137+ XPointer *args,
138+ int num_args)
139+{
140+ return 0;
141+}
142+
143+/* XIM Stubs */
144+
145+XPointer
146+_XimGetLocaleCode ( _Xconst char* encoding_name )
147+{
148+ return NULL;
149+}
150+
151+int
152+_XimGetCharCode (
153+ XPointer ucs_conv,
154+ KeySym keysym,
155+ unsigned char* buf,
156+ int nbytes)
157+{
158+ return 0;
159+}
160+
161+/* Xrm Stubs */
162+
163+XrmMethods
164+_XrmInitParseInfo(
165+ XPointer *state)
166+{
167+ return (XrmMethods) NULL;
168+}
169+
170+/* Xwc Stubs */
171+
172+int
173+XwcTextExtents(
174+ XFontSet font_set,
175+ _Xconst wchar_t *text,
176+ int text_len,
177+ XRectangle *overall_ink_extents,
178+ XRectangle *overall_logical_extents)
179+{
180+ return 0;
181+}
182+
183+void
184+XwcDrawString(Display *display,
185+ Drawable d,
186+ XFontSet font_set,
187+ GC gc,
188+ int x, int y,
189+ _Xconst wchar_t *string,
190+ int num_wchars)
191+{
192+ ;
193+}
194+
195+void
196+XwcDrawText(
197+ Display *dpy,
198+ Drawable d,
199+ GC gc,
200+ int x,
201+ int y,
202+ XwcTextItem *text_items,
203+ int nitems)
204+{
205+ ;
206+}
207+
208+void
209+XwcDrawImageString(
210+ Display *dpy,
211+ Drawable d,
212+ XFontSet font_set,
213+ GC gc,
214+ int x,
215+ int y,
216+ _Xconst wchar_t *text,
217+ int text_len)
218+{
219+ ;
220+}
221+
222+int
223+XwcTextEscapement(
224+ XFontSet font_set,
225+ _Xconst wchar_t *text,
226+ int text_len)
227+{
228+ return 0;
229+}
230+
231+Status
232+XwcTextPerCharExtents(
233+ XFontSet font_set,
234+ _Xconst wchar_t *text,
235+ int text_len,
236+ XRectangle *ink_extents_buffer,
237+ XRectangle *logical_extents_buffer,
238+ int buffer_size,
239+ int *num_chars,
240+ XRectangle *max_ink_extents,
241+ XRectangle *max_logical_extents)
242+{
243+ ;
244+}
245+
246+int
247+XwcTextPropertyToTextList(
248+ Display *dpy,
249+ const XTextProperty *text_prop,
250+ wchar_t ***list_ret,
251+ int *count_ret)
252+{
253+ return 0;
254+}
255+
256+int
257+XwcTextListToTextProperty(
258+ Display *dpy,
259+ wchar_t **list,
260+ int count,
261+ XICCEncodingStyle style,
262+ XTextProperty *text_prop)
263+{
264+ return 0;
265+}
266+
267+void
268+XwcFreeStringList(wchar_t **list)
269+{
270+ return;
271+}
272+
273+
274+void XmbSetWMProperties ( /* Actually from mbWMProps.c */
275+ Display *dpy,
276+ Window w,
277+ _Xconst char *windowName,
278+ _Xconst char *iconName,
279+ char **argv,
280+ int argc,
281+ XSizeHints *sizeHints,
282+ XWMHints *wmHints,
283+ XClassHint *classHints)
284+{
285+ return;
286+}
287+
288+int
289+XmbTextPropertyToTextList(
290+ Display *dpy,
291+ const XTextProperty *text_prop,
292+ char ***list_ret,
293+ int *count_ret)
294+{
295+ return XLocaleNotSupported;
296+}
297+
298+int
299+XmbTextListToTextProperty(
300+ Display *dpy,
301+ char **list,
302+ int count,
303+ XICCEncodingStyle style,
304+ XTextProperty *text_prop)
305+{
306+ return XLocaleNotSupported;
307+}
308+
309+int
310+XmbTextExtents(
311+ XFontSet font_set,
312+ _Xconst char *text,
313+ int text_len,
314+ XRectangle *overall_ink_extents,
315+ XRectangle *overall_logical_extents)
316+{
317+ return 0;
318+}
319+
320+void
321+XmbDrawText(
322+ Display *dpy,
323+ Drawable d,
324+ GC gc,
325+ int x,
326+ int y,
327+ XmbTextItem *text_items,
328+ int nitems)
329+{
330+ ;
331+}
332+
333+void
334+XmbDrawString(
335+ Display *dpy,
336+ Drawable d,
337+ XFontSet font_set,
338+ GC gc,
339+ int x,
340+ int y,
341+ _Xconst char *text,
342+ int text_len)
343+{
344+ ;
345+}
346+
347+void
348+XmbDrawImageString(
349+ Display *dpy,
350+ Drawable d,
351+ XFontSet font_set,
352+ GC gc,
353+ int x,
354+ int y,
355+ _Xconst char *text,
356+ int text_len)
357+{
358+ ;
359+}
360+
361+int
362+XmbTextEscapement(
363+ XFontSet font_set,
364+ _Xconst char *text,
365+ int text_len)
366+{
367+ return 0;
368+}
369+
370+Status
371+XmbTextPerCharExtents(
372+ XFontSet font_set,
373+ _Xconst char *text,
374+ int text_len,
375+ XRectangle *ink_extents_buffer,
376+ XRectangle *logical_extents_buffer,
377+ int buffer_size,
378+ int *num_chars,
379+ XRectangle *max_ink_extents,
380+ XRectangle *max_logical_extents)
381+{
382+ return 0;
383+}
384+
385+unsigned int
386+KeySymToUcs4(KeySym keysym)
387+{
388+ return 0;
389+}
390+
391+#endif
392+
393+#if ! XCMS
394+
395+XcmsCCC
396+XcmsCCCOfColormap(dpy, cmap)
397+ Display *dpy;
398+ Colormap cmap;
399+{
400+ return NULL;
401+}
402+
403+Status
404+_XcmsResolveColorString (
405+ XcmsCCC ccc,
406+ const char **color_string,
407+ XcmsColor *pColor_exact_return,
408+ XcmsColorFormat result_format)
409+{
410+ return(XcmsFailure);
411+}
412+
413+void
414+_XcmsUnresolveColor(
415+ XcmsCCC ccc,
416+ XcmsColor *pColor)
417+{
418+ return;
419+}
420+
421+void
422+_XUnresolveColor(
423+ XcmsCCC ccc,
424+ XColor *pXColor)
425+{
426+ return;
427+}
428+
429+XcmsCmapRec *
430+_XcmsAddCmapRec(dpy, cmap, windowID, visual)
431+ Display *dpy;
432+ Colormap cmap;
433+ Window windowID;
434+ Visual *visual;
435+{
436+ return NULL;
437+}
438+
439+void
440+_XcmsRGB_to_XColor(
441+ XcmsColor *pColors,
442+ XColor *pXColors,
443+ unsigned int nColors)
444+{
445+ return;
446+}
447+
448+XcmsCmapRec *
449+_XcmsCopyCmapRecAndFree(
450+ Display *dpy,
451+ Colormap src_cmap,
452+ Colormap copy_cmap)
453+{
454+ return NULL;
455+}
456+
457+void
458+_XcmsDeleteCmapRec(
459+ Display *dpy,
460+ Colormap cmap)
461+{
462+ return;
463+}
464+
465+#endif
466--- libX11-X11R7.0-1.0.0/src/Makefile.am.orig 2006-03-08 08:31:09.000000000 +0100
467+++ libX11-X11R7.0-1.0.0/src/Makefile.am 2006-03-08 09:36:23.000000000 +0100
468@@ -331,6 +331,8 @@
469 libX11_la_SOURCES+=UIThrStubs.c
470 endif
471
472+libX11_la_SOURCES+=X18NCMSstubs.c
473+
474 x11datadir = @X11_DATADIR@
475 x11data_DATA = XKeysymDB XErrorDB
476
477@@ -338,7 +340,8 @@
478 $(x11data_DATA) \
479 os2Stubs.c \
480 udcInf.c \
481- UIThrStubs.c
482+ UIThrStubs.c \
483+ X18NCMSstubs.c
484
485 #
486 # Figure out which sub-libraries to link into Xlib
487--- libX11-X11R7.0-1.0.0/src/locking.c.orig 2006-03-08 11:05:56.000000000 +0100
488+++ libX11-X11R7.0-1.0.0/src/locking.c 2006-03-08 11:06:37.000000000 +0100
489@@ -55,7 +55,9 @@
490 #define NUM_FREE_CVLS 4
491
492 /* in lcWrap.c */
493+#ifdef XLOCALE
494 extern LockInfoPtr _Xi18n_lock;
495+#endif
496
497 #ifdef WIN32
498 static DWORD _X_TlsIndex = (DWORD)-1;
499@@ -625,9 +627,11 @@
500 _Xglobal_lock = &global_lock;
501 xmutex_init(_Xglobal_lock->lock);
502 xmutex_set_name(_Xglobal_lock->lock, "Xlib global");
503+#ifdef XLOCALE
504 _Xi18n_lock = &i18n_lock;
505 xmutex_init(_Xi18n_lock->lock);
506 xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n");
507+#endif
508 _XLockMutex_fn = _XLockMutex;
509 _XUnlockMutex_fn = _XUnlockMutex;
510 _XCreateMutex_fn = _XCreateMutex;
511--- libX11-X11R7.0-1.0.0/configure.ac.orig 2006-03-08 10:03:57.000000000 +0100
512+++ libX11-X11R7.0-1.0.0/configure.ac 2006-03-08 10:06:01.000000000 +0100
513@@ -215,7 +215,14 @@
514 esac
515 AC_SUBST(KEYSYMDEF)
516
517-AM_CONDITIONAL(UDC, test xfalse = xtrue)
518+AC_ARG_ENABLE(udc,
519+ AC_HELP_STRING([--disable-udc],
520+ [Disable Xlib support for UDC *EXPERIMENTAL*]),
521+ [UDC=$enableval],[UDC=yes])
522+AM_CONDITIONAL(UDC, [test x$UDC = xyes ])
523+if test x"$UDC" = "xyes"; then
524+ AC_DEFINE(UDC,1,[Include support for UDC])
525+fi
526
527 AC_ARG_ENABLE(xcms,
528 AC_HELP_STRING([--disable-xcms],
diff --git a/meta/packages/xorg-lib/libx11/fix-disable-xlocale.diff b/meta/packages/xorg-lib/libx11/fix-disable-xlocale.diff
deleted file mode 100644
index 9dbf6dac68..0000000000
--- a/meta/packages/xorg-lib/libx11/fix-disable-xlocale.diff
+++ /dev/null
@@ -1,14 +0,0 @@
1--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100
2+++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100
3@@ -701,7 +701,11 @@
4 }
5 if (l - 2 - (p - charset) < 0)
6 return 0;
7+#ifdef XLOCALE
8 if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
9+#else
10+ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset))
11+#endif
12 return 0;
13 if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
14 return 0;
diff --git a/meta/packages/xorg-lib/libx11/fix-utf8-wrong-define.patch b/meta/packages/xorg-lib/libx11/fix-utf8-wrong-define.patch
deleted file mode 100644
index a098db1941..0000000000
--- a/meta/packages/xorg-lib/libx11/fix-utf8-wrong-define.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define
7+++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h
8@@ -103,7 +103,7 @@
9
10 /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in
11 November 2000. Its presence is indicated through the following macro. */
12-#define X_HAVE_UTF8_STRING 1
13+#undef X_HAVE_UTF8_STRING
14
15 typedef char *XPointer;
16
diff --git a/meta/packages/xorg-lib/libx11/include_fix.patch b/meta/packages/xorg-lib/libx11/include_fix.patch
deleted file mode 100644
index 99ed57194e..0000000000
--- a/meta/packages/xorg-lib/libx11/include_fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1---
2 configure.ac | 6 +++---
3 1 file changed, 3 insertions(+), 3 deletions(-)
4
5--- libX11-1.1.5.orig/configure.ac
6+++ libX11-1.1.5/configure.ac
7@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS)
8 AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
9
10 #
11 # Find keysymdef.h
12 #
13-AC_MSG_CHECKING([keysymdef.h])
14-dir=`pkg-config --variable=includedir xproto`
15-KEYSYMDEF="$dir/X11/keysymdef.h"
16+AC_ARG_WITH(keysymdef,
17+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
18+ KEYSYMDEF=$withval, KEYSYMDEF="")
19 if test -f "$KEYSYMDEF"; then
20 AC_MSG_RESULT([$KEYSYMDEF])
21 else
22 AC_MSG_ERROR([Cannot find keysymdef.h])
23 fi
diff --git a/meta/packages/xorg-lib/libx11/nodolt.patch b/meta/packages/xorg-lib/libx11/nodolt.patch
deleted file mode 100644
index ecf9625cad..0000000000
--- a/meta/packages/xorg-lib/libx11/nodolt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Index: libX11-1.2.1/configure.ac
2===================================================================
3--- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100
4+++ libX11-1.2.1/configure.ac 2009-07-02 14:08:01.000000000 +0100
5@@ -20,7 +20,6 @@
6
7 # Checks for programs.
8 AC_PROG_LIBTOOL
9-DOLT
10 AC_PROG_CC
11 XORG_CWARNFLAGS
12
diff --git a/meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch b/meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch
deleted file mode 100644
index 670578257c..0000000000
--- a/meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1---
2 src/util/Makefile.am | 17 -----------------
3 1 file changed, 17 deletions(-)
4
5Index: libX11-1.2.1/src/util/Makefile.am
6===================================================================
7--- libX11-1.2.1.orig/src/util/Makefile.am 2008-10-07 18:18:19.000000000 +0100
8+++ libX11-1.2.1/src/util/Makefile.am 2009-07-02 14:04:38.000000000 +0100
9@@ -1,20 +1,3 @@
10 # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
11
12-noinst_PROGRAMS=makekeys
13-
14-makekeys_CFLAGS=$(X11_CFLAGS)
15-
16-CC = @CC_FOR_BUILD@
17-
18 EXTRA_DIST = mkks.sh
19-
20-if LINT
21-# Check source code with tools like lint & sparse
22-
23-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
24- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
25-
26-lint:
27- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
28-
29-endif LINT
diff --git a/meta/packages/xorg-lib/libx11/xim.patch b/meta/packages/xorg-lib/libx11/xim.patch
deleted file mode 100644
index 0eab197a80..0000000000
--- a/meta/packages/xorg-lib/libx11/xim.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1--- libX11-6.2.1/src/X18NCMSstubs.c 2003-12-04 22:47:47.000000000 +0000
2+++ libX11-6.2.1/src/X18NCMSstubs.c-new 2005-12-09 12:09:03.000000000 +0000
3@@ -90,6 +90,52 @@
4 return;
5 }
6
7+XIM
8+XOpenIM (
9+ Display* display,
10+ struct _XrmHashBucketRec* rdb,
11+ char* res_name,
12+ char* res_class)
13+{
14+ return (XIM) NULL;
15+}
16+
17+Status
18+XCloseIM ( XIM im )
19+{
20+ return NULL;
21+}
22+
23+XIC
24+XCreateIC ( XIM im, ...)
25+{
26+ return NULL;
27+}
28+
29+void
30+XDestroyIC ( XIC ic )
31+{
32+ return;
33+}
34+
35+int
36+XmbLookupString (
37+ XIC ic,
38+ XKeyPressedEvent* ev,
39+ char* buffer,
40+ int nbytes,
41+ KeySym* keysym,
42+ Status* status)
43+{
44+ return XLookupNone;
45+}
46+
47+char *
48+XGetICValues( XIC ic, ...)
49+{
50+ return (char *) NULL;
51+}
52+
53 XPointer
54 _XimGetLocaleCode ( _Xconst char* encoding_name )
55 {