Attachment 139605 Details for Bug 185886 – file.diff

[patch] file.diff

file.diff (text/plain), 5.33 KB, created by Alexander Kabaev on 2014-01-19 17:40:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Kabaev

Created: 2014-01-19 17:40:00 UTC

Size: 5.33 KB

patch

obsolete

>Index: files/patch-moz-freetype
>===================================================================
>--- files/patch-moz-freetype	(revision 0)
>+++ files/patch-moz-freetype	(working copy)
>@@ -0,0 +1,73 @@
>+--- moz/makefile.mk.orig	2014-01-19 01:07:07.855312217 +0000
>++++ moz/makefile.mk	2014-01-19 01:52:13.738105035 +0000
>+@@ -99,7 +99,8 @@
>+     patches/respect_disable_pango.patch \
>+     patches/arm_build_fix.patch \
>+     patches/link_fontconfig.patch \
>+-    patches/brokenmakefile.patch
>++    patches/brokenmakefile.patch \
>++    patches/freetype-2.5.2.patch
>+ 
>+ .IF "$(OS)"=="LINUX"
>+ PATCH_FILES+=patches/nss_linux.patch
>+--- moz/patches/freetype-2.5.2.patch.orig	2014-01-19 02:08:44.972045426 +0000
>++++ moz/patches/freetype-2.5.2.patch	2014-01-19 01:50:19.634112115 +0000
>+@@ -0,0 +1,58 @@
>++--- misc/build/mozilla/gfx/src/cairo/nsFontMetricsXft.cpp.orig	2014-01-19 01:36:54.695173876 +0000
>+++++ misc/build/mozilla/gfx/src/cairo/nsFontMetricsXft.cpp	2014-01-19 01:38:33.919160907 +0000
>++@@ -67,8 +67,8 @@
>++ #include "nsFontConfigUtils.h"
>++ 
>++ #include <gdk/gdkx.h>
>++-#include <freetype/tttables.h>
>++-#include <freetype/freetype.h>
>+++#include <freetype2/tttables.h>
>+++#include <freetype2/freetype.h>
>++ 
>++ #define FORCE_PR_LOG
>++ #include "prlog.h"
>++--- misc/build/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp.orig	2014-01-19 01:37:10.706181045 +0000
>+++++ misc/build/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp	2014-01-19 01:38:52.345183245 +0000
>++@@ -58,7 +58,7 @@
>++ #include <fontconfig/fontconfig.h>
>++ #include <gdk/gdk.h>
>++ #include <gdk/gdkx.h>
>++-#include <freetype/tttables.h>
>+++#include <freetype2/tttables.h>
>++ 
>++ #include "mozilla-decoder.h"
>++ 
>++--- misc/build/mozilla/gfx/src/gtk/nsFontMetricsXft.cpp.orig	2014-01-19 01:37:20.985169675 +0000
>+++++ misc/build/mozilla/gfx/src/gtk/nsFontMetricsXft.cpp	2014-01-19 01:39:00.273161078 +0000
>++@@ -67,8 +67,8 @@
>++ #include "nsFontConfigUtils.h"
>++ 
>++ #include <gdk/gdkx.h>
>++-#include <freetype/tttables.h>
>++-#include <freetype/freetype.h>
>+++#include <freetype2/tttables.h>
>+++#include <freetype2/freetype.h>
>++ 
>++ #define FORCE_PR_LOG
>++ #include "prlog.h"
>++--- misc/build/mozilla/config/system-headers.orig	2014-01-19 01:48:32.986127183 +0000
>+++++ misc/build/mozilla/config/system-headers	2014-01-19 01:49:12.081124339 +0000
>++@@ -193,12 +193,12 @@
>++ fpieee.h
>++ frame/log.h
>++ frame/req.h
>++-freetype/freetype.h
>++-freetype/ftcache.h
>++-freetype/ftglyph.h
>++-freetype/ftoutln.h
>++-freetype/ttnameid.h
>++-freetype/tttables.h
>+++freetype2/freetype.h
>+++freetype2/ftcache.h
>+++freetype2/ftglyph.h
>+++freetype2/ftoutln.h
>+++freetype2/ttnameid.h
>+++freetype2/tttables.h
>++ fribidi/fribidi.h
>++ FSp_fopen.h
>++ fstream.h
>
>Property changes on: files/patch-moz-freetype
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: files/patch-nss
>===================================================================
>--- files/patch-nss	(revision 0)
>+++ files/patch-nss	(working copy)
>@@ -0,0 +1,28 @@
>+--- nss/makefile.mk.orig	2013-12-10 16:12:48.903023896 +0000
>++++ nss/makefile.mk	2013-12-10 16:16:12.910996825 +0000
>+@@ -71,6 +71,7 @@
>+ USE_64:=1
>+ .EXPORT : USE_64
>+ .ENDIF			# "$(CPU)"=="X"
>++PATCH_FILES+=nss_freebsd.patch
>+ .ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
>+ 
>+ .IF "$(OS)"=="MACOSX"
>+--- nss/nss_freebsd.patch.orig	2013-12-10 16:15:49.120991795 +0000
>++++ nss/nss_freebsd.patch	2013-12-10 16:31:17.356953373 +0000
>+@@ -0,0 +1,15 @@
>++--- misc/build/nss-3.12.6/mozilla/security/coreconf/FreeBSD.mk.orig	2009-08-22 07:33:09.000000000 +0200
>+++++ misc/build/nss-3.12.6/mozilla/security/coreconf/FreeBSD.mk	2010-03-28 23:01:33.000000000 +0200
>++@@ -37,9 +37,9 @@
>++ 
>++ include $(CORE_DEPTH)/coreconf/UNIX.mk
>++ 
>++-DEFAULT_COMPILER	= gcc
>++-CC			= gcc
>++-CCC			= g++
>+++DEFAULT_COMPILER	= $(CC)
>+++CC			?= gcc
>+++CCC			= $(CXX)
>++ RANLIB			= ranlib
>++ 
>++ CPU_ARCH		= $(OS_TEST)
>
>Property changes on: files/patch-nss
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Index: files/patch-vcl::source::glyphs::graphite_adaptors.cxx
>===================================================================
>--- files/patch-vcl::source::glyphs::graphite_adaptors.cxx	(revision 0)
>+++ files/patch-vcl::source::glyphs::graphite_adaptors.cxx	(working copy)
>@@ -0,0 +1,11 @@
>+--- vcl/source/glyphs/graphite_adaptors.cxx.orig	2014-01-19 00:20:15.734490860 +0000
>++++ vcl/source/glyphs/graphite_adaptors.cxx	2014-01-19 00:20:35.462483753 +0000
>+@@ -45,7 +45,7 @@
>+ 
>+ #include <salgdi.hxx>
>+ 
>+-#include <freetype/ftsynth.h>
>++#include <freetype2/ftsynth.h>
>+ 
>+ // Module
>+ #include "gcach_ftyp.hxx"
>
>Property changes on: files/patch-vcl::source::glyphs::graphite_adaptors.cxx
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 185886: 139605