From aa07c4b0871d5270b3827ae089aa442c09f1a486 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 20 Oct 2014 19:54:20 +0200 Subject: [PATCH] Removed patch to avoid Clang compiler warning because of unused Vtable (accepted upstream). --- debian/changelog | 4 ++ patches/Makefile | 7 +-- ...ve-unused-TransformFilter_Vtbl-Clang.patch | 49 ------------------- patches/Miscellaneous/definition | 4 -- 4 files changed, 6 insertions(+), 58 deletions(-) delete mode 100644 patches/Miscellaneous/0007-strmbase-Remove-unused-TransformFilter_Vtbl-Clang.patch diff --git a/debian/changelog b/debian/changelog index e2887184..340be425 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,7 @@ +wine-compholio (1.7.30) UNRELEASED; urgency=low + * Removed patch to avoid Clang compiler warning because of unused Vtable (accepted upstream). + -- Sebastian Lackner Mon, 20 Oct 2014 19:53:47 +0200 + wine-compholio (1.7.29) unstable; urgency=low * Updated DOS Attributes patch to better detect XATTR functions. * Updated patch for shell32 default folder ACLs. diff --git a/patches/Makefile b/patches/Makefile index 91bc8111..7855b5ef 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -182,12 +182,11 @@ Compholio.ok: # | * usp10: Silence repeated GSUB_apply_ChainContext[Subst|Pos] FIXMEs. [by Sebastian Lackner] # | * Appease the blessed version of gcc (4.5) when -Werror is enabled. [by Erich E. Hoover] # | * Appease the Archlinux version of gcc (4.9.1) when -Werror is enabled. [by Sebastian Lackner] -# | * Silence Clang warning by removing unused TransformFilter_Vtbl. [by Amine Khaldi] # | # | Modified files: # | * dlls/d3d9/tests/visual.c, dlls/kernel32/locale.c, dlls/msvcp90/ios.c, dlls/msvcp90/locale.c, dlls/msvcp90/string.c, -# | dlls/netapi32/netapi32.c, dlls/strmbase/transform.c, dlls/usp10/opentype.c, dlls/winealsa.drv/mmdevdrv.c, -# | dlls/wined3d/glsl_shader.c, dlls/wined3d/resource.c, dlls/wined3d/swapchain.c, tools/makedep.c +# | dlls/netapi32/netapi32.c, dlls/usp10/opentype.c, dlls/winealsa.drv/mmdevdrv.c, dlls/wined3d/glsl_shader.c, +# | dlls/wined3d/resource.c, dlls/wined3d/swapchain.c, tools/makedep.c # | .INTERMEDIATE: Miscellaneous.ok Miscellaneous.ok: @@ -197,7 +196,6 @@ Miscellaneous.ok: $(call APPLY_FILE,Miscellaneous/0004-usp10-Silence-repeated-GSUB_apply_ChainContext-Subst.patch) $(call APPLY_FILE,Miscellaneous/0005-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch) $(call APPLY_FILE,Miscellaneous/0006-Appease-the-Archlinux-version-of-gcc-4.9.1-when-Werr.patch) - $(call APPLY_FILE,Miscellaneous/0007-strmbase-Remove-unused-TransformFilter_Vtbl-Clang.patch) @( \ echo '+ { "Miscellaneous", "Sebastian Lackner", "kernel32: Silence repeated CompareStringEx FIXME." },'; \ echo '+ { "Miscellaneous", "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME. [rev 2]" },'; \ @@ -205,7 +203,6 @@ Miscellaneous.ok: echo '+ { "Miscellaneous", "Sebastian Lackner", "usp10: Silence repeated GSUB_apply_ChainContext[Subst|Pos] FIXMEs." },'; \ echo '+ { "Miscellaneous", "Erich E. Hoover", "Appease the blessed version of gcc (4.5) when -Werror is enabled." },'; \ echo '+ { "Miscellaneous", "Sebastian Lackner", "Appease the Archlinux version of gcc (4.9.1) when -Werror is enabled." },'; \ - echo '+ { "Miscellaneous", "Amine Khaldi", "Silence Clang warning by removing unused TransformFilter_Vtbl." },'; \ ) > Miscellaneous.ok # Patchset Pipelight diff --git a/patches/Miscellaneous/0007-strmbase-Remove-unused-TransformFilter_Vtbl-Clang.patch b/patches/Miscellaneous/0007-strmbase-Remove-unused-TransformFilter_Vtbl-Clang.patch deleted file mode 100644 index de563a34..00000000 --- a/patches/Miscellaneous/0007-strmbase-Remove-unused-TransformFilter_Vtbl-Clang.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 53611893c65e0470cf8d81b7900a02f9640c6dcc Mon Sep 17 00:00:00 2001 -From: Amine Khaldi -Date: Sat, 18 Oct 2014 19:53:56 +0100 -Subject: [PATCH] strmbase: Remove unused TransformFilter_Vtbl (Clang). ---- - dlls/strmbase/transform.c | 20 -------------------- - 1 file changed, 20 deletions(-) - -diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c -index 0fc7515..4d872be 100644 ---- a/dlls/strmbase/transform.c -+++ b/dlls/strmbase/transform.c -@@ -42,7 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase); - static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; - static const WCHAR wcsOutputPinName[] = {'o','u','t','p','u','t',' ','p','i','n',0}; - --static const IBaseFilterVtbl TransformFilter_Vtbl; - static const IPinVtbl TransformFilter_InputPin_Vtbl; - static const IPinVtbl TransformFilter_OutputPin_Vtbl; - static const IQualityControlVtbl TransformFilter_QualityControl_Vtbl; -@@ -439,25 +438,6 @@ HRESULT WINAPI TransformFilterImpl_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin - return E_NOTIMPL; - } - --static const IBaseFilterVtbl TransformFilter_Vtbl = --{ -- TransformFilterImpl_QueryInterface, -- BaseFilterImpl_AddRef, -- TransformFilterImpl_Release, -- BaseFilterImpl_GetClassID, -- TransformFilterImpl_Stop, -- TransformFilterImpl_Pause, -- TransformFilterImpl_Run, -- BaseFilterImpl_GetState, -- BaseFilterImpl_SetSyncSource, -- BaseFilterImpl_GetSyncSource, -- BaseFilterImpl_EnumPins, -- TransformFilterImpl_FindPin, -- BaseFilterImpl_QueryFilterInfo, -- BaseFilterImpl_JoinFilterGraph, -- BaseFilterImpl_QueryVendorInfo --}; -- - static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface) - { - BaseInputPin* This = impl_BaseInputPin_from_IPin(iface); --- -2.1.2 - diff --git a/patches/Miscellaneous/definition b/patches/Miscellaneous/definition index c6a3845a..eca56105 100644 --- a/patches/Miscellaneous/definition +++ b/patches/Miscellaneous/definition @@ -21,7 +21,3 @@ Title: Appease the blessed version of gcc (4.5) when -Werror is enabled. Revision: 1 Author: Sebastian Lackner Title: Appease the Archlinux version of gcc (4.9.1) when -Werror is enabled. - -Revision: 1 -Author: Amine Khaldi -Title: Silence Clang warning by removing unused TransformFilter_Vtbl.