commit df593427ca25d2231b0d98fd918970736616bcac
Author: Jan Rękorajski <[email protected]>
Date: Mon Oct 12 07:53:04 2015 +0200
- don't use deprecated freetype function name
freetype.patch | 11 +++++++++++
iceweasel.spec | 2 ++
2 files changed, 13 insertions(+)
---
diff --git a/iceweasel.spec b/iceweasel.spec
index 9b7acef..a9a56f3 100644
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -52,6 +52,7 @@ Patch10: %{name}-packaging.patch
Patch11: system-virtualenv.patch
Patch12: Disable-Firefox-Health-Report.patch
Patch13: no-logging.patch
+Patch14: freetype.patch
URL: http://www.pld-linux.org/Packages/Iceweasel
BuildRequires: OpenGL-devel
BuildRequires: ImageMagick
@@ -222,6 +223,7 @@ echo 'LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS)' >>
extensions/spellcheck/src/Mak
%patch11 -p2
%patch12 -p1
%patch13 -p2
+%patch14 -p2
cp -a xulrunner/installer/*.pc.in browser/installer/
diff --git a/freetype.patch b/freetype.patch
new file mode 100644
index 0000000..8d9d2cb
--- /dev/null
+++ b/freetype.patch
@@ -0,0 +1,11 @@
+--- iceweasel-41.0.1/mozilla/gfx/skia/trunk/src/ports/SkFontHost_FreeType.cpp~
2015-09-29 23:44:50.000000000 +0200
++++ iceweasel-41.0.1/mozilla/gfx/skia/trunk/src/ports/SkFontHost_FreeType.cpp
2015-10-12 07:51:10.791980529 +0200
+@@ -557,7 +557,7 @@
+ info->fEmSize = 1000;
+
+ bool cid = false;
+- const char* fontType = FT_Get_X11_Font_Format(face);
++ const char* fontType = FT_Get_Font_Format(face);
+ if (strcmp(fontType, "Type 1") == 0) {
+ info->fType = SkAdvancedTypefaceMetrics::kType1_Font;
+ } else if (strcmp(fontType, "CID Type 1") == 0) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iceweasel.git/commitdiff/df593427ca25d2231b0d98fd918970736616bcac
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
