[gentoo-commits] gentoo-x86 commit in x11-libs/openmotif/files: openmotif-2.3.2-darwin.patch

[gentoo-commits] gentoo-x86 commit in x11-libs/openmotif/files: openmotif-2.3.2-darwin.patch

[Fabian Groffen (grobian)]

grobian     10/03/20 17:48:10

  Added:                openmotif-2.3.2-darwin.patch
  Log:
  Add patch to fix compilation on Mac OS X using patch grabbed from upstream bugtracker
  (Portage version: 2.2.00.15819-prefix/cvs/Darwin powerpc)

Revision  Changes    Path
1.1                  x11-libs/openmotif/files/openmotif-2.3.2-darwin.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/files/openmotif-2.3.2-darwin.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/files/openmotif-2.3.2-darwin.patch?rev=1.1&content-type=text/plain

Index: openmotif-2.3.2-darwin.patch
===================================================================
http://bugs.motifzone.net/showattachment.cgi?attach_id=259
http://bugs.motifzone.net/long_list.cgi?buglist=1479

--- 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 @@
 #include "UilIODef.h"
 #include "UilDiagDef.h"
 #include "UilSarDef.h"
-#if defined(linux)
+#if defined(linux) || defined(__APPLE__)
 #define YYSTYPE yystype
 #endif
 #include "UilLexPars.h"

[gentoo-commits] gentoo-x86 commit in x11-libs/openmotif/files: openmotif-2.3.2-darwin.patch

[Fabian Groffen (grobian)]

grobian     10/06/23 13:17:27

  Modified:             openmotif-2.3.2-darwin.patch
  Log:
  Fix compilation on Solaris by applying the same fix as for Darwin
  (Portage version: 2.2.00.15842-prefix/cvs/SunOS i386)

Revision  Changes    Path
1.2                  x11-libs/openmotif/files/openmotif-2.3.2-darwin.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/openmotif/files/openmotif-2.3.2-darwin.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/openmotif/files/openmotif-2.3.2-darwin.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/openmotif/files/openmotif-2.3.2-darwin.patch?r1=1.1&r2=1.2

Index: openmotif-2.3.2-darwin.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/files/openmotif-2.3.2-darwin.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openmotif-2.3.2-darwin.patch	20 Mar 2010 17:48:10 -0000	1.1
+++ openmotif-2.3.2-darwin.patch	23 Jun 2010 13:17:27 -0000	1.2
@@ -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 @@
  #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"