[gentoo-commits] gentoo-x86 commit in media-gfx/graphite2/files: graphite2-1.2.0-solaris.patch

[Fabian Groffen (grobian)]

grobian     12/12/28 11:37:40

  Added:                graphite2-1.2.0-solaris.patch
  Log:
  Fixed and keyworded for ~x64-solaris
  
  (Portage version: 2.2.01.21418-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)

Revision  Changes    Path
1.1                  media-gfx/graphite2/files/graphite2-1.2.0-solaris.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphite2/files/graphite2-1.2.0-solaris.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphite2/files/graphite2-1.2.0-solaris.patch?rev=1.1&content-type=text/plain

Index: graphite2-1.2.0-solaris.patch
===================================================================
Bidi: undef conflicting constants

On Solaris ES and CS are already defined, resulting in compilation
errors.  Since we won't need Solaris' ones here, simply undef them.

--- graphite2-1.2.0/src/Bidi.cpp
+++ graphite2-1.2.0/src/Bidi.cpp
@@ -30,6 +30,14 @@
 
 using namespace graphite2;
 
+/* Solaris' headers define these */
+#ifdef ES
+# undef ES
+#endif
+#ifdef CS
+# undef CS
+#endif
+
 enum DirCode {  // Hungarian: dirc
         Unk        = -1,
         N          =  0,   // other neutrals (default) - ON