Dropped liblcms2-dev dependency for old Ubuntu versions.

debian/changelog

@@ -1,3 +1,8 @@
+wine-compholio (1.7.16-1) unstable; urgency=low
+  * Fix build failure caused by dynamic unwind functions.
+  * Dropped liblcms2-dev dependency for old Ubuntu versions.
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sat, 05 Apr 2014 03:48:25 +0200
+
 wine-compholio (1.7.16) unstable; urgency=low
   * Add stub for RtlInstallFunctionTableCallback.
   * Further split out the SIO_ADDRESS_LIST_CHANGE patches.

debian/control

@@ -37,7 +37,7 @@ Build-Depends: autotools-dev,
                libgstreamer0.10-dev,
                libice-dev,
                libjpeg-dev,
-               liblcms2-dev,
+               liblcms2-dev | ubuntu-desktop (<< 1.267),
                libldap2-dev, libldap-dev,
                libmpg123-dev,
                libncurses5-dev | libncurses-dev,

patches/11-Dynamic_Unwind/0003-ntdll-tests-Add-tests-for-dynamic-unwind-table.patch

@@ -1,28 +1,30 @@
-From fe1571d281c60aa9a1db503c8d143ac5029982c2 Mon Sep 17 00:00:00 2001
+From f9bc66f164f6d556e383585d761ed7bf9b5187e1 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 5 Apr 2014 01:04:25 +0200
 Subject: ntdll/tests: Add tests for dynamic unwind table.
 
 ---
- dlls/ntdll/tests/exception.c |  133 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 133 insertions(+)
+ dlls/ntdll/tests/exception.c |  137 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 137 insertions(+)
 
 diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
-index b4cbaf5..ac70802 100644
+index b4cbaf5..9658aa5 100644
 --- a/dlls/ntdll/tests/exception.c
 +++ b/dlls/ntdll/tests/exception.c
-@@ -49,6 +49,10 @@ static NTSTATUS  (WINAPI *pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE
+@@ -49,6 +49,12 @@ static NTSTATUS  (WINAPI *pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE
  static NTSTATUS  (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code);
  static NTSTATUS  (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG);
  static NTSTATUS  (WINAPI *pNtSetInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG);
++#if defined(__x86_64__)
 +static BOOLEAN   (WINAPI *pRtlAddFunctionTable)(RUNTIME_FUNCTION*, DWORD, DWORD64);
 +static BOOLEAN   (WINAPI *pRtlDeleteFunctionTable)(RUNTIME_FUNCTION*);
 +static BOOLEAN   (WINAPI *pRtlInstallFunctionTableCallback)(DWORD64, DWORD64, DWORD, PGET_RUNTIME_FUNCTION_CALLBACK, PVOID, PCWSTR);
 +static PRUNTIME_FUNCTION (WINAPI *pRtlLookupFunctionEntry)(ULONG64, ULONG64*, UNWIND_HISTORY_TABLE*);
++#endif
  static BOOL      (WINAPI *pIsWow64Process)(HANDLE, PBOOL);
  
  #ifdef __i386__
-@@ -1447,6 +1451,122 @@ static void test_virtual_unwind(void)
+@@ -1447,6 +1453,122 @@ static void test_virtual_unwind(void)
          call_virtual_unwind( i, &tests[i] );
  }
  
@@ -145,10 +147,11 @@ index b4cbaf5..ac70802 100644
  #endif  /* __x86_64__ */
  
  START_TEST(exception)
-@@ -1473,6 +1593,14 @@ START_TEST(exception)
+@@ -1473,6 +1595,16 @@ START_TEST(exception)
                                                                   "NtQueryInformationProcess" );
      pNtSetInformationProcess           = (void*)GetProcAddress( hntdll,
                                                                   "NtSetInformationProcess" );
++#if defined(__x86_64__)
 +    pRtlAddFunctionTable               = (void *)GetProcAddress( hntdll,
 +                                                                 "RtlAddFunctionTable" );
 +    pRtlDeleteFunctionTable            = (void *)GetProcAddress( hntdll,
@@ -157,10 +160,11 @@ index b4cbaf5..ac70802 100644
 +                                                                 "RtlInstallFunctionTableCallback" );
 +    pRtlLookupFunctionEntry            = (void *)GetProcAddress( hntdll,
 +                                                                 "RtlLookupFunctionEntry" );
++#endif
      pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process");
  
  #ifdef __i386__
-@@ -1537,6 +1665,11 @@ START_TEST(exception)
+@@ -1537,6 +1669,11 @@ START_TEST(exception)
  
      test_virtual_unwind();
  

patches/11-Dynamic_Unwind/0004-kernel32-Forward-RtlInstallFunctionTableCallback-to-.patch

@@ -0,0 +1,24 @@
+From 71d9e2ae7a81a8ab030933a10984cad5c5a8c7c1 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sat, 5 Apr 2014 02:01:38 +0200
+Subject: kernel32: Forward RtlInstallFunctionTableCallback to ntdll
+
+---
+ dlls/kernel32/kernel32.spec |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
+index f3e5c67..a6c6b29 100644
+--- a/dlls/kernel32/kernel32.spec
++++ b/dlls/kernel32/kernel32.spec
+@@ -1042,6 +1042,7 @@
+ @ stdcall -arch=x86_64 RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory
+ @ cdecl -arch=arm,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable
+ @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory
++@ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr ptr) ntdll.RtlInstallFunctionTableCallback
+ @ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry
+ @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory
+ @ stdcall -arch=x86_64,arm RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader
+-- 
+1.7.9.5
+

patches/11-Dynamic_Unwind/bbbf7d25-cca0-4630-9a83-0dec5e53ecb8.def

@@ -1,3 +1,3 @@
-Revision: 2
+Revision: 4
 Author: Sebastian Lackner
 Title: Add implementation for dynamic unwind tables/callbacks on x86_64.

patches/patch-list.patch

@@ -57,7 +57,7 @@ index a273502..5fa0cd5 100644
 +    { "4cd13e94-7f2d-11e3-b5eb-0090f5c75ad5:1", "Erich E. Hoover", "Support for junction points/reparse points." },
 +    { "5fb1f5c8-7f17-11e3-9b62-0090f5c75ad5:1", "Erich E. Hoover", "Implement TransmitFile." },
 +    { "3d7c4774-9e7f-11e3-9cfc-0090f5c75ad5:1", "Erich E. Hoover", "Implement missing fonts expected by Silverlight." },
-+    { "bbbf7d25-cca0-4630-9a83-0dec5e53ecb8:2", "Sebastian Lackner", "Add implementation for dynamic unwind tables/callbacks on x86_64." },
++    { "bbbf7d25-cca0-4630-9a83-0dec5e53ecb8:4", "Sebastian Lackner", "Add implementation for dynamic unwind tables/callbacks on x86_64." },
 +    { "0b21d7ac-0387-4493-aa38-fbafe3e749f5:1", "Michael Müller", "Decrease minimum SetTimer interval from 15 to 5 ms." },
 +    { "19835498-8d90-4673-867e-2376af4d7c76:1", "Sebastian Lackner", "Allow to set wined3d strictDrawOrdering via environment variable." },
 +    { "59bd38b7-bbdc-4cfd-9ccd-1c72c4ed84c0:1", "Sebastian Lackner", "Implement X11DRV_FLUSH_GDI_DISPLAY ExtEscape command." },