diff options
Diffstat (limited to 'www')
13 files changed, 156 insertions, 48 deletions
diff --git a/www/firefox-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/firefox-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp new file mode 100644 index 000000000000..bc141062f7c6 --- /dev/null +++ b/www/firefox-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp @@ -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" diff --git a/www/firefox-esr/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/firefox-esr/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp new file mode 100644 index 000000000000..bc141062f7c6 --- /dev/null +++ b/www/firefox-esr/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp @@ -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" diff --git a/www/firefox/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/firefox/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp new file mode 100644 index 000000000000..bc141062f7c6 --- /dev/null +++ b/www/firefox/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp @@ -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" diff --git a/www/firefox10/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/firefox10/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp new file mode 100644 index 000000000000..bc141062f7c6 --- /dev/null +++ b/www/firefox10/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp @@ -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" diff --git a/www/firefox15/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/firefox15/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp new file mode 100644 index 000000000000..bc141062f7c6 --- /dev/null +++ b/www/firefox15/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp @@ -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" diff --git a/www/firefox3-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/firefox3-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp new file mode 100644 index 000000000000..bc141062f7c6 --- /dev/null +++ b/www/firefox3-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp @@ -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" diff --git a/www/firefox35/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/firefox35/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp new file mode 100644 index 000000000000..bc141062f7c6 --- /dev/null +++ b/www/firefox35/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp @@ -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" diff --git a/www/firefox36/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/firefox36/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp new file mode 100644 index 000000000000..bc141062f7c6 --- /dev/null +++ b/www/firefox36/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp @@ -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" diff --git a/www/flock/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/flock/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp new file mode 100644 index 000000000000..bc141062f7c6 --- /dev/null +++ b/www/flock/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp @@ -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" diff --git a/www/mozilla-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/mozilla-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp new file mode 100644 index 000000000000..bc141062f7c6 --- /dev/null +++ b/www/mozilla-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp @@ -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" diff --git a/www/mozilla/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/mozilla/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp index b7f272ee767a..bc141062f7c6 100644 --- a/www/mozilla/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp +++ b/www/mozilla/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp @@ -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; - }; - - class nsFontXftInfo; -@@ -1066,7 +1067,7 @@ - } - - 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; +--- 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" diff --git a/www/seamonkey/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/seamonkey/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp new file mode 100644 index 000000000000..bc141062f7c6 --- /dev/null +++ b/www/seamonkey/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp @@ -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" diff --git a/www/seamonkey2/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/seamonkey2/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp new file mode 100644 index 000000000000..bc141062f7c6 --- /dev/null +++ b/www/seamonkey2/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp @@ -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" |