From b1a2f2cfd64d50f748d36c6ccb4057a0319baa4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Marchesin?= Date: Tue, 24 Jan 2012 17:29:55 -0800 Subject: [PATCH] Import libX11-1.4.4 ebuild. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BUGS=chromium-os:25404 Change-Id: Ib40321a7974a5fb7e97fe5e1c33040dfd760e357 Reviewed-on: https://gerrit.chromium.org/gerrit/14760 Tested-by: Stéphane Marchesin Commit-Ready: Stéphane Marchesin Reviewed-by: Stuart Abercrombie --- .../files/libX11-1.1.4-aix-pthread.patch | 11 ++++ .../libX11/files/libX11-1.1.5-solaris.patch | 13 +++++ .../files/libX11-1.1.5-winnt-private.patch | 13 +++++ .../x11-libs/libX11/libX11-1.4.4.ebuild | 56 +++++++++++++++++++ 4 files changed, 93 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch create mode 100644 sdk_container/src/third_party/portage-stable/x11-libs/libX11/files/libX11-1.1.5-solaris.patch create mode 100644 sdk_container/src/third_party/portage-stable/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch create mode 100644 sdk_container/src/third_party/portage-stable/x11-libs/libX11/libX11-1.4.4.ebuild diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch b/sdk_container/src/third_party/portage-stable/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch new file mode 100644 index 0000000000..c854e0b408 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch @@ -0,0 +1,11 @@ +--- configure.ac.orig 2008-07-21 15:48:33 +0200 ++++ configure.ac 2008-07-21 15:49:23 +0200 +@@ -198,6 +198,8 @@ + XTHREADLIB="-pthread" ;; + solaris*) + XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;; ++ aix*) ++ XTHREAD_CFLAGS="-pthread" ;; + esac + fi + AC_SUBST(XTHREADLIB) diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/libX11/files/libX11-1.1.5-solaris.patch b/sdk_container/src/third_party/portage-stable/x11-libs/libX11/files/libX11-1.1.5-solaris.patch new file mode 100644 index 0000000000..a7926a53d7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-libs/libX11/files/libX11-1.1.5-solaris.patch @@ -0,0 +1,13 @@ +wchar_t is defined in /usr/include/stddef.h on Solaris + +--- include/X11/Xlib.h ++++ include/X11/Xlib.h +@@ -71,7 +71,7 @@ + #endif + #endif + +-#ifndef X_WCHAR ++#if !defined(X_WCHAR) || defined(__sun__) + #include + #else + #ifdef __UNIXOS2__ diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch b/sdk_container/src/third_party/portage-stable/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch new file mode 100644 index 0000000000..4539f111fa --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch @@ -0,0 +1,13 @@ +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 +--- libX11-1.1.5/src/xlibi18n/Ximint.h 2009-01-16 10:14:37 +0100 ++++ libX11-1.1.5.orig/src/xlibi18n/Ximint.h 2009-01-16 09:39:48 +0100 +@@ -37,6 +37,9 @@ + + #include + #include ++#ifdef WIN32 ++# include ++#endif + + #define Public /**/ + #define Private static diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/libX11/libX11-1.4.4.ebuild b/sdk_container/src/third_party/portage-stable/x11-libs/libX11/libX11-1.4.4.ebuild new file mode 100644 index 0000000000..24bfddd0a1 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-libs/libX11/libX11-1.4.4.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.4.4.ebuild,v 1.9 2012/01/15 20:45:05 chithanh Exp $ + +EAPI=4 + +XORG_DOC=doc +XORG_EAUTORECONF=yes +inherit xorg-2 toolchain-funcs flag-o-matic + +DESCRIPTION="X.Org X11 library" + +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="ipv6 test" + +RDEPEND=">=x11-libs/libxcb-1.1.92 + x11-libs/xtrans + >=x11-proto/xproto-7.0.17 + x11-proto/xf86bigfontproto + x11-proto/inputproto + x11-proto/kbproto + x11-proto/xextproto" +DEPEND="${RDEPEND} + test? ( dev-lang/perl )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.1.4-aix-pthread.patch + "${FILESDIR}"/${PN}-1.1.5-winnt-private.patch + "${FILESDIR}"/${PN}-1.1.5-solaris.patch +) + +pkg_setup() { + xorg-2_pkg_setup + XORG_CONFIGURE_OPTIONS=( + $(use_with doc xmlto) + $(use_enable doc specs) + $(use_enable ipv6) + --without-fop + ) +} + +src_configure() { + [[ ${CHOST} == *-interix* ]] && export ac_cv_func_poll=no + xorg-2_src_configure +} + +src_compile() { + # [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for 'makekeys' + if tc-is-cross-compiler; then + ( + filter-flags -m* + emake -C "${AUTOTOOLS_BUILD_DIR}"/src/util CC=$(tc-getBUILD_CC) CFLAGS="${CFLAGS}" LDFLAGS="" clean all || die + ) + fi + xorg-2_src_compile +}