Fix build on m68k, bug #458590

(Portage version: 2.2.01.22097-prefix/svn/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)

4 files changed, 70 insertions, 20 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index f64e0dc310..b316ea82c6 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for media-libs/fontconfig
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.161 2012/05/05 08:02:34 jdhore Exp $
 
+  12 Jul 2013; Fabian Groffen <grobian@gentoo.org>
+  +files/fontconfig-2.9.0-m68k.patch, fontconfig-2.9.0.ebuild:
+  Fix build on m68k, bug #458590
+
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> fontconfig-2.8.0-r1.ebuild,
   fontconfig-2.8.0-r2.ebuild, fontconfig-2.9.0.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
@@ -698,4 +702,3 @@
 
   30 Sep 2002; Martin Schlemmer <azarah@gentoo.org> fontconfig-2.0.ebuild :
   Initial version.
-
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 2703d5ac3d..0902c2b11f 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX fontconfig-2.3.2-docbook.patch 506 RMD160 c205d99ecc19866da8d0ac4ef7172dcef98a6299 SHA1 1054f38cef09c93baf34f08253345ca2ae638e4a SHA256 c6480dcf19fec22126a9205fa3d9b317e5a97613f86218cf1926a2a07848afd5
-AUX fontconfig-2.6.0-parallel.patch 437 RMD160 5a8ab14d0d86f19d0658768a37927bf1761b3d3c SHA1 f12963e627d0735aed4e3c5b9b16331fd293ce4a SHA256 0f0a2fd2ad9241aa680f2c4fa607cc7898e9d8e8aa585b68d47961f82cf424e8
-AUX fontconfig-2.6.0-winnt.patch 5343 RMD160 c0d673c300a05ecc4fc0d23997bd828913fa880a SHA1 15bf405f000a860b8aa7d8dec0d0e9592679428b SHA256 08a338a648acd6041dc9f17cec759fef6b6e35022ae998b7f295ffdff306df51
-AUX fontconfig-2.7.1-latin-reorder.patch 1701 RMD160 ea313617ab751d328e0c4cfb75262ed2acc9a4ef SHA1 e079a3d03c4e2e4dfd36131689694159591ce4bf SHA256 cd27212a9e8a3045106fd427f2e5079ea348789c8760e7af443c2745479c8f82
-AUX fontconfig-2.8.0-urw-aliases.patch 509 RMD160 b735f3bf416f79e82f2b0944e80972514c313ef6 SHA1 6af46fdd965cee43ec461cb2a4bd5e1fdffc8dd9 SHA256 4a1e122dd3b140765163ca72eba8c2c52daa9e9459ddbcb6a2eba9a5bebe76d4
-DIST fontconfig-2.8.0.tar.gz 1548409 RMD160 fefee412cad4fa71b573e997e14f1df12f439be2 SHA1 570fb55eb14f2c92a7b470b941e9d35dbfafa716 SHA256 fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335
-DIST fontconfig-2.9.0.tar.gz 1682774 RMD160 9456d0ab2ae72086ec3edce9d72e007e2bf9bf1e SHA1 1ab2f437c2261028ae7969892277af2d8d8db489 SHA256 ca7e25071cf044bdcdaf7c48845243c115b9269b4e369c6bd78a29e71f01b41a
-EBUILD fontconfig-2.8.0-r1.ebuild 4753 RMD160 8fbb846b1e490ccc0a4be5bd5dff089e09183b39 SHA1 de9d5413f083a2d4e6f8e788c58ce94fccf5f7d8 SHA256 ad8b526aa00e961c8e66d59743397cbbf1d4954d314d3a6c27a38b3d6137d5a3
-EBUILD fontconfig-2.8.0-r2.ebuild 4847 RMD160 94df0844573758509be09f227472e1d5c1cae08a SHA1 ba000f3224e634aa48bf612d134d1cef42ab7d32 SHA256 e289ef14c5db992f5d02e86ffe748c88453417f0818bb66cbc5869cf617549fa
-EBUILD fontconfig-2.9.0.ebuild 4745 RMD160 3be4c954f6ff8bd8c7e1396b3ed3a3c9e00cff62 SHA1 c93c2f247e8aed68e47c5406b5be961bc34e6e0d SHA256 fd717951eb63554a37af02dcee285ca374c147208cc45644fd023cb5da30f8f0
-MISC ChangeLog 25492 RMD160 aebe7a59088c0e781aadcf851b33bf6e78af78ef SHA1 36e24e979680d57bdd06b7a1e417563f7aefded7 SHA256 3679027433c0c6fb287e6a73ec4b9567c572991168f5396512ea8e7311d499dd
-MISC metadata.xml 419 RMD160 898b8233ab233060d8137dadf28c291b83a65500 SHA1 ee62c352812f8765122e5a65b7df5f8794c6c485 SHA256 859faa6fc0c008e92a6432f0fd50a760170d724b15997e557d5d73088277c4db
+AUX fontconfig-2.3.2-docbook.patch 506 SHA256 c6480dcf19fec22126a9205fa3d9b317e5a97613f86218cf1926a2a07848afd5 SHA512 8c5bc39c6d5c3b0457c626c678c0a7c94c5e5a4f041b5b2a42df04701750961e24950135d2e6df4d4e1c64a7f28e50a2533ab154d7226cf0a63db0853149f64f WHIRLPOOL 84de35d8f5755a10eb170b2f54afc5b89f4c1757b10f053adc9b5e96aebcd5bbfc47d16963f01a2b3bc0f791a736439b3317f823221794f9fc93e5c57162734f
+AUX fontconfig-2.6.0-parallel.patch 437 SHA256 0f0a2fd2ad9241aa680f2c4fa607cc7898e9d8e8aa585b68d47961f82cf424e8 SHA512 48c6e335f8985f316aec2c1c122aeadb60a0d48babf44483ff643b22394aa8044b69ba83e105580d27ce95cae86728c2a5b51eb4b58436efb30259bd2df6332c WHIRLPOOL 14e11b1b692a3355096dc18a62a5be9725a0d41e29343fd04b4a21ab679ce7f7ee7494498e77a016338efb19b1dba47e6ccd99964fa7f2d6f28850b4e7a46526
+AUX fontconfig-2.6.0-winnt.patch 5343 SHA256 08a338a648acd6041dc9f17cec759fef6b6e35022ae998b7f295ffdff306df51 SHA512 a08cb69cb553b9f2078609215d67f9af174cbaddf4032ca9daf7ba7415ab5d21d13169f4941589da69389a0fe6451bd406bd99a68c2ac70d02af2d5452b1aae0 WHIRLPOOL 86ffd3b4f2b6a2941f385faa196b09284fb6a4897d8798b14ac76677870aef4701ff92241dde0ca3b54b8ff5239717adae489aa96492a3b7d201d0e7dd661887
+AUX fontconfig-2.7.1-latin-reorder.patch 1701 SHA256 cd27212a9e8a3045106fd427f2e5079ea348789c8760e7af443c2745479c8f82 SHA512 8fc514649e40ecd0c52e4fef9479e0945baa3aaa396335650bf827a983f6d9187b0f66ab97bf5b11b14917518b2e955b0a1bca126a336feafbebf754ff646d5d WHIRLPOOL e6e90c38c7ce04e297c48f5b9859c5e9230a59e9722dacde5ddd434cca8fbd33fab55f704df540eea3f3efd6ee05884987e6ce5da544d2b41f869e47ce3d259d
+AUX fontconfig-2.8.0-urw-aliases.patch 509 SHA256 4a1e122dd3b140765163ca72eba8c2c52daa9e9459ddbcb6a2eba9a5bebe76d4 SHA512 774c57a28e10eb666c18e69dd7cf59fe1110fe13bbbade185dbd21be4917d4d7fb632be56805b2739ea9b47ee96560c8dd1d3d1916fed56ac32a16757a911f7e WHIRLPOOL 11d7056d1830a7e48aea00a22bb81397c9025f59817fd476dc26083e7ac2603aefd2ace261dfd04df78b6caa8d9c07f66027f37438b4677a7efe28b3cff260b6
+AUX fontconfig-2.9.0-m68k.patch 1704 SHA256 9ada04dcfe213ce8bfe8fa606a4d25ca93ca1b78b3385a09b456fc1df1e0b62b SHA512 4a5635e92f34e5159f4fca3b6699035906db30c352cca0f5ab5ded513aba8e08127e5db5d816b2cefcf7ebfddcd69e6d6b2a3d6ea7347da712613bd44341c118 WHIRLPOOL 882a4605381f22c3741c0e0e2356c44c00cc01c4159dcac50fd23dcaefc4e81b2881c1597dc1347c32732114022230ae90f365d57230fd75980821f32bbcbc40
+DIST fontconfig-2.8.0.tar.gz 1548409 SHA256 fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335 SHA512 a110e72cc631f1e374324a02f6ba9526b89a547cafe2ae27b9913938b19018843b2940084d62f0dfaf38a6919dea6974fb98422d3908026f6873d5fba17c55a0 WHIRLPOOL cb7c5c461bcb0a0f6ef93d24a10506512beb99233a1f81d904321577c4023e38c7090806c616b8224689400fc4e2209e26aa20aa1f0ad84b2fcad5477061a003
+DIST fontconfig-2.9.0.tar.gz 1682774 SHA256 ca7e25071cf044bdcdaf7c48845243c115b9269b4e369c6bd78a29e71f01b41a SHA512 1e91132141756c7455b97fb4d7773b8c0812d98d0c0f5f137c728d6f03cb4601a7f2857c246bd63619d47a8d9aeceb475a16dd625bfc085e235e85b04d29014f WHIRLPOOL a3814b4b2a1b86cedde702545defbcfbca7d3d61ecf512f37a09b5c4041ebb317aadcde1553be534e70d30c212729f547b50cbcd3102226fa92a7c75a7e55620
+EBUILD fontconfig-2.8.0-r1.ebuild 4753 SHA256 ad8b526aa00e961c8e66d59743397cbbf1d4954d314d3a6c27a38b3d6137d5a3 SHA512 f480ab2da6ecaf1436c7ec2164830406c9b2cf47aa6bd29c0e61cbff3d0d7176efb6b45f077654d5ee0230323779087c1ae7334c866547d34dfe63cd29bb62b4 WHIRLPOOL 92317033e0fa047e5ba541492144014e5c8e0b90cef5913d2331c18b97376652d412cc11d58fd4d58c8fa7f3e5b7cacf4ff45a8dd2c39ae1aa33fe173d290fb0
+EBUILD fontconfig-2.8.0-r2.ebuild 4847 SHA256 e289ef14c5db992f5d02e86ffe748c88453417f0818bb66cbc5869cf617549fa SHA512 238d7c4a703def392129a5fb7ab0fead300c48c1de0b5c78a5ea7d8da482a22882f888b4633d7256f5f264a9acde396b09d5dacf92e9666ec597cda7c815ed3c WHIRLPOOL ddf149ee513739ab16416b0811776a684473cd1eb7ef7a2b665115075045dc6044e29e24837b09fa35040d94e97df48a548f195c704d6facccaca4b588de533d
+EBUILD fontconfig-2.9.0.ebuild 4802 SHA256 16f956c7451e0b6ae573e81aaffeecf0d170ecf01c2ba78acfe1a896a75bbd7f SHA512 b0076fdcf2cf5fd47566ccc0863f3d1ffb46fdd7a3b9de5dbc310a23b2a4bd28b4eaaab6b45ff0bae31976fe5b53fc17cff603c92032b96d5df9bb764a957f1e WHIRLPOOL 0935487cea7f6f2dd42a1d50854e9df0e5c6264947632d6697601348ab0a1921bbd77971f17502eb756d349798ec2cbffe824ce52685b9fa029088a42a6295c4
+MISC ChangeLog 25639 SHA256 806a76d0a2e0e2f4a29c5facf1aad5b3d2879d9edcc9262cccc6a77cbeb102f4 SHA512 56ee22b11aaeb50db51c824d2ff5c8236877755fec373fe31238e31d3e44f0aabde3b75b164b9d67b3001de116d970681c1b67953a7496ad53398ffe44619c89 WHIRLPOOL 07925bcfdd41a1460a0c50f632bcf244a237aac457a2187d6f9eb38944fe2115165a3e0eabbb45b1eb32af06c904c6068516e67b04d73a89387fcb1401c85f3a
+MISC metadata.xml 419 SHA256 859faa6fc0c008e92a6432f0fd50a760170d724b15997e557d5d73088277c4db SHA512 81f3d095bec15c4181c0f6f068de5ab08e1ff48e5bbd715b20572f7f1cd632c355a529d74fceff6d7f0c1c7c4ef44f31be003f12c85b938907cf6624893686eb WHIRLPOOL 1a660ae53987795db3a8e66085f9f35de759862583657184fb4dbb227eefabca77ed8afd12262bef038732539463676e0343437044f3fb6cc0d72c41d5a87729
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (SunOS)
+Version: GnuPG v2.0.20 (SunOS)
 
