* [patch] modernize freetype includes
@ 2013-11-29 16:09 Matthias Klose
2013-11-29 16:22 ` [cp-patches] " Andrew Haley
0 siblings, 1 reply; 2+ messages in thread
From: Matthias Klose @ 2013-11-29 16:09 UTC (permalink / raw)
To: GCJ-patches; +Cc: classpath-patches
[-- Attachment #1: Type: text/plain, Size: 349 bytes --]
At least on Debian/Ubuntu freetype 2.5.1 doesn't install the header files in a
freetype subdirectory anymore. According to [1] this isn't supported anymore
after freetype 2.1, and the macros are available since prehistoric 2.0.1
(released in 2000). Now using the recommended inclusion schema.
Ok for trunk and the active gcc branches?
Matthias
[-- Attachment #2: libjava-freetype.diff --]
[-- Type: text/plain, Size: 1325 bytes --]
# DP: Fix libjava/classpath freetype includes
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c,
native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c:
Fix freetype includes.
--- a/src/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
+++ b/src/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
@@ -42,8 +42,9 @@
#include <pango/pango.h>
#include <pango/pangoft2.h>
#include <pango/pangofc-font.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
+#include <ft2build.h>
+#include FT_GLYPH_H
+#include FT_OUTLINE_H
#include "jcl.h"
#include "gdkfont.h"
#include "gnu_java_awt_peer_gtk_FreetypeGlyphVector.h"
--- a/src/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
+++ b/src/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
@@ -39,10 +39,11 @@
#include <pango/pango.h>
#include <pango/pangoft2.h>
#include <pango/pangofc-font.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
-#include <freetype/fttypes.h>
-#include <freetype/tttables.h>
+#include <ft2build.h>
+#include FT_GLYPH_H
+#include FT_OUTLINE_H
+#include FT_TYPES_H
+#include FT_TRUETYPE_TABLES_H
#include "gdkfont.h"
#include "gtkpeer.h"
#include "gnu_java_awt_peer_gtk_GdkFontPeer.h"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [cp-patches] [patch] modernize freetype includes
2013-11-29 16:09 [patch] modernize freetype includes Matthias Klose
@ 2013-11-29 16:22 ` Andrew Haley
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Haley @ 2013-11-29 16:22 UTC (permalink / raw)
To: Matthias Klose; +Cc: GCJ-patches, classpath-patches
On 11/29/2013 04:08 PM, Matthias Klose wrote:
> At least on Debian/Ubuntu freetype 2.5.1 doesn't install the header files in a
> freetype subdirectory anymore. According to [1] this isn't supported anymore
> after freetype 2.1, and the macros are available since prehistoric 2.0.1
> (released in 2000). Now using the recommended inclusion schema.
>
> Ok for trunk and the active gcc branches?
OK, thanks.
Andrew.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-11-29 16:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-11-29 16:09 [patch] modernize freetype includes Matthias Klose
2013-11-29 16:22 ` [cp-patches] " Andrew Haley
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).