Archives
Archives
| From: | "Jeremy Olexa (darkside)" <darkside@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in x11-libs/libX11/files: libX11-1.1.5-solaris.patch libX11-1.1.4-aix-pthread.patch libX11-1.1.5-winnt-private.patch |
| Date: | Thu, 27 Jan 2011 16:50:43 |
| Message-Id: | 20110127165029.26F0E20054@flycatcher.gentoo.org |
| 1 | darkside 11/01/27 16:50:29 |
| 2 | |
| 3 | Added: libX11-1.1.5-solaris.patch |
| 4 | libX11-1.1.4-aix-pthread.patch |
| 5 | libX11-1.1.5-winnt-private.patch |
| 6 | Log: |
| 7 | Push Gentoo Prefix changes from x11 overlay, as approved |
| 8 | |
| 9 | (Portage version: 2.1.9.35/cvs/Linux i686) |
| 10 | |
| 11 | Revision Changes Path |
| 12 | 1.1 x11-libs/libX11/files/libX11-1.1.5-solaris.patch |
| 13 | |
| 14 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/files/libX11-1.1.5-solaris.patch?rev=1.1&view=markup |
| 15 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/files/libX11-1.1.5-solaris.patch?rev=1.1&content-type=text/plain |
| 16 | |
| 17 | Index: libX11-1.1.5-solaris.patch |
| 18 | =================================================================== |
| 19 | wchar_t is defined in /usr/include/stddef.h on Solaris |
| 20 | |
| 21 | --- include/X11/Xlib.h |
| 22 | +++ include/X11/Xlib.h |
| 23 | @@ -71,7 +71,7 @@ |
| 24 | #endif |
| 25 | #endif |
| 26 | |
| 27 | -#ifndef X_WCHAR |
| 28 | +#if !defined(X_WCHAR) || defined(__sun__) |
| 29 | #include <stddef.h> |
| 30 | #else |
| 31 | #ifdef __UNIXOS2__ |
| 32 | |
| 33 | |
| 34 | |
| 35 | 1.1 x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch |
| 36 | |
| 37 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch?rev=1.1&view=markup |
| 38 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch?rev=1.1&content-type=text/plain |
| 39 | |
| 40 | Index: libX11-1.1.4-aix-pthread.patch |
| 41 | =================================================================== |
| 42 | --- configure.ac.orig 2008-07-21 15:48:33 +0200 |
| 43 | +++ configure.ac 2008-07-21 15:49:23 +0200 |
| 44 | @@ -198,6 +198,8 @@ |
| 45 | XTHREADLIB="-pthread" ;; |
| 46 | solaris*) |
| 47 | XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;; |
| 48 | + aix*) |
| 49 | + XTHREAD_CFLAGS="-pthread" ;; |
| 50 | esac |
| 51 | fi |
| 52 | AC_SUBST(XTHREADLIB) |
| 53 | |
| 54 | |
| 55 | |
| 56 | 1.1 x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch |
| 57 | |
| 58 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch?rev=1.1&view=markup |
| 59 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch?rev=1.1&content-type=text/plain |
| 60 | |
| 61 | Index: libX11-1.1.5-winnt-private.patch |
| 62 | =================================================================== |
| 63 | diff -ru -x '*.Po' -x '*.Plo' -x '*.o' -x '*.lo' libX11-1.1.5/src/xlibi18n/Ximint.h libX11-1.1.5.orig/src/xlibi18n/Ximint.h |
| 64 | --- libX11-1.1.5/src/xlibi18n/Ximint.h 2009-01-16 10:14:37 +0100 |
| 65 | +++ libX11-1.1.5.orig/src/xlibi18n/Ximint.h 2009-01-16 09:39:48 +0100 |
| 66 | @@ -37,6 +37,9 @@ |
| 67 | |
| 68 | #include <stdio.h> |
| 69 | #include <X11/Xutil.h> |
| 70 | +#ifdef WIN32 |
| 71 | +# include <X11/Xwindows.h> |
| 72 | +#endif |
| 73 | |
| 74 | #define Public /**/ |
| 75 | #define Private static |