mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00
Code Issues Releases Activity

Fix build with freetype2-2.1.7.

Browse Source
This commit is contained in:
Joe Marcus Clarke 2004-03-17 07:12:34 +00:00
parent dd246fa159
commit dbe1712ce3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=104255
17 changed files with 202 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mail/thunderbird-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp Normal file
View File

@ -0,0 +1,12 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004
+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004
@@ -65,7 +65,8 @@
#include <gdk/gdkx.h>
#include <freetype/tttables.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#define FORCE_PR_LOG
#include "prlog.h"

12
mail/thunderbird-esr/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp Normal file
View File

@ -0,0 +1,12 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004
+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004
@@ -65,7 +65,8 @@
#include <gdk/gdkx.h>
#include <freetype/tttables.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#define FORCE_PR_LOG
#include "prlog.h"

12
mail/thunderbird/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp Normal file
View File

@ -0,0 +1,12 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004
+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004
@@ -65,7 +65,8 @@
#include <gdk/gdkx.h>
#include <freetype/tttables.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#define FORCE_PR_LOG
#include "prlog.h"

12
mail/thunderbird3/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp Normal file
View File

@ -0,0 +1,12 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004
+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004
@@ -65,7 +65,8 @@
#include <gdk/gdkx.h>
#include <freetype/tttables.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#define FORCE_PR_LOG
#include "prlog.h"

12
www/firefox-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp Normal file
View File

@ -0,0 +1,12 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004
+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004
@@ -65,7 +65,8 @@
#include <gdk/gdkx.h>
#include <freetype/tttables.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#define FORCE_PR_LOG
#include "prlog.h"

12
www/firefox-esr/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp Normal file
View File

@ -0,0 +1,12 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004
+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004
@@ -65,7 +65,8 @@
#include <gdk/gdkx.h>
#include <freetype/tttables.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#define FORCE_PR_LOG
#include "prlog.h"

12
www/firefox/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp Normal file
View File

@ -0,0 +1,12 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004
+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004
@@ -65,7 +65,8 @@
#include <gdk/gdkx.h>
#include <freetype/tttables.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#define FORCE_PR_LOG
#include "prlog.h"

12
www/firefox10/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp Normal file
View File

@ -0,0 +1,12 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004
+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004
@@ -65,7 +65,8 @@
#include <gdk/gdkx.h>
#include <freetype/tttables.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#define FORCE_PR_LOG
#include "prlog.h"

12
www/firefox15/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp Normal file
View File

@ -0,0 +1,12 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004
+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004
@@ -65,7 +65,8 @@
#include <gdk/gdkx.h>
#include <freetype/tttables.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#define FORCE_PR_LOG
#include "prlog.h"

12
www/firefox3-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp Normal file
View File

@ -0,0 +1,12 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004
+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004
@@ -65,7 +65,8 @@
#include <gdk/gdkx.h>
#include <freetype/tttables.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#define FORCE_PR_LOG
#include "prlog.h"

12
www/firefox35/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp Normal file
View File

@ -0,0 +1,12 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004
+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004
@@ -65,7 +65,8 @@
#include <gdk/gdkx.h>
#include <freetype/tttables.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#define FORCE_PR_LOG
#include "prlog.h"

12
www/firefox36/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp Normal file
View File

@ -0,0 +1,12 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004
+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004
@@ -65,7 +65,8 @@
#include <gdk/gdkx.h>
#include <freetype/tttables.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#define FORCE_PR_LOG
#include "prlog.h"

12
www/flock/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp Normal file
View File

@ -0,0 +1,12 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004
+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004
@@ -65,7 +65,8 @@
#include <gdk/gdkx.h>
#include <freetype/tttables.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#define FORCE_PR_LOG
#include "prlog.h"

12
www/mozilla-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp Normal file
View File

@ -0,0 +1,12 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004
+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004
@@ -65,7 +65,8 @@
#include <gdk/gdkx.h>
#include <freetype/tttables.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#define FORCE_PR_LOG
#include "prlog.h"

56
www/mozilla/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
View File

@ -1,48 +1,12 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Tue Jan 6 19:20:28 2004
+++ gfx/src/gtk/nsFontMetricsXft.cpp Fri Jan 16 22:36:20 2004
@@ -105,6 +105,7 @@
FcPattern *mPattern;
FcPattern *mFontName;
FcCharSet *mCharset;
+ int mNotXft;
};
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004
+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004
@@ -65,7 +65,8 @@
class nsFontXftInfo;
@@ -1066,7 +1067,7 @@
}
#include <gdk/gdkx.h>
#include <freetype/tttables.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(0);
- if (font->HasChar(aChar))
+ if (font->HasChar(aChar) && font->GetXftFont())
return font;
// We failed to find the character in the best-match font, so load
@@ -1947,6 +1948,7 @@
FcPatternReference(mFontName);
mXftFont = nsnull;
+ mNotXft = 0;
// set up our charset
mCharset = nsnull;
@@ -1973,7 +1975,7 @@
XftFont *
nsFontXft::GetXftFont(void)
{
- if (!mXftFont) {
+ if (!mXftFont && !mNotXft) {
FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName);
if (!pat)
return nsnull;
@@ -1992,8 +1994,10 @@
FcPatternDel(pat, FC_SPACING);
mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat);
- if (!mXftFont)
+ if (!mXftFont) {
FcPatternDestroy(pat);
+ mNotXft = 1;
+ }
}
return mXftFont;
#define FORCE_PR_LOG
#include "prlog.h"

12
www/seamonkey/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp Normal file
View File

@ -0,0 +1,12 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004
+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004
@@ -65,7 +65,8 @@
#include <gdk/gdkx.h>
#include <freetype/tttables.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#define FORCE_PR_LOG
#include "prlog.h"

12
www/seamonkey2/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp Normal file
View File

@ -0,0 +1,12 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004
+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004
@@ -65,7 +65,8 @@
#include <gdk/gdkx.h>
#include <freetype/tttables.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#define FORCE_PR_LOG
#include "prlog.h"