fonts-Missing_Fonts: Update Arial font, replace Courier New font with Liberation Mono, and add a replacment font for Times New Roman.

README.md

@@ -39,7 +39,7 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 -----------------------------------
 
-**Bug fixes and features included in the next upcoming release [10]:**
+**Bug fixes and features included in the next upcoming release [12]:**
 
 * Add stub for winspool.SetPrinterW level 8 ([Wine Bug #24645](https://bugs.winehq.org/show_bug.cgi?id=24645))
 * Allow non-nullterminated string as working directory in kernel32.create_startup_info
@@ -47,6 +47,8 @@ Included bug fixes and improvements
 * Fix access violation in MSYS2 git when cloning repository
 * Fix error handling in DeferWindowPos when passing an invalid HWND ([Wine Bug #23187](https://bugs.winehq.org/show_bug.cgi?id=23187))
 * Fix failure to create anonymous file mapping after failed open_fd server call
+* Implement a Courier New replacement font ([Wine Bug #20456](https://bugs.winehq.org/show_bug.cgi?id=20456))
+* Implement a Times New Roman replacement font ([Wine Bug #32342](https://bugs.winehq.org/show_bug.cgi?id=32342))
 * Map EXDEV error code to STATUS_NOT_SAME_DEVICE
 * Return a dummy BIOS name in Win32_BIOS record
 * SHFileOperation with FO_MOVE should create new directory on Vista+ ([Wine Bug #25207](https://bugs.winehq.org/show_bug.cgi?id=25207))

patches/fonts-Missing_Fonts/0005-Add-licenses-for-fonts-as-separate-files.patch

@@ -1,24 +1,26 @@
-From ebffa4fe8484cc98c5912758bf23400145d43684 Mon Sep 17 00:00:00 2001
+From 716e01da20f456686805373f13860410e1d65513 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 20 Dec 2014 23:10:38 +0100
 Subject: Add licenses for fonts as separate files.
 
 ---
- COPYING.arial |  56 +++++
- COPYING.cour  |  94 ++++++++
+ COPYING.arial |  65 ++++++
+ COPYING.cour  |  65 ++++++
  COPYING.msyh  | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ COPYING.times |  65 ++++++
  LICENSE       |  27 ++-
- 4 files changed, 850 insertions(+), 1 deletion(-)
+ 5 files changed, 895 insertions(+), 1 deletion(-)
  create mode 100644 COPYING.arial
  create mode 100644 COPYING.cour
  create mode 100644 COPYING.msyh
+ create mode 100644 COPYING.times
 
 diff --git a/COPYING.arial b/COPYING.arial
 new file mode 100644
-index 0000000..6b831ed
+index 0000000..b756428
 --- /dev/null
 +++ b/COPYING.arial
-@@ -0,0 +1,56 @@
+@@ -0,0 +1,65 @@
 +LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY
 +LIBERATION FONT SOFTWARE
 +
@@ -26,155 +28,135 @@ index 0000000..6b831ed
 +regardless of the delivery mechanism. Subject to the following terms, Red Hat,
 +Inc. ("Red Hat") grants to the user ("Client") a license to this work pursuant
 +to the GNU General Public License v.2 with the exceptions set forth below and
-+such other terms as our set forth in this End User License Agreement.
++such other terms as are set forth in this End User License Agreement.
 +
-+1.The Software and License Exception. LIBERATION font software  (the "Software")
-+consists of TrueType-OpenType formatted font software for rendering LIBERATION
-+typefaces in sans serif, serif, and monospaced character styles. You are licensed
-+to use, modify, copy, and distribute the Software pursuant to the GNU General
-+Public License v.2 with the following exceptions:
-+(a)As a special exception, if you create a document which uses this font, and
-+embed this font or unaltered portions of this font into the document, this font
-+does not by itself cause the resulting document to be covered by the GNU General
-+Public License. This exception does not however invalidate any other reasons why
-+the document might be covered by the GNU General Public License. If you modify
-+this font, you may extend this exception to your version of the font, but you
-+are not obligated to do so. If you do not wish to do so, delete this exception
-+statement from your version.
-+(b)As a further exception, any distribution of the object code of the Software
-+in a physical product must provide you the right to access and modify the source
-+code for the Software and to reinstall that modified version of the Software in
-+object code form on the same physical product on which you received it.
-+2.Intellectual Property Rights. The Software and each of its components,
-+including the source code, documentation, appearance, structure and organization
-+are owned by Red Hat and others and are protected under copyright and other laws.
-+Title to the Software and any component, or to any copy, modification, or merged
-+portion shall remain with the aforementioned, subject to the applicable license.
-+The "LIBERATION" trademark is a trademark of Red Hat, Inc. in the U.S. and other
-+countries. This agreement does not permit Client to distribute modified versions
-+of the Software using Red Hat's trademarks. If Client makes a redistribution of
-+a modified version of the Software, then Client must modify the files names to
-+remove any reference to the Red Hat trademarks and must not use the Red Hat
-+trademarks in any way to reference or promote the modified Software.
-+3.Limited Warranty. To the maximum extent permitted under applicable law, the
++ 1. The Software and License Exception. LIBERATION font software  (the
++"Software") consists of TrueType-OpenType formatted font software for rendering
++LIBERATION typefaces in sans-serif, serif, and monospaced character styles. You
++are licensed to use, modify, copy, and distribute the Software pursuant to the
++GNU General Public License v.2 with the following exceptions:
++
++  (a) As a special exception, if you create a document which uses this font,
++and embed this font or unaltered portions of this font into the document, this
++font does not by itself cause the resulting document to be covered by the GNU
++General Public License. This exception does not however invalidate any other
++reasons why the document might be covered by the GNU General Public License. If
++you modify this font, you may extend this exception to your version of the
++font, but you are not obligated to do so. If you do not wish to do so, delete
++this exception statement from your version.
++
++  (b) As a further exception, any distribution of the object code of the
++Software in a physical product must provide you the right to access and modify
++the source code for the Software and to reinstall that modified version of the
++Software in object code form on the same physical product on which you received
++it.
++
++ 2. Intellectual Property Rights. The Software and each of its components,
++including the source code, documentation, appearance, structure and
++organization are owned by Red Hat and others and are protected under copyright
++and other laws. Title to the Software and any component, or to any copy,
++modification, or merged portion shall remain with the aforementioned, subject
++to the applicable license. The "LIBERATION" trademark is a trademark of Red
++Hat, Inc. in the U.S. and other countries. This agreement does not permit
++Client to distribute modified versions of the Software using Red Hat's
++trademarks. If Client makes a redistribution of a modified version of the
++Software, then Client must modify the files names to remove any reference to
++the Red Hat trademarks and must not use the Red Hat trademarks in any way to
++reference or promote the modified Software.
++
++ 3. Limited Warranty. To the maximum extent permitted under applicable law, the
 +Software is provided and licensed "as is" without warranty of any kind,
 +expressed or implied, including the implied warranties of merchantability,
 +non-infringement or fitness for a particular purpose. Red Hat does not warrant
 +that the functions contained in the Software will meet Client's requirements or
 +that the operation of the Software will be entirely error free or appear
 +precisely as described in the accompanying documentation.
-+4.Limitation of Remedies and Liability. To the maximum extent permitted by
++
++ 4. Limitation of Remedies and Liability. To the maximum extent permitted by
 +applicable law, Red Hat or any Red Hat authorized dealer will not be liable to
 +Client for any incidental or consequential damages, including lost profits or
 +lost savings arising out of the use or inability to use the Software, even if
 +Red Hat or such dealer has been advised of the possibility of such damages.
-+5.General. If any provision of this agreement is held to be unenforceable, that
-+shall not affect the enforceability of the remaining provisions. This agreement
-+shall be governed by the laws of the State of North Carolina and of the United
-+States, without regard to any conflict of laws provisions, except that the
-+United Nations Convention on the International Sale of Goods shall not apply.
-+Copyright © 2007 Red Hat, Inc. All rights reserved. LIBERATION is a trademark
-+of Red Hat, Inc.
++
++ 5. General. If any provision of this agreement is held to be unenforceable,
++that shall not affect the enforceability of the remaining provisions. This
++agreement shall be governed by the laws of the State of North Carolina and of
++the United States, without regard to any conflict of laws provisions, except
++that the United Nations Convention on the International Sale of Goods shall not
++apply.
++Copyright © 2007-2011 Red Hat, Inc. All rights reserved. LIBERATION is a
++trademark of Red Hat, Inc.
 diff --git a/COPYING.cour b/COPYING.cour
 new file mode 100644
-index 0000000..847d4d7
+index 0000000..b756428
 --- /dev/null
 +++ b/COPYING.cour
-@@ -0,0 +1,94 @@
-+Copyright (c) 2013, Quote-Unquote Apps (http://quoteunquoteapps.com),
-+with Reserved Font Name Courier Prime.
+@@ -0,0 +1,65 @@
++LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY
++LIBERATION FONT SOFTWARE
 +
-+This Font Software is licensed under the SIL Open Font License, Version 1.1.
-+This license is copied below, and is also available with a FAQ at:
-+http://scripts.sil.org/OFL
++This agreement governs the use of the Software and any updates to the Software,
++regardless of the delivery mechanism. Subject to the following terms, Red Hat,
++Inc. ("Red Hat") grants to the user ("Client") a license to this work pursuant
++to the GNU General Public License v.2 with the exceptions set forth below and
++such other terms as are set forth in this End User License Agreement.
 +
++ 1. The Software and License Exception. LIBERATION font software  (the
++"Software") consists of TrueType-OpenType formatted font software for rendering
++LIBERATION typefaces in sans-serif, serif, and monospaced character styles. You
++are licensed to use, modify, copy, and distribute the Software pursuant to the
++GNU General Public License v.2 with the following exceptions:
 +
-+-----------------------------------------------------------
-+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-+-----------------------------------------------------------
++  (a) As a special exception, if you create a document which uses this font,
++and embed this font or unaltered portions of this font into the document, this
++font does not by itself cause the resulting document to be covered by the GNU
++General Public License. This exception does not however invalidate any other
++reasons why the document might be covered by the GNU General Public License. If
++you modify this font, you may extend this exception to your version of the
++font, but you are not obligated to do so. If you do not wish to do so, delete
++this exception statement from your version.
 +
-+PREAMBLE
-+The goals of the Open Font License (OFL) are to stimulate worldwide
-+development of collaborative font projects, to support the font creation
-+efforts of academic and linguistic communities, and to provide a free and
-+open framework in which fonts may be shared and improved in partnership
-+with others.
++  (b) As a further exception, any distribution of the object code of the
++Software in a physical product must provide you the right to access and modify
++the source code for the Software and to reinstall that modified version of the
++Software in object code form on the same physical product on which you received
++it.
 +
-+The OFL allows the licensed fonts to be used, studied, modified and
-+redistributed freely as long as they are not sold by themselves. The
-+fonts, including any derivative works, can be bundled, embedded,
-+redistributed and/or sold with any software provided that any reserved
-+names are not used by derivative works. The fonts and derivatives,
-+however, cannot be released under any other type of license. The
-+requirement for fonts to remain under this license does not apply
-+to any document created using the fonts or their derivatives.
++ 2. Intellectual Property Rights. The Software and each of its components,
++including the source code, documentation, appearance, structure and
++organization are owned by Red Hat and others and are protected under copyright
++and other laws. Title to the Software and any component, or to any copy,
++modification, or merged portion shall remain with the aforementioned, subject
++to the applicable license. The "LIBERATION" trademark is a trademark of Red
++Hat, Inc. in the U.S. and other countries. This agreement does not permit
++Client to distribute modified versions of the Software using Red Hat's
++trademarks. If Client makes a redistribution of a modified version of the
++Software, then Client must modify the files names to remove any reference to
++the Red Hat trademarks and must not use the Red Hat trademarks in any way to
++reference or promote the modified Software.
 +
-+DEFINITIONS
-+"Font Software" refers to the set of files released by the Copyright
-+Holder(s) under this license and clearly marked as such. This may
-+include source files, build scripts and documentation.
++ 3. Limited Warranty. To the maximum extent permitted under applicable law, the
++Software is provided and licensed "as is" without warranty of any kind,
++expressed or implied, including the implied warranties of merchantability,
++non-infringement or fitness for a particular purpose. Red Hat does not warrant
++that the functions contained in the Software will meet Client's requirements or
++that the operation of the Software will be entirely error free or appear
++precisely as described in the accompanying documentation.
 +
-+"Reserved Font Name" refers to any names specified as such after the
-+copyright statement(s).
++ 4. Limitation of Remedies and Liability. To the maximum extent permitted by
++applicable law, Red Hat or any Red Hat authorized dealer will not be liable to
++Client for any incidental or consequential damages, including lost profits or
++lost savings arising out of the use or inability to use the Software, even if
++Red Hat or such dealer has been advised of the possibility of such damages.
 +
-+"Original Version" refers to the collection of Font Software components as
-+distributed by the Copyright Holder(s).
-+
-+"Modified Version" refers to any derivative made by adding to, deleting,
-+or substituting -- in part or in whole -- any of the components of the
-+Original Version, by changing formats or by porting the Font Software to a
-+new environment.
-+
-+"Author" refers to any designer, engineer, programmer, technical
-+writer or other person who contributed to the Font Software.
-+
-+PERMISSION & CONDITIONS
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of the Font Software, to use, study, copy, merge, embed, modify,
-+redistribute, and sell modified and unmodified copies of the Font
-+Software, subject to the following conditions:
-+
-+1) Neither the Font Software nor any of its individual components,
-+in Original or Modified Versions, may be sold by itself.
-+
-+2) Original or Modified Versions of the Font Software may be bundled,
-+redistributed and/or sold with any software, provided that each copy
-+contains the above copyright notice and this license. These can be
-+included either as stand-alone text files, human-readable headers or
-+in the appropriate machine-readable metadata fields within text or
-+binary files as long as those fields can be easily viewed by the user.
-+
-+3) No Modified Version of the Font Software may use the Reserved Font
-+Name(s) unless explicit written permission is granted by the corresponding
-+Copyright Holder. This restriction only applies to the primary font name as
-+presented to the users.
-+
-+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-+Software shall not be used to promote, endorse or advertise any
-+Modified Version, except to acknowledge the contribution(s) of the
-+Copyright Holder(s) and the Author(s) or with their explicit written
-+permission.
-+
-+5) The Font Software, modified or unmodified, in part or in whole,
-+must be distributed entirely under this license, and must not be
-+distributed under any other license. The requirement for fonts to
-+remain under this license does not apply to any document created
-+using the Font Software.
-+
-+TERMINATION
-+This license becomes null and void if any of the above conditions are
-+not met.
-+
-+DISCLAIMER
-+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-+OTHER DEALINGS IN THE FONT SOFTWARE.
++ 5. General. If any provision of this agreement is held to be unenforceable,
++that shall not affect the enforceability of the remaining provisions. This
++agreement shall be governed by the laws of the State of North Carolina and of
++the United States, without regard to any conflict of laws provisions, except
++that the United Nations Convention on the International Sale of Goods shall not
++apply.
++Copyright © 2007-2011 Red Hat, Inc. All rights reserved. LIBERATION is a
++trademark of Red Hat, Inc.
 diff --git a/COPYING.msyh b/COPYING.msyh
 new file mode 100644
 index 0000000..94a9ed0
@@ -855,8 +837,79 @@ index 0000000..94a9ed0
 +the library.  If this is what you want to do, use the GNU Lesser General
 +Public License instead of this License.  But first, please read
 +<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+diff --git a/COPYING.times b/COPYING.times
+new file mode 100644
+index 0000000..b756428
+--- /dev/null
++++ b/COPYING.times
+@@ -0,0 +1,65 @@
++LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY
++LIBERATION FONT SOFTWARE
++
++This agreement governs the use of the Software and any updates to the Software,
++regardless of the delivery mechanism. Subject to the following terms, Red Hat,
++Inc. ("Red Hat") grants to the user ("Client") a license to this work pursuant
++to the GNU General Public License v.2 with the exceptions set forth below and
++such other terms as are set forth in this End User License Agreement.
++
++ 1. The Software and License Exception. LIBERATION font software  (the
++"Software") consists of TrueType-OpenType formatted font software for rendering
++LIBERATION typefaces in sans-serif, serif, and monospaced character styles. You
++are licensed to use, modify, copy, and distribute the Software pursuant to the
++GNU General Public License v.2 with the following exceptions:
++
++  (a) As a special exception, if you create a document which uses this font,
++and embed this font or unaltered portions of this font into the document, this
++font does not by itself cause the resulting document to be covered by the GNU
++General Public License. This exception does not however invalidate any other
++reasons why the document might be covered by the GNU General Public License. If
++you modify this font, you may extend this exception to your version of the
++font, but you are not obligated to do so. If you do not wish to do so, delete
++this exception statement from your version.
++
++  (b) As a further exception, any distribution of the object code of the
++Software in a physical product must provide you the right to access and modify
++the source code for the Software and to reinstall that modified version of the
++Software in object code form on the same physical product on which you received
++it.
++
++ 2. Intellectual Property Rights. The Software and each of its components,
++including the source code, documentation, appearance, structure and
++organization are owned by Red Hat and others and are protected under copyright
++and other laws. Title to the Software and any component, or to any copy,
++modification, or merged portion shall remain with the aforementioned, subject
++to the applicable license. The "LIBERATION" trademark is a trademark of Red
++Hat, Inc. in the U.S. and other countries. This agreement does not permit
++Client to distribute modified versions of the Software using Red Hat's
++trademarks. If Client makes a redistribution of a modified version of the
++Software, then Client must modify the files names to remove any reference to
++the Red Hat trademarks and must not use the Red Hat trademarks in any way to
++reference or promote the modified Software.
++
++ 3. Limited Warranty. To the maximum extent permitted under applicable law, the
++Software is provided and licensed "as is" without warranty of any kind,
++expressed or implied, including the implied warranties of merchantability,
++non-infringement or fitness for a particular purpose. Red Hat does not warrant
++that the functions contained in the Software will meet Client's requirements or
++that the operation of the Software will be entirely error free or appear
++precisely as described in the accompanying documentation.
++
++ 4. Limitation of Remedies and Liability. To the maximum extent permitted by
++applicable law, Red Hat or any Red Hat authorized dealer will not be liable to
++Client for any incidental or consequential damages, including lost profits or
++lost savings arising out of the use or inability to use the Software, even if
++Red Hat or such dealer has been advised of the possibility of such damages.
++
++ 5. General. If any provision of this agreement is held to be unenforceable,
++that shall not affect the enforceability of the remaining provisions. This
++agreement shall be governed by the laws of the State of North Carolina and of
++the United States, without regard to any conflict of laws provisions, except
++that the United Nations Convention on the International Sale of Goods shall not
++apply.
++Copyright © 2007-2011 Red Hat, Inc. All rights reserved. LIBERATION is a
++trademark of Red Hat, Inc.
 diff --git a/LICENSE b/LICENSE
-index 429646c..8708008 100644
+index 6dbf8c0..3f4841a 100644
 --- a/LICENSE
 +++ b/LICENSE
 @@ -1,10 +1,15 @@
@@ -901,5 +954,5 @@ index 429646c..8708008 100644
 +      The Courier Prime font is licensed under the OFLv1.1.
 +      See COPYING.cour.
 -- 
-1.9.1
+2.5.0
 

patches/fonts-Missing_Fonts/definition

@@ -1,3 +1,5 @@
 Fixes: [32323] Implement an Arial replacement font
+Fixes: [32342] Implement a Times New Roman replacement font
+Fixes: [20456] Implement a Courier New replacement font
 Fixes: [13829] Implement a Microsoft Yahei replacement font
 Category: stable

patches/patchinstall.sh

@@ -2975,21 +2975,25 @@ fi
 # |
 # | This patchset fixes the following Wine bugs:
 # |   *	[#32323] Implement an Arial replacement font
+# |   *	[#32342] Implement a Times New Roman replacement font
+# |   *	[#20456] Implement a Courier New replacement font
 # |   *	[#13829] Implement a Microsoft Yahei replacement font
 # |
 # | Modified files:
-# |   *	COPYING.arial, COPYING.cour, COPYING.msyh, LICENSE, fonts/Makefile.in, fonts/arial.sfd, fonts/arial.ttf, fonts/cour.sfd,
-# | 	fonts/cour.ttf, fonts/msyh.sfd, fonts/msyh.ttf
+# |   *	COPYING.arial, COPYING.cour, COPYING.msyh, COPYING.times, LICENSE, fonts/Makefile.in, fonts/arial.sfd, fonts/arial.ttf,
+# | 	fonts/cour.sfd, fonts/cour.ttf, fonts/msyh.sfd, fonts/msyh.ttf, fonts/times.sfd, fonts/times.ttf
 # |
 if test "$enable_fonts_Missing_Fonts" -eq 1; then
 	patch_apply fonts-Missing_Fonts/0001-fonts-Add-Liberation-Sans-as-an-Arial-replacement.patch
-	patch_apply fonts-Missing_Fonts/0002-fonts-Add-WenQuanYi-Micro-Hei-as-a-Microsoft-Yahei-r.patch
-	patch_apply fonts-Missing_Fonts/0003-fonts-Add-Courier-Prime-as-a-Courier-New-replacement.patch
-	patch_apply fonts-Missing_Fonts/0004-Add-licenses-for-fonts-as-separate-files.patch
+	patch_apply fonts-Missing_Fonts/0002-fonts-Add-Liberation-Serif-as-an-Times-New-Roman-rep.patch
+	patch_apply fonts-Missing_Fonts/0003-fonts-Add-Liberation-Mono-as-an-Courier-New-replacem.patch
+	patch_apply fonts-Missing_Fonts/0004-fonts-Add-WenQuanYi-Micro-Hei-as-a-Microsoft-Yahei-r.patch
+	patch_apply fonts-Missing_Fonts/0005-Add-licenses-for-fonts-as-separate-files.patch
 	(
 		echo '+    { "Torsten Kurbad", "fonts: Add Liberation Sans as an Arial replacement.", 2 },';
+		echo '+    { "Sebastian Lackner", "fonts: Add Liberation Serif as an Times New Roman replacement.", 1 },';
+		echo '+    { "Sebastian Lackner", "fonts: Add Liberation Mono as an Courier New replacement.", 1 },';
 		echo '+    { "Erich E. Hoover", "fonts: Add WenQuanYi Micro Hei as a Microsoft Yahei replacement.", 1 },';
-		echo '+    { "Erich E. Hoover", "fonts: Add Courier Prime as a Courier New replacement.", 1 },';
 		echo '+    { "Michael Müller", "Add licenses for fonts as separate files.", 1 },';
 	) >> "$patchlist"
 fi