diff options
author | Sven 'sleipnir' Rebhan <odinshorse@googlemail.com> | 2009-03-27 08:17:53 +0000 |
---|---|---|
committer | Sven 'sleipnir' Rebhan <odinshorse@googlemail.com> | 2009-03-27 08:17:53 +0000 |
commit | 4682650ca74117c2a2b81ddcd3769e43329178b2 (patch) | |
tree | 8df12bf044b15dec64d558a6c0898c5202f5544a /x11-libs | |
parent | Sync to upstream commited patch. (diff) | |
download | embedded-cross-4682650ca74117c2a2b81ddcd3769e43329178b2.tar.gz embedded-cross-4682650ca74117c2a2b81ddcd3769e43329178b2.tar.bz2 embedded-cross-4682650ca74117c2a2b81ddcd3769e43329178b2.zip |
Sync to upstream submitted patch.
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/libX11/Manifest | 4 | ||||
-rw-r--r-- | x11-libs/libX11/files/libX11-1.1.5-xtrans_connection_flags-configure.patch | 11 | ||||
-rw-r--r-- | x11-libs/libX11/libX11-1.1.5.ebuild | 12 |
3 files changed, 17 insertions, 10 deletions
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest index 45ba490..3427abc 100644 --- a/x11-libs/libX11/Manifest +++ b/x11-libs/libX11/Manifest @@ -1,7 +1,9 @@ +AUX #libX11-1.1.5-crosscompile-makekeys.patch# 1766 RMD160 82373a2b84b0a72db3bd2fcf8f8b98b24887c934 SHA1 129a7b8348e3d89d3c6ef250e691b47e08d0e06d SHA256 abaa4ada89286f4295bfdc402914fa010ac65f4c6d7577b233a6070b199829c4 AUX libX11-1.1.3-crosscompile-makekeys.patch 1884 RMD160 73c0c5a6a48cc98f50ac6bb35c098f5594150a08 SHA1 a3b2ec48cdfb1a1c021528a41ed7e7241ad623f0 SHA256 e116bf288bf780c1d81aacb20845613c1bb5de13509e912b0b8d219acf36b737 AUX libX11-1.1.3-xcb-locking.patch 966 RMD160 59f9bc11591454bea86e30574866d070dafcd3fb SHA1 3a0838317ba656aec70732353fccc38e26d466b6 SHA256 944357ec53cb862f7b4b7dfe16f876adfa5a1f5ad35bdd0f74d11ae7dc3ecab2 AUX libX11-1.1.5-crosscompile-makekeys.patch 1765 RMD160 4db118b3792d2a72c98f893a9d319791f574a272 SHA1 a78a6434a3b9ebf83901af435b5ef6b852903029 SHA256 40499aa232be2355ab1a9215e07541a9c67c974f325613b46cd767eb7d853dda +AUX libX11-1.1.5-xtrans_connection_flags-configure.patch 460 RMD160 dcf0cfc8dd8a6185d9c95413f1ea60bf9d974539 SHA1 0f3bc001c17074dbf3df92a197b3d8f57b3ba87a SHA256 4f9d46c9953585fc51da177e0f92eea951bc2da0ba7305a505ac63299c237330 DIST libX11-1.1.3.tar.bz2 1526958 RMD160 fcb8d5d31befa0ae227210dc7274c17b30c37fad SHA1 235f69172b262f874d2a2d7bd17e8197aea5b767 SHA256 4a2f566e2ea5dd955c875cb8fa9c18dd725324fc5cf4e23c803442e31ab8917a DIST libX11-1.1.5.tar.bz2 1585005 RMD160 78567a999640851e7daba1ab44603ec099d0b619 SHA1 b703cb7c97e5aa35bf04a8df798e128ae16cf0d0 SHA256 da9272900e41615e9c5dc25d84730b8966da6f5c8f4c40418dca2ad040fc8b82 EBUILD libX11-1.1.3-r1.ebuild 1534 RMD160 7525d37a8d187ee287b6f8f711e26da5a4094656 SHA1 29a039230f61d113ddd004f80a5514fbfdb7c2fd SHA256 980975d8013f1628e16faeb62d698dfbd7d2d4f3a12ffe1282391e434b9bf4f0 -EBUILD libX11-1.1.5.ebuild 1238 RMD160 f70243cbcb9dc1731f0a0056c687cb0243a88a3b SHA1 e618d012114a2a28eee24e7d4b260a3d562e0a5e SHA256 c0733b78332eb554c97db2ec68fe8e6ac10c3596ded2065934805ec43850d1f3 +EBUILD libX11-1.1.5.ebuild 1043 RMD160 df89fb55bb0eba583ac47a5562f51db38692a8fc SHA1 012a78cb695e5592a6087ff738409a6599149236 SHA256 6ef405220451f12fc709fb8988dc47af2fe8196f18ea818c35eeb55b1d3ed173 diff --git a/x11-libs/libX11/files/libX11-1.1.5-xtrans_connection_flags-configure.patch b/x11-libs/libX11/files/libX11-1.1.5-xtrans_connection_flags-configure.patch new file mode 100644 index 0000000..603a4ef --- /dev/null +++ b/x11-libs/libX11/files/libX11-1.1.5-xtrans_connection_flags-configure.patch @@ -0,0 +1,11 @@ +--- configure.ac 2009-03-27 07:42:25.000000000 +0000 ++++ configure.ac.new 2009-03-27 07:43:00.000000000 +0000 +@@ -59,7 +59,7 @@ + dnl first and if it's not in the default location, that you set the ACLOCAL + dnl environment variable to find it, such as: + dnl ACLOCAL="aclocal -I ${PREFIX}/share/aclocal" +-m4_pattern_forbid(XTRANS_CONNECTION_FLAGS) ++m4_pattern_allow(XTRANS_CONNECTION_FLAGS) + + # Transport selection macro from xtrans.m4 + XTRANS_CONNECTION_FLAGS diff --git a/x11-libs/libX11/libX11-1.1.5.ebuild b/x11-libs/libX11/libX11-1.1.5.ebuild index c02f7c5..f7797c3 100644 --- a/x11-libs/libX11/libX11-1.1.5.ebuild +++ b/x11-libs/libX11/libX11-1.1.5.ebuild @@ -3,8 +3,9 @@ # $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.1.5.ebuild,v 1.1 2008/09/06 06:56:34 dberkholz Exp $ # Must be before x-modular eclass is inherited -#SNAPSHOT="yes" -PATCHES="${FILESDIR}/${P}-crosscompile-makekeys.patch" +SNAPSHOT="yes" +PATCHES="${FILESDIR}/${P}-xtrans_connection_flags-configure.patch + ${FILESDIR}/${P}-crosscompile-makekeys.patch" inherit x-modular toolchain-funcs flag-o-matic @@ -30,10 +31,3 @@ CONFIGURE_OPTIONS="$(use_enable ipv6) # xorg really doesn't like xlocale disabled. # $(use_enable nls xlocale) -x-modular_src_compile() { - x-modular_src_configure - # [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for 'makekeys' - ( filter-flags -m* ; cd src/util && make CC=$(tc-getBUILD_CC) CFLAGS="${CFLAGS}" LDFLAGS="" clean all) - x-modular_src_make -} - |