summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/libx11
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-09-11 20:17:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-12 15:13:47 +0100
commitd7a03d5bd066bc22eddaf9f7aba8c995227ab3a7 (patch)
tree0754d97fcf7ec6c0a147d11a12261ef008ec914b /meta/recipes-graphics/xorg-lib/libx11
parent8e6a6ecd0edd7fd72225023254d9fd0c1e27fa93 (diff)
downloadpoky-d7a03d5bd066bc22eddaf9f7aba8c995227ab3a7.tar.gz
libx11: merge patches into a single directory
(From OE-Core rev: 34b337e52551717106b377c53ea5dc617ac4c92c) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff541
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff17
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch19
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch23
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/makekeys_crosscompile.patch76
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch34
6 files changed, 710 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
new file mode 100644
index 0000000000..8cd1870363
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
@@ -0,0 +1,541 @@
1Upstream-Status: Pending
2
3Upstream-Status: Inappropriate [configuration]
4Index: libX11-1.3/src/imConv.c
5===================================================================
6--- libX11-1.3.orig/src/imConv.c
7+++ libX11-1.3/src/imConv.c
8@@ -83,6 +83,7 @@ static const struct SubstRec SubstTable[
9 * from UCS char to specified charset char.
10 * This converter is needed for _XimGetCharCode subroutine.
11 */
12+#ifdef XLOCALE
13 XPointer
14 _XimGetLocaleCode (
15 _Xconst char* encoding_name)
16@@ -96,6 +97,7 @@ _XimGetLocaleCode (
17 }
18 return cvt;
19 }
20+#endif
21
22 /*
23 * Returns the locale dependent representation of a keysym.
24@@ -106,6 +108,7 @@ _XimGetLocaleCode (
25 * terminating NUL byte. Return 0 if the keysym is not representable in the
26 * locale
27 */
28+#ifdef XLOCALE
29 /*ARGSUSED*/
30 int
31 _XimGetCharCode (
32@@ -135,6 +138,7 @@ _XimGetCharCode (
33 buf[count]= '\0';
34 return count;
35 }
36+#endif
37
38 #ifdef XKB
39 static int lookup_string(
40Index: libX11-1.3/src/X18NCMSstubs.c
41===================================================================
42--- /dev/null
43+++ libX11-1.3/src/X18NCMSstubs.c
44@@ -0,0 +1,428 @@
45+/*
46+ * X18NCMSstubs.c
47+ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed
48+ *
49+ * Copyright © 2003 Matthew Allum
50+ *
51+ * Permission to use, copy, modify, distribute, and sell this software and its
52+ * documentation for any purpose is hereby granted without fee, provided that
53+ * the above copyright notice appear in all copies and that both that
54+ * copyright notice and this permission notice appear in supporting
55+ * documentation, and that the name of Matthew Allum not be used in
56+ * advertising or publicity pertaining to distribution of the software without
57+ * specific, written prior permission. Keith Packard and Compaq makes no
58+ * representations about the suitability of this software for any purpose. It
59+ * is provided "as is" without express or implied warranty.
60+ *
61+ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
62+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
63+ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
64+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
65+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
66+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
67+ * PERFORMANCE OF THIS SOFTWARE.
68+ */
69+
70+#include <stdlib.h>
71+#include "Xlibint.h"
72+#include "Xlcint.h"
73+#include <X11/Xlocale.h>
74+#include <X11/Xos.h>
75+#ifdef WIN32
76+#undef close
77+#endif
78+#include <X11/Xutil.h>
79+#include "XlcPubI.h"
80+
81+#include "Xcmsint.h" /* for XcmsCCC type */
82+#include "XlcPubI.h" /* for XLCd type */
83+#include "config.h"
84+
85+#if ! XLOCALE
86+
87+Bool
88+XSupportsLocale()
89+{
90+ return False;
91+}
92+
93+char *
94+XSetLocaleModifiers(
95+ const char *modifiers)
96+{
97+ return NULL;
98+}
99+
100+XLCd
101+_XOpenLC(
102+ char *name)
103+{
104+ return NULL;
105+}
106+
107+XLCd
108+_XlcCurrentLC()
109+{
110+ return NULL;
111+}
112+
113+void
114+_XlcVaToArgList(
115+ va_list var,
116+ int count,
117+ XlcArgList *args_ret)
118+{
119+ return;
120+}
121+
122+void
123+_XlcCountVaList(
124+ va_list var,
125+ int *count_ret)
126+{
127+ return;
128+}
129+
130+void
131+_XCloseLC(
132+ XLCd lcd)
133+{
134+ return;
135+}
136+
137+int
138+_XlcConvert(
139+ XlcConv conv,
140+ XPointer *from,
141+ int *from_left,
142+ XPointer *to,
143+ int *to_left,
144+ XPointer *args,
145+ int num_args)
146+{
147+ return 0;
148+}
149+
150+/* XIM Stubs */
151+
152+XPointer
153+_XimGetLocaleCode ( _Xconst char* encoding_name )
154+{
155+ return NULL;
156+}
157+
158+int
159+_XimGetCharCode (
160+ XPointer ucs_conv,
161+ KeySym keysym,
162+ unsigned char* buf,
163+ int nbytes)
164+{
165+ return 0;
166+}
167+
168+/* Xrm Stubs */
169+
170+XrmMethods
171+_XrmInitParseInfo(
172+ XPointer *state)
173+{
174+ return (XrmMethods) NULL;
175+}
176+
177+/* Xwc Stubs */
178+
179+int
180+XwcTextExtents(
181+ XFontSet font_set,
182+ _Xconst wchar_t *text,
183+ int text_len,
184+ XRectangle *overall_ink_extents,
185+ XRectangle *overall_logical_extents)
186+{
187+ return 0;
188+}
189+
190+void
191+XwcDrawString(Display *display,
192+ Drawable d,
193+ XFontSet font_set,
194+ GC gc,
195+ int x, int y,
196+ _Xconst wchar_t *string,
197+ int num_wchars)
198+{
199+ ;
200+}
201+
202+void
203+XwcDrawText(
204+ Display *dpy,
205+ Drawable d,
206+ GC gc,
207+ int x,
208+ int y,
209+ XwcTextItem *text_items,
210+ int nitems)
211+{
212+ ;
213+}
214+
215+void
216+XwcDrawImageString(
217+ Display *dpy,
218+ Drawable d,
219+ XFontSet font_set,
220+ GC gc,
221+ int x,
222+ int y,
223+ _Xconst wchar_t *text,
224+ int text_len)
225+{
226+ ;
227+}
228+
229+int
230+XwcTextEscapement(
231+ XFontSet font_set,
232+ _Xconst wchar_t *text,
233+ int text_len)
234+{
235+ return 0;
236+}
237+
238+Status
239+XwcTextPerCharExtents(
240+ XFontSet font_set,
241+ _Xconst wchar_t *text,
242+ int text_len,
243+ XRectangle *ink_extents_buffer,
244+ XRectangle *logical_extents_buffer,
245+ int buffer_size,
246+ int *num_chars,
247+ XRectangle *max_ink_extents,
248+ XRectangle *max_logical_extents)
249+{
250+ return(XcmsFailure);
251+}
252+
253+int
254+XwcTextPropertyToTextList(
255+ Display *dpy,
256+ const XTextProperty *text_prop,
257+ wchar_t ***list_ret,
258+ int *count_ret)
259+{
260+ return 0;
261+}
262+
263+int
264+XwcTextListToTextProperty(
265+ Display *dpy,
266+ wchar_t **list,
267+ int count,
268+ XICCEncodingStyle style,
269+ XTextProperty *text_prop)
270+{
271+ return 0;
272+}
273+
274+void
275+XwcFreeStringList(wchar_t **list)
276+{
277+ return;
278+}
279+
280+
281+void XmbSetWMProperties ( /* Actually from mbWMProps.c */
282+ Display *dpy,
283+ Window w,
284+ _Xconst char *windowName,
285+ _Xconst char *iconName,
286+ char **argv,
287+ int argc,
288+ XSizeHints *sizeHints,
289+ XWMHints *wmHints,
290+ XClassHint *classHints)
291+{
292+ return;
293+}
294+
295+int
296+XmbTextPropertyToTextList(
297+ Display *dpy,
298+ const XTextProperty *text_prop,
299+ char ***list_ret,
300+ int *count_ret)
301+{
302+ return XLocaleNotSupported;
303+}
304+
305+int
306+XmbTextListToTextProperty(
307+ Display *dpy,
308+ char **list,
309+ int count,
310+ XICCEncodingStyle style,
311+ XTextProperty *text_prop)
312+{
313+ return XLocaleNotSupported;
314+}
315+
316+int
317+XmbTextExtents(
318+ XFontSet font_set,
319+ _Xconst char *text,
320+ int text_len,
321+ XRectangle *overall_ink_extents,
322+ XRectangle *overall_logical_extents)
323+{
324+ return 0;
325+}
326+
327+void
328+XmbDrawText(
329+ Display *dpy,
330+ Drawable d,
331+ GC gc,
332+ int x,
333+ int y,
334+ XmbTextItem *text_items,
335+ int nitems)
336+{
337+ ;
338+}
339+
340+void
341+XmbDrawString(
342+ Display *dpy,
343+ Drawable d,
344+ XFontSet font_set,
345+ GC gc,
346+ int x,
347+ int y,
348+ _Xconst char *text,
349+ int text_len)
350+{
351+ ;
352+}
353+
354+void
355+XmbDrawImageString(
356+ Display *dpy,
357+ Drawable d,
358+ XFontSet font_set,
359+ GC gc,
360+ int x,
361+ int y,
362+ _Xconst char *text,
363+ int text_len)
364+{
365+ ;
366+}
367+
368+int
369+XmbTextEscapement(
370+ XFontSet font_set,
371+ _Xconst char *text,
372+ int text_len)
373+{
374+ return 0;
375+}
376+
377+Status
378+XmbTextPerCharExtents(
379+ XFontSet font_set,
380+ _Xconst char *text,
381+ int text_len,
382+ XRectangle *ink_extents_buffer,
383+ XRectangle *logical_extents_buffer,
384+ int buffer_size,
385+ int *num_chars,
386+ XRectangle *max_ink_extents,
387+ XRectangle *max_logical_extents)
388+{
389+ return 0;
390+}
391+
392+unsigned int
393+KeySymToUcs4(KeySym keysym)
394+{
395+ return 0;
396+}
397+
398+#endif
399+
400+#if ! XCMS
401+
402+XcmsCCC
403+XcmsCCCOfColormap(dpy, cmap)
404+ Display *dpy;
405+ Colormap cmap;
406+{
407+ return NULL;
408+}
409+
410+Status
411+_XcmsResolveColorString (
412+ XcmsCCC ccc,
413+ const char **color_string,
414+ XcmsColor *pColor_exact_return,
415+ XcmsColorFormat result_format)
416+{
417+ return(XcmsFailure);
418+}
419+
420+void
421+_XcmsUnresolveColor(
422+ XcmsCCC ccc,
423+ XcmsColor *pColor)
424+{
425+ return;
426+}
427+
428+void
429+_XUnresolveColor(
430+ XcmsCCC ccc,
431+ XColor *pXColor)
432+{
433+ return;
434+}
435+
436+XcmsCmapRec *
437+_XcmsAddCmapRec(dpy, cmap, windowID, visual)
438+ Display *dpy;
439+ Colormap cmap;
440+ Window windowID;
441+ Visual *visual;
442+{
443+ return NULL;
444+}
445+
446+void
447+_XcmsRGB_to_XColor(
448+ XcmsColor *pColors,
449+ XColor *pXColors,
450+ unsigned int nColors)
451+{
452+ return;
453+}
454+
455+XcmsCmapRec *
456+_XcmsCopyCmapRecAndFree(
457+ Display *dpy,
458+ Colormap src_cmap,
459+ Colormap copy_cmap)
460+{
461+ return NULL;
462+}
463+
464+void
465+_XcmsDeleteCmapRec(
466+ Display *dpy,
467+ Colormap cmap)
468+{
469+ return;
470+}
471+
472+#endif
473Index: libX11-1.3/src/Makefile.am
474===================================================================
475--- libX11-1.3.orig/src/Makefile.am
476+++ libX11-1.3/src/Makefile.am
477@@ -335,6 +335,8 @@ if THRSTUBS
478 libX11_la_SOURCES+=UIThrStubs.c
479 endif
480
481+libX11_la_SOURCES+=X18NCMSstubs.c
482+
483 x11datadir = @X11_DATADIR@
484 x11data_DATA = XKeysymDB XErrorDB
485
486@@ -342,7 +344,8 @@ EXTRA_DIST = \
487 $(x11data_DATA) \
488 os2Stubs.c \
489 udcInf.c \
490- UIThrStubs.c
491+ UIThrStubs.c \
492+ X18NCMSstubs.c
493
494 if XCB
495 libX11_la_SOURCES += \
496Index: libX11-1.3/src/locking.c
497===================================================================
498--- libX11-1.3.orig/src/locking.c
499+++ libX11-1.3/src/locking.c
500@@ -66,7 +66,9 @@ in this Software without prior written a
501 #define NUM_FREE_CVLS 4
502
503 /* in lcWrap.c */
504+#ifdef XLOCALE
505 extern LockInfoPtr _Xi18n_lock;
506+#endif
507
508 #ifdef WIN32
509 static DWORD _X_TlsIndex = (DWORD)-1;
510@@ -594,9 +596,11 @@ Status XInitThreads(void)
511 _Xglobal_lock = &global_lock;
512 xmutex_init(_Xglobal_lock->lock);
513 xmutex_set_name(_Xglobal_lock->lock, "Xlib global");
514+#ifdef XLOCALE
515 _Xi18n_lock = &i18n_lock;
516 xmutex_init(_Xi18n_lock->lock);
517 xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n");
518+#endif
519 _XLockMutex_fn = _XLockMutex;
520 _XUnlockMutex_fn = _XUnlockMutex;
521 _XCreateMutex_fn = _XCreateMutex;
522Index: libX11-1.3/configure.ac
523===================================================================
524--- libX11-1.3.orig/configure.ac
525+++ libX11-1.3/configure.ac
526@@ -289,7 +289,14 @@ else
527 fi
528 AC_SUBST(KEYSYMDEF)
529
530-AM_CONDITIONAL(UDC, test xfalse = xtrue)
531+AC_ARG_ENABLE(udc,
532+ AC_HELP_STRING([--disable-udc],
533+ [Disable Xlib support for UDC *EXPERIMENTAL*]),
534+ [UDC=$enableval],[UDC=yes])
535+AM_CONDITIONAL(UDC, [test x$UDC = xyes ])
536+if test x"$UDC" = "xyes"; then
537+ AC_DEFINE(UDC,1,[Include support for UDC])
538+fi
539
540 AC_ARG_ENABLE(xcms,
541 AC_HELP_STRING([--disable-xcms],
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
new file mode 100644
index 0000000000..a7c3984fd5
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
@@ -0,0 +1,17 @@
1Upstream-Status: Pending
2
3Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
4--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100
5+++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100
6@@ -701,7 +701,11 @@
7 }
8 if (l - 2 - (p - charset) < 0)
9 return 0;
10+#ifdef XLOCALE
11 if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
12+#else
13+ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset))
14+#endif
15 return 0;
16 if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
17 return 0;
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
new file mode 100644
index 0000000000..c6347f5be1
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
@@ -0,0 +1,19 @@
1Upstream-Status: Pending
2
3Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
4
5#
6# Patch managed by http://www.holgerschurig.de/patcher.html
7#
8
9--- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define
10+++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h
11@@ -103,7 +103,7 @@
12
13 /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in
14 November 2000. Its presence is indicated through the following macro. */
15-#define X_HAVE_UTF8_STRING 1
16+#undef X_HAVE_UTF8_STRING
17
18 typedef char *XPointer;
19
diff --git a/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch
new file mode 100644
index 0000000000..d1bdab9778
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch
@@ -0,0 +1,23 @@
1Upstream-Status: Inappropriate [configuration]
2
3Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
4
5diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac
6--- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200
7+++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200
8@@ -355,7 +355,14 @@
9 # Find keysymdef.h
10 #
11 AC_MSG_CHECKING([keysym definitions])
12-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
13+AC_ARG_WITH(keysymdefdir,
14+ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]),
15+ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="")
16+
17+if test x$KEYSYMDEFDIR = x; then
18+ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
19+fi
20+
21 FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
22 for i in $FILES; do
23 if test -f "$KEYSYMDEFDIR/$i"; then
diff --git a/meta/recipes-graphics/xorg-lib/libx11/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11/makekeys_crosscompile.patch
new file mode 100644
index 0000000000..daf3696b34
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11/makekeys_crosscompile.patch
@@ -0,0 +1,76 @@
1Because the size of "unsigned long" is different between 32-bit
2and 64-bit, judge whether target is 32-bit or 64-bit and tell
3"makekey".
4
5The error information from LSB Test suite is as follow:
6VSW5TESTSUITE PURPOSE 7
7Assertion XStringToKeysym-7.(A)
8When the string argument is the name of a KeySym in the
9table with the prefix XK_ removed, then a call to
10XStringToKeysym returns that KeySym.
11METH: For each KeySym name in table with code G:
12METH: Call XStringToKeysym to obtain the KeySym defined for that string.
13METH: Verify that XStringToKeysym did not return NoSymbol.
14METH: Verify that the returned string is correct.
15CHECK: XStringToKeysym-7 1, line 130
16CHECK: XStringToKeysym-7 2, line 140
17CHECK: XStringToKeysym-7 3, line 150
18CHECK: XStringToKeysym-7 4, line 160
19CHECK: XStringToKeysym-7 5, line 170
20CHECK: XStringToKeysym-7 6, line 180
21CHECK: XStringToKeysym-7 7, line 190
22CHECK: XStringToKeysym-7 8, line 200
23CHECK: XStringToKeysym-7 9, line 210
24CHECK: XStringToKeysym-7 10, line 220
25CHECK: XStringToKeysym-7 11, line 230
26CHECK: XStringToKeysym-7 12, line 240
27CHECK: XStringToKeysym-7 13, line 250
28CHECK: XStringToKeysym-7 14, line 260
29CHECK: XStringToKeysym-7 15, line 270
30CHECK: XStringToKeysym-7 16, line 280
31CHECK: XStringToKeysym-7 17, line 290
32CHECK: XStringToKeysym-7 18, line 300
33CHECK: XStringToKeysym-7 19, line 310
34CHECK: XStringToKeysym-7 20, line 320
35
36Upstream-Status: Pending
37
38Signed-off-by: dbuitenh@windriver.com
39
40--- libX11-1.3.4.orig/src/util/makekeys.c 2010-01-15 09:11:36.000000000 +0800
41+++ libX11-1.3.4/src/util/makekeys.c 2011-05-24 19:04:25.454774908 +0800
42@@ -33,6 +33,7 @@
43 #include <X11/keysymdef.h>
44 #include <stdio.h>
45 #include <stdlib.h>
46+#include <stdint.h>
47
48 typedef unsigned long Signature;
49
50@@ -124,7 +125,12 @@
51 name = info[i].name;
52 sig = 0;
53 while ((c = *name++))
54- sig = (sig << 1) + c;
55+#ifdef USE32
56+ sig = (uint32_t)(sig << 1) + c;
57+#else
58+ sig = (uint64_t)(sig << 1) + c;
59+#endif
60+
61 first = j = sig % z;
62 for (k = 0; tab[j]; k++) {
63 j += first + 1;
64@@ -163,7 +169,11 @@
65 name = info[i].name;
66 sig = 0;
67 while ((c = *name++))
68- sig = (sig << 1) + c;
69+#ifdef USE32
70+ sig = (uint32_t)(sig << 1) + c;
71+#else
72+ sig = (uint64_t)(sig << 1) + c;
73+#endif
74 first = j = sig % z;
75 while (offsets[j]) {
76 j += first + 1;
diff --git a/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch
new file mode 100644
index 0000000000..69f9e6c4d6
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch
@@ -0,0 +1,34 @@
1Upstream-Status: Pending
2
3Index: libX11-1.5.0/src/util/Makefile.am
4===================================================================
5--- libX11-1.5.0.orig/src/util/Makefile.am
6+++ libX11-1.5.0/src/util/Makefile.am
7@@ -1,27 +1,2 @@
8-
9-noinst_PROGRAMS=makekeys
10-
11-makekeys_CFLAGS = \
12- $(X11_CFLAGS) \
13- $(CWARNFLAGS)
14-
15-makekeys_CPPFLAGS = \
16- -I$(top_srcdir)/include
17-
18-CC = @CC_FOR_BUILD@
19-CPPFLAGS = @CPPFLAGS_FOR_BUILD@
20-CFLAGS = @CFLAGS_FOR_BUILD@
21-LDFLAGS = @LDFLAGS_FOR_BUILD@
22-
23 EXTRA_DIST = mkks.sh
24
25-if LINT
26-# Check source code with tools like lint & sparse
27-
28-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
29- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
30-
31-lint:
32- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
33-
34-endif LINT
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-02-24 19:14:10 +0000