diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2013-12-01 19:19:39 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2013-12-01 19:19:39 +0000 |
| commit | 27d1234d2eb81c2d504d09b76480373deb2572f7 (patch) | |
| tree | c9c81f2855af4a6745c64c592dd878ace936768e /media-libs/fontconfig | |
| parent | arm stable, bug #492350 (diff) | |
| download | gentoo-2-27d1234d2eb81c2d504d09b76480373deb2572f7.tar.gz gentoo-2-27d1234d2eb81c2d504d09b76480373deb2572f7.tar.bz2 gentoo-2-27d1234d2eb81c2d504d09b76480373deb2572f7.zip | |
Fix compilation on Solaris
(Portage version: 2.2.7-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Diffstat (limited to 'media-libs/fontconfig')
| -rw-r--r-- | media-libs/fontconfig/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/fontconfig/files/fontconfig-2.11.0-solaris.patch | 27 | ||||
| -rw-r--r-- | media-libs/fontconfig/fontconfig-2.11.0.ebuild | 3 |
3 files changed, 34 insertions, 2 deletions
diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog index b29d654609cb..567d4cdeecf6 100644 --- a/media-libs/fontconfig/ChangeLog +++ b/media-libs/fontconfig/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/fontconfig # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.187 2013/10/21 04:13:31 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.188 2013/12/01 19:19:39 grobian Exp $ + + 01 Dec 2013; Fabian Groffen <grobian@gentoo.org> + +files/fontconfig-2.11.0-solaris.patch, fontconfig-2.11.0.ebuild: + Fix compilation on Solaris *fontconfig-2.11.0 (21 Oct 2013) diff --git a/media-libs/fontconfig/files/fontconfig-2.11.0-solaris.patch b/media-libs/fontconfig/files/fontconfig-2.11.0-solaris.patch new file mode 100644 index 000000000000..c712c6f79286 --- /dev/null +++ b/media-libs/fontconfig/files/fontconfig-2.11.0-solaris.patch @@ -0,0 +1,27 @@ +continuation of 4a741e9a0ab8dbaa0c377fbfed41547645ac79af + +--- test/test-migration.c ++++ test/test-migration.c +@@ -33,6 +33,7 @@ + { + DIR *d = opendir (dir); + struct dirent *e; ++ struct stat statb; + size_t len = strlen (dir); + char *n = NULL; + FcBool ret = FcTrue; +@@ -53,7 +54,13 @@ + strcpy (n, dir); + n[len] = '/'; + strcpy (&n[len + 1], e->d_name); +- if (e->d_type == DT_DIR) ++ if (lstat (n, &statb) < 0) ++ { ++ fprintf (stderr, "E: %s\n", n); ++ ret = FcFalse; ++ break; ++ } ++ if (S_ISDIR(statb.st_mode)) + { + if (!unlink_dirs (n)) + { diff --git a/media-libs/fontconfig/fontconfig-2.11.0.ebuild b/media-libs/fontconfig/fontconfig-2.11.0.ebuild index 603fda32c38e..93f79b030461 100644 --- a/media-libs/fontconfig/fontconfig-2.11.0.ebuild +++ b/media-libs/fontconfig/fontconfig-2.11.0.ebuild @@ -1,6 +1,6 @@ # 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.11.0.ebuild,v 1.1 2013/10/21 04:13:31 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.11.0.ebuild,v 1.2 2013/12/01 19:19:39 grobian Exp $ EAPI=5 AUTOTOOLS_AUTORECONF=yes @@ -34,6 +34,7 @@ PDEPEND="!x86-winnt? ( app-admin/eselect-fontconfig ) PATCHES=( "${FILESDIR}"/${PN}-2.7.1-latin-reorder.patch # 130466 "${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157 + "${FILESDIR}"/${PN}-2.11.0-solaris.patch ) pkg_setup() { |