[Libreoffice-commits] core.git: external/lcms2

Mike Kaganski (via logerrit) logerrit at kemper.freedesktop.org
Wed Oct 16 18:37:00 UTC 2019 

 external/lcms2/0017-Upgrade-Visual-studio-2017-15.8.patch.1 |   45 +-----------
 1 file changed, 7 insertions(+), 38 deletions(-)

New commits:
commit 28eff00120179d7988b5062ca1489d4c77054cf5
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Oct 16 14:15:57 2019 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Oct 16 20:36:09 2019 +0200

    Allow building lcms2 with Windows SDK 8.1
    
    Change-Id: I81052f7634c7873d893d67deb79ed7bfa6dcbc44
    Reviewed-on: https://gerrit.libreoffice.org/80888
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/external/lcms2/0017-Upgrade-Visual-studio-2017-15.8.patch.1 b/external/lcms2/0017-Upgrade-Visual-studio-2017-15.8.patch.1
index f616e6d38239..00d404fad6a2 100644
--- a/external/lcms2/0017-Upgrade-Visual-studio-2017-15.8.patch.1
+++ b/external/lcms2/0017-Upgrade-Visual-studio-2017-15.8.patch.1
@@ -19,28 +19,15 @@ pointing out this)
  src/cmscgats.c                                    | 14 ++++++++++----
  10 files changed, 19 insertions(+), 11 deletions(-)
 
-diff --git a/Projects/VC2017/jpegicc/jpegicc.vcxproj b/Projects/VC2017/jpegicc/jpegicc.vcxproj
-index ab26a53..39cfd00 100644
---- a/Projects/VC2017/jpegicc/jpegicc.vcxproj
-+++ b/Projects/VC2017/jpegicc/jpegicc.vcxproj
-@@ -22,6 +22,7 @@
-     <ProjectGuid>{62812507-F926-4968-96A9-17678460AD90}</ProjectGuid>
-     <RootNamespace>jpegicc</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 diff --git a/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj b/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj
 index 4c8aa3f..d1bf3eb 100644
 --- a/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj
 +++ b/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj
-@@ -22,7 +22,7 @@
+@@ -22,7 +22,6 @@
      <ProjectGuid>{8C51BE48-ADB8-4089-A9EC-F6BF993A0548}</ProjectGuid>
      <RootNamespace>lcms2_DLL</RootNamespace>
      <Keyword>Win32Proj</Keyword>
 -    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
    </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -48,12 +35,11 @@ diff --git a/Projects/VC2017/lcms2_static/lcms2_static.vcxproj b/Projects/VC2017
 index 2a9988a..9fc05ce 100644
 --- a/Projects/VC2017/lcms2_static/lcms2_static.vcxproj
 +++ b/Projects/VC2017/lcms2_static/lcms2_static.vcxproj
-@@ -22,7 +22,7 @@
+@@ -22,7 +22,6 @@
      <ProjectGuid>{71DEDE59-3F1E-486B-A899-4283000F76B5}</ProjectGuid>
      <RootNamespace>lcms2_static</RootNamespace>
      <Keyword>Win32Proj</Keyword>
 -    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
    </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -61,12 +47,11 @@ diff --git a/Projects/VC2017/linkicc/linkicc.vcxproj b/Projects/VC2017/linkicc/l
 index 30c2b4e..51586dd 100644
 --- a/Projects/VC2017/linkicc/linkicc.vcxproj
 +++ b/Projects/VC2017/linkicc/linkicc.vcxproj
-@@ -22,7 +22,7 @@
+@@ -22,7 +22,6 @@
      <ProjectGuid>{FBFBE1DC-DB84-4BA1-9552-B4780F457849}</ProjectGuid>
      <RootNamespace>linkicc</RootNamespace>
      <Keyword>Win32Proj</Keyword>
 -    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
    </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -74,12 +59,11 @@ diff --git a/Projects/VC2017/psicc/psicc.vcxproj b/Projects/VC2017/psicc/psicc.v
 index 9dcf89a..8f26e12 100644
 --- a/Projects/VC2017/psicc/psicc.vcxproj
 +++ b/Projects/VC2017/psicc/psicc.vcxproj
-@@ -22,7 +22,7 @@
+@@ -22,7 +22,6 @@
      <ProjectGuid>{EF6A8851-65FE-46F5-B9EF-14F0B671F693}</ProjectGuid>
      <RootNamespace>psicc</RootNamespace>
      <Keyword>Win32Proj</Keyword>
 -    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
    </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -87,12 +71,11 @@ diff --git a/Projects/VC2017/testbed/testbed.vcxproj b/Projects/VC2017/testbed/t
 index 0af3762..3f6aea3 100644
 --- a/Projects/VC2017/testbed/testbed.vcxproj
 +++ b/Projects/VC2017/testbed/testbed.vcxproj
-@@ -22,7 +22,7 @@
+@@ -22,7 +22,6 @@
      <ProjectGuid>{928A3A2B-46EF-4279-959C-513B3652FF0E}</ProjectGuid>
      <RootNamespace>testbed</RootNamespace>
      <Keyword>Win32Proj</Keyword>
 -    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
    </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -100,12 +83,11 @@ diff --git a/Projects/VC2017/tiffdiff/tiffdiff.vcxproj b/Projects/VC2017/tiffdif
 index 7edfe28..3a6d837 100644
 --- a/Projects/VC2017/tiffdiff/tiffdiff.vcxproj
 +++ b/Projects/VC2017/tiffdiff/tiffdiff.vcxproj
-@@ -22,7 +22,7 @@
+@@ -22,7 +22,6 @@
      <ProjectGuid>{75B91835-CCD7-48BE-A606-A9C997D5DBEE}</ProjectGuid>
      <RootNamespace>tiffdiff</RootNamespace>
      <Keyword>Win32Proj</Keyword>
 -    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
    </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -113,24 +95,11 @@ diff --git a/Projects/VC2017/tifficc/tifficc.vcxproj b/Projects/VC2017/tifficc/t
 index cd9f04c..5ef954f 100644
 --- a/Projects/VC2017/tifficc/tifficc.vcxproj
 +++ b/Projects/VC2017/tifficc/tifficc.vcxproj
-@@ -22,7 +22,7 @@
+@@ -22,7 +22,6 @@
      <ProjectGuid>{2256DE16-ED92-4A6F-9C54-F65BB61E64A2}</ProjectGuid>
      <RootNamespace>tifficc</RootNamespace>
      <Keyword>Win32Proj</Keyword>
 -    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/transicc/transicc.vcxproj b/Projects/VC2017/transicc/transicc.vcxproj
-index d9b77c6..b3173d8 100644
---- a/Projects/VC2017/transicc/transicc.vcxproj
-+++ b/Projects/VC2017/transicc/transicc.vcxproj
-@@ -22,6 +22,7 @@
-     <ProjectGuid>{9EE22D66-C849-474C-9ED5-C3E141DAB160}</ProjectGuid>
-     <RootNamespace>transicc</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
    </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

More information about the Libreoffice-commits mailing list