Fix compilation on Solaris by applying the same fix as for Darwin

Package-Manager: portage-2.2.00.15842-prefix/cvs/SunOS i386

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index da84250b43c23d26f3e7e151e629e16cc01ad65a..9e17a569c58caaad4433eefdbb553578f2b1ad27 100644 (file)
--- 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/Manifest b/x11-libs/openmotif/Manifest
index 8fb40dc88cc27b0d0fd92db603dfb9b5638ae44f..38daca572edb07f831719b3c8072e37d7e7e7da5 100644 (file)
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX Mwm.defaults 536 RMD160 99fc40c2e923b53a14b2911c37064f2c9cd3f63b SHA1 ddbe7ab7af3a8caf6ccb9d6ab2c721ce5940edd1 SHA256 5373d8c7bd5460ce83bda99f08725fe9154cd4b5ca2b0698e5a0fda10e50f250
 AUX openmotif-2.3.1-ac-editres.patch 358 RMD160 2bace990711052d7d26a405aa63d6696a33ca50c SHA1 a83e8567f5bc9998f9cbdfbfafce007ac44009a8 SHA256 6ef38a5a3532e3a8d6be85549026410340da0d98aa97dd683aeb70eb5b9c5d52
 AUX openmotif-2.3.1-multilist-stipple.patch 819 RMD160 756e0a20223b157f127197c74c5d71087a06c51f SHA1 c81c77fa9c47f463a851f3591ba9f370c4c7a347 SHA256 2ccc3b9292eb8a2f6eab49198ea54f51bc243d14b64b4bd07aea6712526dd828
-AUX openmotif-2.3.2-darwin.patch 485 RMD160 28edaf08c8e267b01c5afbd0d3dbf2c7d5ca8eea SHA1 f5823efcb4de3a37429000da58d859e0c9e71e30 SHA256 b0e7139dc091d8da390cc896e8e4a0cf04b7ca5599df9eb71ab4cceff6b01657
+AUX openmotif-2.3.2-darwin.patch 598 RMD160 4620a16ae1d3205950f55a117adb6640660abce0 SHA1 afd704097e3e54ab64630a31fed2f88f007c1f43 SHA256 e08b783770b5e1bea7cd2ccd02b7cad7d655ef6d5ae1fc28698072b70ec2a9c3
 AUX openmotif-2.3.2-ddd-layout.patch 274 RMD160 a99f67abb3722b993cc0ef5277dc5f39aacc7bed SHA1 58f93f5b8b376de628f6d406af9a94662b489000 SHA256 f3de455ff830de4cb08a5cc8ee0bba10bb730bbc8ab448749ce99b98329e13e0
 AUX openmotif-2.3.2-ldflags.patch 654 RMD160 8756d40e95f64a851838042f9cf2152a1b6e9f61 SHA1 f0f9958a259487b0ef6c9d0d9daf8ab2415faa1d SHA256 70236c905c93a50354d990fdb500ba32b94bb28b90ccf8b4ca5052d4ac23ca80
 AUX openmotif-2.3.2-libpng14.patch 339 RMD160 0c4b88048ef382c9690c467263e51b845b7240ae SHA1 1ff64ff0bf948d7a96751114c8d374b689b3cbe0 SHA256 54dde5fa69a3a1fc99455b57317c7c004dad050071d6b41e356e184e72dedf32
@@ -14,12 +11,5 @@ DIST openmotif-2.3.2.tar.gz 5941784 RMD160 2346a93fcec57b9c18b6657d1cc681b6001cb
 DIST openmotif-2.3.3.tar.gz 6051202 RMD160 015323e212e91ea3beaf039593de5ba75b01e4a6 SHA1 2a51e2f28078c4db7ff0c8517eb257001716b699 SHA256 c85f5545e218fa0c59a3789192132d472fc5a33e914a221a568eee4fc10cd103
 EBUILD openmotif-2.3.2-r2.ebuild 5153 RMD160 5cffb961a77b306da159901685d419f2b9c797f9 SHA1 75ada11ad611fa585dcb4bb3af1ce7ac6d80acb8 SHA256 abd64a6afcc1ba2d7d6a7c79cae5e17f7b1f72e23d7c8634046aa47c836e50af
 EBUILD openmotif-2.3.3.ebuild 4924 RMD160 572df28476bd5bce9697ea3fd410b353c5d66885 SHA1 f876472795283a671ed6f364dd9df3b3b0c24001 SHA256 33b64d325ac3d533e27f79bf6b85d6ef6c984054528b6e0df72e9df694f5a5da
-MISC ChangeLog 35871 RMD160 5eab5d8c92be7e0d6c00b0c81cd676127f77752a SHA1 c3464a3c72f4a1e6d4cb5cc2090c8584815849fa SHA256 4822a09794b857eac16954e0749fae208187082c0c465a8b5d332a225d4c28e4
+MISC ChangeLog 36033 RMD160 91b28dd8e67954a315a054113c7910c152374077 SHA1 be68633801ffb6b2b9751fa760943d5f695d1d82 SHA256 08616dfe9fc25afb1d585d856ac6b07a0ed189829cba24cc80d54795431b53af
 MISC metadata.xml 219 RMD160 e4108515c4905448a3f0666974dfe0606bee0527 SHA1 02c240887d922c73610257891793b3bdec27fc8e SHA256 c1572876b54cc63c7b7ecad4c9adf1b6460d166c41e84b1df0322c5df6497ffb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwM78wACgkQOeoy/oIi7uz/cgCgpAvAVwSBwrtjtbi2HLgS4ph3
-hygAnRt1DuwD8SuXGVztyhBC2y/4Tg5T
-=zU44
------END PGP SIGNATURE-----

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 feae00305ad6c1a57c1cc8b967ee58343a0c2c13..859fcf3c40471030bcf0107fe5de0f298d58ed71 100644 (file)
--- 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"