diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-07-15 00:16:19 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-07-17 10:15:36 +0200 |
| commit | e154d9044fca4fea71d5623be094492df1d45229 (patch) | |
| tree | 412f53a416178224ceb73ad4dd120445d61b4269 /external/lcms2/c++17.patch.1 | |
| parent | b4dfba947768834ffecc09056992019878711c8b (diff) | |
lcms2: update to 2.11 and use VC2019 solution
Dropped patches:
- lcms2-msvc-disable-sse2.patch.1: applied to the VS2010 solution;
so actually long unused by LO.
- 0017-Upgrade-Visual-studio-2017-15.8.patch.1: not used anymore,
because the Windows build now uses the VS2019 solution.
The new external/lcms2/c++17.patch.1 explicitly disables the
register keywordin the header.
Change-Id: Icc6dd2a41d0fc94f00fc1ac7fa5bebc941c2a791
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98734
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'external/lcms2/c++17.patch.1')
| -rw-r--r-- | external/lcms2/c++17.patch.1 | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/external/lcms2/c++17.patch.1 b/external/lcms2/c++17.patch.1 new file mode 100644 index 000000000000..dc5b2ccde46c --- /dev/null +++ b/external/lcms2/c++17.patch.1 @@ -0,0 +1,13 @@ +diff --git a/include/lcms2.h b/include/lcms2.h +index cf52014..926e2a0 100644 +--- a/include/lcms2.h ++++ b/include/lcms2.h +@@ -62,7 +62,7 @@ + // #define CMS_RELY_ON_WINDOWS_STATIC_MUTEX_INIT + + // Uncomment this to remove the "register" storage class +-// #define CMS_NO_REGISTER_KEYWORD 1 ++#define CMS_NO_REGISTER_KEYWORD 1 + + // ********** End of configuration toggles ****************************** + |