summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2010-06-23 13:17:27 +0000
committerFabian Groffen <grobian@gentoo.org>2010-06-23 13:17:27 +0000
commit66be3f902f5d331224175b762886a2074b325848 (patch)
tree6cd80ed9059e59832b5b4ef38dae7f2345c076e1 /x11-libs/openmotif
parentVersion bump, #191982 (diff)
downloadgentoo-2-66be3f902f5d331224175b762886a2074b325848.tar.gz
gentoo-2-66be3f902f5d331224175b762886a2074b325848.tar.bz2
gentoo-2-66be3f902f5d331224175b762886a2074b325848.zip
Fix compilation on Solaris by applying the same fix as for Darwin
(Portage version: 2.2.00.15842-prefix/cvs/SunOS i386)
Diffstat (limited to 'x11-libs/openmotif')
-rw-r--r--x11-libs/openmotif/ChangeLog6
-rw-r--r--x11-libs/openmotif/files/openmotif-2.3.2-darwin.patch5
2 files changed, 9 insertions, 2 deletions
diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index da84250b43c2..9e17a569c58c 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/openmotif
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.240 2010/06/07 13:09:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.241 2010/06/23 13:17:27 grobian Exp $
+
+ 23 Jun 2010; Fabian Groffen <grobian@gentoo.org>
+ files/openmotif-2.3.2-darwin.patch:
+ Fix compilation on Solaris by applying the same fix as for Darwin
07 Jun 2010; Ulrich Mueller <ulm@gentoo.org> -openmotif-2.3.2.ebuild:
Remove old.
diff --git a/x11-libs/openmotif/files/openmotif-2.3.2-darwin.patch b/x11-libs/openmotif/files/openmotif-2.3.2-darwin.patch
index feae00305ad6..859fcf3c4047 100644
--- a/x11-libs/openmotif/files/openmotif-2.3.2-darwin.patch
+++ b/x11-libs/openmotif/files/openmotif-2.3.2-darwin.patch
@@ -1,6 +1,9 @@
http://bugs.motifzone.net/showattachment.cgi?attach_id=259
http://bugs.motifzone.net/long_list.cgi?buglist=1479
+Extend the patch to include guard for sun to solve the exact same
+compilation issue on Solaris.
+
--- openmotif-2.3.2.org/clients/uil/UilDefI.h 2004-11-18 08:54:32.000000000 +0000
+++ openmotif-2.3.2/clients/uil/UilDefI.h 2009-11-08 13:24:29.000000000 +0000
@@ -283,7 +283,7 @@
@@ -8,7 +11,7 @@ http://bugs.motifzone.net/long_list.cgi?buglist=1479
#include "UilDiagDef.h"
#include "UilSarDef.h"
-#if defined(linux)
-+#if defined(linux) || defined(__APPLE__)
++#if defined(linux) || defined(__APPLE__) || defined(sun)
#define YYSTYPE yystype
#endif
#include "UilLexPars.h"