diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-libs/libX11 | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-libs/libX11')
-rw-r--r-- | x11-libs/libX11/Manifest | 2 | ||||
-rw-r--r-- | x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch | 11 | ||||
-rw-r--r-- | x11-libs/libX11/files/libX11-1.1.5-solaris.patch | 13 | ||||
-rw-r--r-- | x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch | 13 | ||||
-rw-r--r-- | x11-libs/libX11/libX11-1.6.2.ebuild | 58 | ||||
-rw-r--r-- | x11-libs/libX11/libX11-1.6.3.ebuild | 58 | ||||
-rw-r--r-- | x11-libs/libX11/metadata.xml | 8 |
7 files changed, 163 insertions, 0 deletions
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest new file mode 100644 index 000000000000..74a1e8cda718 --- /dev/null +++ b/x11-libs/libX11/Manifest @@ -0,0 +1,2 @@ +DIST libX11-1.6.2.tar.bz2 2339981 SHA256 2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16 SHA512 c8609ff34d1fe71f35b35e0273a872ccded4d824c8afdcca37e1779d37bf667cb814e0ead0805668b4222f196148476f283e417ba371b722f1fe716a5bbba20b WHIRLPOOL 1e6e5010725586557912ab51aa07c41a6297e26f3818e31cf62d455735f4a4f29c0bd13140964ffb1290588ccb8e1643217bca685aa2e7ec40d99b907541656c +DIST libX11-1.6.3.tar.bz2 2363858 SHA256 cf31a7c39f2f52e8ebd0db95640384e63451f9b014eed2bb7f5de03e8adc8111 SHA512 01bbac8075b3fdae19cacfde1c799469f06fb864235025ce444fc10a3ba079bce30f4f3527db47c5edbf91d08299c61116cdf296efa38b2034c0099fac99cc69 WHIRLPOOL 1aa82b4d00af27e05bd9157cfafe16f2cdeecd3711e983224fda0cf6f323c7165b18f5a4572067b29ff3ca244e91def8523d56fb7be55e977bed507bd5a846f1 diff --git a/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch b/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch new file mode 100644 index 000000000000..c854e0b4080d --- /dev/null +++ b/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/x11-libs/libX11/files/libX11-1.1.5-solaris.patch b/x11-libs/libX11/files/libX11-1.1.5-solaris.patch new file mode 100644 index 000000000000..a7926a53d78b --- /dev/null +++ b/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 <stddef.h> + #else + #ifdef __UNIXOS2__ diff --git a/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch b/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch new file mode 100644 index 000000000000..4539f111faf1 --- /dev/null +++ b/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 <stdio.h> + #include <X11/Xutil.h> ++#ifdef WIN32 ++# include <X11/Xwindows.h> ++#endif + + #define Public /**/ + #define Private static diff --git a/x11-libs/libX11/libX11-1.6.2.ebuild b/x11-libs/libX11/libX11-1.6.2.ebuild new file mode 100644 index 000000000000..9ee48229d960 --- /dev/null +++ b/x11-libs/libX11/libX11-1.6.2.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +XORG_DOC=doc +# needs automake-1.14 without eautoreconf +XORG_EAUTORECONF=yes +XORG_MULTILIB=yes +inherit xorg-2 toolchain-funcs + +DESCRIPTION="X.Org X11 library" + +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-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.9.3[${MULTILIB_USEDEP}] + x11-libs/xtrans + >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] + >=x11-proto/xf86bigfontproto-1.2.0-r1[${MULTILIB_USEDEP}] + >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}] + >=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}] + >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]" +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 +) + +src_configure() { + XORG_CONFIGURE_OPTIONS=( + $(use_with doc xmlto) + $(use_enable doc specs) + $(use_enable ipv6) + --without-fop + ) + + [[ ${CHOST} == *-interix* ]] && export ac_cv_func_poll=no + xorg-2_src_configure +} + +multilib_src_compile() { + if tc-is-cross-compiler; then + # Make sure the build-time tool "makekeys" uses build settings. + tc-export_build_env BUILD_CC + emake -C src/util \ + CC="${BUILD_CC}" \ + CFLAGS="${BUILD_CFLAGS}" \ + LDFLAGS="${BUILD_LDFLAGS}" \ + clean all + fi + + default +} diff --git a/x11-libs/libX11/libX11-1.6.3.ebuild b/x11-libs/libX11/libX11-1.6.3.ebuild new file mode 100644 index 000000000000..71daac1156c7 --- /dev/null +++ b/x11-libs/libX11/libX11-1.6.3.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +XORG_DOC=doc +# needs automake-1.14 without eautoreconf +XORG_EAUTORECONF=yes +XORG_MULTILIB=yes +inherit xorg-2 toolchain-funcs + +DESCRIPTION="X.Org X11 library" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-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.9.3[${MULTILIB_USEDEP}] + x11-libs/xtrans + >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] + >=x11-proto/xf86bigfontproto-1.2.0-r1[${MULTILIB_USEDEP}] + >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}] + >=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}] + >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]" +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 +) + +src_configure() { + XORG_CONFIGURE_OPTIONS=( + $(use_with doc xmlto) + $(use_enable doc specs) + $(use_enable ipv6) + --without-fop + ) + + [[ ${CHOST} == *-interix* ]] && export ac_cv_func_poll=no + xorg-2_src_configure +} + +multilib_src_compile() { + if tc-is-cross-compiler; then + # Make sure the build-time tool "makekeys" uses build settings. + tc-export_build_env BUILD_CC + emake -C src/util \ + CC="${BUILD_CC}" \ + CFLAGS="${BUILD_CFLAGS}" \ + LDFLAGS="${BUILD_LDFLAGS}" \ + clean all + fi + + default +} diff --git a/x11-libs/libX11/metadata.xml b/x11-libs/libX11/metadata.xml new file mode 100644 index 000000000000..ef95d0c2c840 --- /dev/null +++ b/x11-libs/libX11/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>x11</herd> +<upstream> + <remote-id type="cpe">cpe:/a:x.org:libx11</remote-id> +</upstream> +</pkgmetadata> |