From bc98892fd1e238d4af141da5ed4042f1115c7d98 Mon Sep 17 00:00:00 2001 From: hesmar Date: Tue, 11 Jun 2024 21:17:24 +0200 Subject: [PATCH] [leptonica] Reduce required C standard (#39203) --- ports/leptonica/portfile.cmake | 11 +++++++++-- ports/leptonica/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/leptonica.json | 5 +++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ports/leptonica/portfile.cmake b/ports/leptonica/portfile.cmake index 312037d8c9..b103ca8432 100644 --- a/ports/leptonica/portfile.cmake +++ b/ports/leptonica/portfile.cmake @@ -1,11 +1,18 @@ +vcpkg_download_distfile(REDUCE_REQUIRED_C_SANDARD + URLS https://github.com/DanBloomberg/leptonica/commit/23aef077a8dd631de80cb457384e0aa5338e85a4.patch?full_index=1 + FILENAME leptonica-reduce-c-standard-23aef077a8dd631de80cb457384e0aa5338e85a4.patch + SHA512 e309730b959c58b2c063bfd40434da22c79061ece48f2d8a388364a49e2a12a85b74b755e8b837d8fdeee9c187379460a85a9e5cf84f09f0c4649f280a0c9536 +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DanBloomberg/leptonica - REF ${VERSION} + REF "${VERSION}" SHA512 968a88d2074717e6f379d2f9b8f7f0d5193fe9b8856051e09e2b31c939689b196a4a9b2cde595ce76ff8ae2784680ef5e68c40709c051d3d23738e862968016f HEAD_REF master PATCHES fix-pc-and-config.patch + "${REDUCE_REQUIRED_C_SANDARD}" ) vcpkg_find_acquire_program(PKGCONFIG) @@ -14,7 +21,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSW_BUILD=OFF - -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" -DCMAKE_REQUIRE_FIND_PACKAGE_GIF=TRUE -DCMAKE_REQUIRE_FIND_PACKAGE_JPEG=TRUE -DCMAKE_REQUIRE_FIND_PACKAGE_PNG=TRUE diff --git a/ports/leptonica/vcpkg.json b/ports/leptonica/vcpkg.json index 9a46bb325f..88927c6d79 100644 --- a/ports/leptonica/vcpkg.json +++ b/ports/leptonica/vcpkg.json @@ -1,6 +1,7 @@ { "name": "leptonica", "version": "1.84.1", + "port-version": 1, "description": "An open source library containing software that is broadly useful for image processing and image analysis applications", "homepage": "https://github.com/DanBloomberg/leptonica", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index cc1913a66b..711655fa01 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4146,7 +4146,7 @@ }, "leptonica": { "baseline": "1.84.1", - "port-version": 0 + "port-version": 1 }, "lerc": { "baseline": "4.0.4", diff --git a/versions/l-/leptonica.json b/versions/l-/leptonica.json index 9446969ab6..7f048bf1b6 100644 --- a/versions/l-/leptonica.json +++ b/versions/l-/leptonica.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99f96a421ac16fea60363be5488c10b19d6018d4", + "version": "1.84.1", + "port-version": 1 + }, { "git-tree": "a9c4f4bd6602bf8870169e982d345b686691ba58", "version": "1.84.1",