From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2579 invoked by alias); 29 Nov 2013 16:09:20 -0000 Mailing-List: contact java-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: java-patches-owner@gcc.gnu.org Received: (qmail 2567 invoked by uid 89); 29 Nov 2013 16:09:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.0 required=5.0 tests=AWL,BAYES_20,RDNS_NONE autolearn=no version=3.3.2 X-HELO: einhorn.in-berlin.de Received: from Unknown (HELO einhorn.in-berlin.de) (192.109.42.8) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Fri, 29 Nov 2013 16:09:17 +0000 X-Envelope-From: doko@ubuntu.com Received: from [192.168.42.220] (dslb-088-073-114-231.pools.arcor-ip.net [88.73.114.231]) (authenticated bits=0) by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id rATG96u0000779 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Fri, 29 Nov 2013 17:09:07 +0100 Message-ID: <5298BC1B.3030604@ubuntu.com> Date: Fri, 29 Nov 2013 16:09:00 -0000 From: Matthias Klose User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.1.1 MIME-Version: 1.0 To: GCJ-patches CC: classpath-patches@gnu.org Subject: [patch] modernize freetype includes Content-Type: multipart/mixed; boundary="------------000809030404040405080406" X-IsSubscribed: yes X-SW-Source: 2013-q4/txt/msg00003.txt.bz2 This is a multi-part message in MIME format. --------------000809030404040405080406 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Content-length: 349 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 --------------000809030404040405080406 Content-Type: text/plain; charset=UTF-8; name="libjava-freetype.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="libjava-freetype.diff" Content-length: 1325 # 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 #include #include -#include -#include +#include +#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 #include #include -#include -#include -#include -#include +#include +#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" --------------000809030404040405080406--