-iEYEARECAAYFAk+3qK4ACgkQX3X2B8XHTolF5gCePIq/jG2nGXbxBjhiOClPIhCR
-UhwAniXBGpBVrOO4C/0kxjOBWFA8TAs1
-=8nha
+iEYEAREIAAYFAlHgXYAACgkQX3X2B8XHTolq1QCfbaWZB9rhgYb2hsksa3BUHIe+
+Y8kAn1CzKWjz8ZFC3h4MHkw03RPe+5+E
+=Xur5
 -----END PGP SIGNATURE-----
diff --git a/media-libs/fontconfig/files/fontconfig-2.9.0-m68k.patch b/media-libs/fontconfig/files/fontconfig-2.9.0-m68k.patch
new file mode 100644
index 0000000000..8c3495be47
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.9.0-m68k.patch
@@ -0,0 +1,45 @@
+On Tue, 01 May 2012 17:39:05 +0000, Thorsten Glaser <tg@mirbsd.de> wrote:
+> Source: fontconfig
+> Version: 2.9.0-2
+> Severity: serious
+> Justification: fails to build from source (but built successfully in the past)
+> 
+> Hi,
+> 
+> the failing line is probably this one:
+>      59 FC_ASSERT_STATIC (0x08 + 1*ALIGNOF_DOUBLE == sizeof (FcValue));
+
+I've sent this patch upstream. Please test and report back.
+
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue May 1 19:23:12 2012 -0700
+
+    Deal with architectures where ALIGNOF_DOUBLE < 4
+    
+    This patch isn't really tested as I don't have such a machine, but I
+    have a bug report that on m68k machines, double values are aligned on
+    smaller than 4 byte boundaries. If ALIGNOF_DOUBLE < sizeof(int),
+    the "expected" sizeof of FcValue is miscomputed. Use the maximum of 4
+    (sizeof (int)) and ALIGNOF_DOUBLE when computing the expected size of
+    FcValue.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+diff --git a/src/fcarch.c b/src/fcarch.c
+index 09d24b3..5fe7d97 100644
+--- a/src/fcarch.c
++++ b/src/fcarch.c
+@@ -56,7 +56,9 @@ FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcStrSet *));
+ FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcCharLeaf **));
+ FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcChar16 *));
+ 
+-FC_ASSERT_STATIC (0x08 + 1*ALIGNOF_DOUBLE == sizeof (FcValue));
++#define FC_MAX(a,b)    ((a) > (b) ? (a) : (b))
++
++FC_ASSERT_STATIC (0x08 + 1*FC_MAX(4,ALIGNOF_DOUBLE) == sizeof (FcValue));
+ FC_ASSERT_STATIC (0x00 + 2*SIZEOF_VOID_P == sizeof (FcPatternElt));
+ FC_ASSERT_STATIC (0x08 + 2*SIZEOF_VOID_P == sizeof (FcPattern));
+ FC_ASSERT_STATIC (0x08 + 2*SIZEOF_VOID_P == sizeof (FcCharSet));
+
+-- 
+keith.packard@intel.com
diff --git a/media-libs/fontconfig/fontconfig-2.9.0.ebuild b/media-libs/fontconfig/fontconfig-2.9.0.ebuild
index a74cfce7d1..567726912c 100644
--- a/media-libs/fontconfig/fontconfig-2.9.0.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.9.0.ebuild,v 1.2 2012/05/05 08:02:34 jdhore Exp $
 
@@ -32,6 +32,7 @@ PDEPEND="!x86-winnt? ( app-admin/eselect-fontconfig )
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.7.1-latin-reorder.patch	# 130466
 	epatch "${FILESDIR}"/${PN}-2.3.2-docbook.patch			# 310157
+	epatch "${FILESDIR}"/${PN}-2.9.0-m68k.patch				# 458590
 
 	if [[ ${CHOST} == *-winnt* ]] ; then
 		epatch "${FILESDIR}"/${PN}-2.6.0-winnt.patch