Odoo Server (MOVED TO GITHUB)

Merge lp:~dobtor/openobject-server/trunk-bugfix-1213683 into lp:openobject-server

  1. trunk-bugfix-1213683
  2. Merge into trunk
Proposed by Andy Cheng
Status: Needs review
Proposed branch: lp:~dobtor/openobject-server/trunk-bugfix-1213683
Merge into: lp:openobject-server
Diff against target: 22 lines (+5/-0)
1 file modified
openerp/report/render/rml2pdf/customfonts.py (+5/-0)
To merge this branch: bzr merge lp:~dobtor/openobject-server/trunk-bugfix-1213683
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+180737@code.launchpad.net

Description of the change

Add the font search path for FreeBSD

To post a comment you must log in.

Unmerged revisions

4937. By Andy Cheng

[FIX] Fixed missing report font search path for FreeBSD

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'openerp/report/render/rml2pdf/customfonts.py'
--- openerp/report/render/rml2pdf/customfonts.py 2013-05-28 18:51:47 +0000
+++ openerp/report/render/rml2pdf/customfonts.py 2013-08-18 18:48:54 +0000
@@ -71,6 +71,10 @@
71 '/usr/share/fonts/TTF', # Arch Linux71 '/usr/share/fonts/TTF', # Arch Linux
72 ]72 ]
7373
74TTFSearchPath_FreeBSD = [
75 '/usr/local/share/fonts/TruType', # FreeBSD
76 ]
77
74TTFSearchPath_Windows = [78TTFSearchPath_Windows = [
75 'c:/winnt/fonts',79 'c:/winnt/fonts',
76 'c:/windows/fonts'80 'c:/windows/fonts'
@@ -89,6 +93,7 @@
89 'Darwin': TTFSearchPath_Darwin,93 'Darwin': TTFSearchPath_Darwin,
90 'Windows': TTFSearchPath_Windows,94 'Windows': TTFSearchPath_Windows,
91 'Linux': TTFSearchPath_Linux,95 'Linux': TTFSearchPath_Linux,
96 'freebsd': TTFSearchPath_FreeBSD
92}97}
9398
94# ----- The code below is less distro-specific, please avoid editing! -------99# ----- The code below is less distro-specific, please avoid editing! -------