harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r415051 - in /incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules: README.txt awt/make/native/linux/X11Wrapper.xml awt/make/native/linux/linuxfont.xml awt/src/linux/native/linuxfont/LinuxNativeFont.c
Date Sat, 17 Jun 2006 19:58:15 GMT
Author: hindessm
Date: Sat Jun 17 12:58:14 2006
New Revision: 415051

URL: http://svn.apache.org/viewvc?rev=415051&view=rev
Log:
Applying fixes from "[#HARMONY-534] Minor compile/consistency fixes for HARMONY-528 X11/Xft
on linux".

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/README.txt
    incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/make/native/linux/X11Wrapper.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/make/native/linux/linuxfont.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/src/linux/native/linuxfont/LinuxNativeFont.c

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/README.txt
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/README.txt?rev=415051&r1=415050&r2=415051&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/README.txt
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/README.txt
Sat Jun 17 12:58:14 2006
@@ -194,7 +194,7 @@
        |    +--- png.h
        |    +--- pngconf.h
        |    +--- libpng.lib and/or libpng.ia32 and/or libpng.ipf
-       \---cms
+       \---lcms
        |    |
        |    +--- icc34.h
        |    +--- lcms.h

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/make/native/linux/X11Wrapper.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/make/native/linux/X11Wrapper.xml?rev=415051&r1=415050&r2=415051&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/make/native/linux/X11Wrapper.xml
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/make/native/linux/X11Wrapper.xml
Sat Jun 17 12:58:14 2006
@@ -101,7 +101,7 @@
 
             <compilerarg value="-I${jni_h.path}"/>
             <compilerarg value="-I${lib_tmp}"/>
-            <compilerarg value="-I/usr/X11R6/include/X11"/>
+            <compilerarg value="-I/usr/X11R6/include"/>
 
             <compilerarg value="-fPIC" if="if.linux"/>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/make/native/linux/linuxfont.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/make/native/linux/linuxfont.xml?rev=415051&r1=415050&r2=415051&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/make/native/linux/linuxfont.xml
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/make/native/linux/linuxfont.xml
Sat Jun 17 12:58:14 2006
@@ -31,7 +31,7 @@
 
         <property name="target.os" value="unix"/>
         <property name="library.ext" value=".so"/>
-        <property name="include" value="-I/usr/X11R6/include/X11/Xft -I/usr/include/freetype2/freetype/internal
-I/usr/include/freetype2/freetype/config -I/usr/include/freetype2 -I/usr/include/freetype2/freetype"/>
+        <property name="include" value="-I/usr/X11R6/include -I/usr/include/freetype2/freetype/internal
-I/usr/include/freetype2/freetype/config -I/usr/include/freetype2 -I/usr/include/freetype2/freetype"/>
 
         <path id="dir.current">
             <pathelement path="${ant.file}"/>
@@ -104,7 +104,7 @@
             <compilerarg value="-I${lib_tmp}"/>
             <compilerarg value="-I${jni_h.path}"/>
 
-            <compilerarg value="-I/usr/X11R6/include/X11/Xft"/>
+            <compilerarg value="-I/usr/X11R6/include"/>
             <compilerarg value="-I/usr/include/freetype2/freetype/internal"/>
             <compilerarg value="-I/usr/include/freetype2/freetype/config"/>
             <compilerarg value="-I/usr/include/freetype2"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/src/linux/native/linuxfont/LinuxNativeFont.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/src/linux/native/linuxfont/LinuxNativeFont.c?rev=415051&r1=415050&r2=415051&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/src/linux/native/linuxfont/LinuxNativeFont.c
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/src/linux/native/linuxfont/LinuxNativeFont.c
Sat Jun 17 12:58:14 2006
@@ -21,7 +21,7 @@
  * platform. Font data obtained using Xft, FreeType and FontConfig libraries.
  * 
  */
-#include <Xft.h>
+#include <X11/Xft/Xft.h>
 #include <tttables.h>
 #include <t1tables.h>
 #include <tttypes.h>



Mime
View raw message