wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove several patches (accepted upstream).

Browse Source
This commit is contained in:
Sebastian Lackner
2014-11-06 18:17:40 +01:00
parent 8d9d2558c9
commit a05b7dc368
7 changed files with 469 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
patches/Miscellaneous/0005-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch → patches/Miscellaneous/0004-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch
View File

54
patches/Miscellaneous/0004-usp10-Silence-repeated-GSUB_apply_ChainContext-Subst.patch
View File

@@ -1,54 +0,0 @@
From 4acb49f0e0be827be0252c4b3f896c11cf4a9d94 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 18 Sep 2014 00:38:15 +0200
Subject: usp10: Silence repeated GSUB_apply_ChainContext[Subst|Pos] FIXMEs.
---
dlls/usp10/opentype.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c
index 166d823..e2142a5 100644
--- a/dlls/usp10/opentype.c
+++ b/dlls/usp10/opentype.c
@@ -938,12 +938,16 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo
ccsf1 = (const GSUB_ChainContextSubstFormat1*)((const BYTE*)look+offset);
if (GET_BE_WORD(ccsf1->SubstFormat) == 1)
{
- FIXME(" TODO: subtype 1 (Simple context glyph substitution)\n");
+ static int once;
+ if (!once++)
+ FIXME(" TODO: subtype 1 (Simple context glyph substitution)\n");
continue;
}
else if (GET_BE_WORD(ccsf1->SubstFormat) == 2)
{
- FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Substitution)\n");
+ static int once;
+ if (!once++)
+ FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Substitution)\n");
continue;
}
else if (GET_BE_WORD(ccsf1->SubstFormat) == 3)
@@ -1649,12 +1653,16 @@ static INT GPOS_apply_ChainContextPos(ScriptCache *psc, LPOUTLINETEXTMETRICW lpo
if (GET_BE_WORD(ccpf3->PosFormat) == 1)
{
- FIXME(" TODO: subtype 1 (Simple Chaining Context Glyph Positioning)\n");
+ static int once;
+ if (!once++)
+ FIXME(" TODO: subtype 1 (Simple Chaining Context Glyph Positioning)\n");
continue;
}
else if (GET_BE_WORD(ccpf3->PosFormat) == 2)
{
- FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Positioning)\n");
+ static int once;
+ if (!once++)
+ FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Positioning)\n");
continue;
}
else if (GET_BE_WORD(ccpf3->PosFormat) == 3)
--
2.1.0

4
patches/Miscellaneous/definition
View File

@@ -10,10 +10,6 @@ Revision: 1
Author: Sebastian Lackner
Title: wined3d: Silence repeated wined3d_swapchain_present FIXME.
Revision: 1
Author: Sebastian Lackner
Title: usp10: Silence repeated GSUB_apply_ChainContext[Subst|Pos] FIXMEs.
Revision: 1
Author: Erich E. Hoover
Title: Appease the blessed version of gcc (4.5) when -Werror is enabled.