diff --git a/ports/lcms/cpp17.patch b/ports/lcms/cpp17.patch new file mode 100644 index 00000000000..77da5bef17a --- /dev/null +++ b/ports/lcms/cpp17.patch @@ -0,0 +1,13 @@ +diff --git a/include/lcms2.h b/include/lcms2.h +index 7e061ce7c..5d234c4e4 100644 +--- a/include/lcms2.h ++++ b/include/lcms2.h +@@ -152,7 +152,7 @@ typedef double cmsFloat64Number; + #endif + + // Handle "register" keyword +-#if defined(CMS_NO_REGISTER_KEYWORD) && !defined(CMS_DLL) && !defined(CMS_DLL_BUILD) ++#if __cplusplus >= 201703L || defined(CMS_NO_REGISTER_KEYWORD) && !defined(CMS_DLL) && !defined(CMS_DLL_BUILD) + # define CMSREGISTER + #else + # define CMSREGISTER register diff --git a/ports/lcms/portfile.cmake b/ports/lcms/portfile.cmake index 78b8409ce0d..1facfa22df9 100644 --- a/ports/lcms/portfile.cmake +++ b/ports/lcms/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( PATCHES remove_library_directive.patch ${ADDITIONAL_PATCH} + cpp17.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/ports/lcms/vcpkg.json b/ports/lcms/vcpkg.json index 8a78ac8bbf2..718a2b5c2b7 100644 --- a/ports/lcms/vcpkg.json +++ b/ports/lcms/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lcms", "version": "2.12", - "port-version": 3, + "port-version": 4, "description": "Little CMS.", "homepage": "https://github.com/mm2/Little-CMS", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 14223112e87..df4ec19326c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3414,7 +3414,7 @@ }, "lcms": { "baseline": "2.12", - "port-version": 3 + "port-version": 4 }, "leaf": { "baseline": "0.2.2", diff --git a/versions/l-/lcms.json b/versions/l-/lcms.json index 5253e422477..65c76959c12 100644 --- a/versions/l-/lcms.json +++ b/versions/l-/lcms.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "220d2255b3f13ec7b0266393d65c674f5c060c2b", + "version": "2.12", + "port-version": 4 + }, { "git-tree": "5e1b890660ea5d2a869407a0714d4385e949b4d6", "version": "2.12",