From: Matthias Klose <doko@ubuntu.com>
To: GCJ-patches <java-patches@gcc.gnu.org>
Cc: classpath-patches@gnu.org
Subject: [patch] modernize freetype includes
Date: Fri, 29 Nov 2013 16:09:00 -0000 [thread overview]
Message-ID: <5298BC1B.3030604@ubuntu.com> (raw)
[-- 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"
next reply other threads:[~2013-11-29 16:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-29 16:09 Matthias Klose [this message]
2013-11-29 16:22 ` [cp-patches] " Andrew Haley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5298BC1B.3030604@ubuntu.com \
--to=doko@ubuntu.com \
--cc=classpath-patches@gnu.org \
--cc=java-patches@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).