From f23bbe0e77c5832c630c0a5a45e72fa7b21f63f1 Mon Sep 17 00:00:00 2001 From: toge Date: Wed, 19 Mar 2025 00:44:00 +0900 Subject: [PATCH 1/2] [plutovg] update to 1.0.0 --- ports/plutovg/portfile.cmake | 4 ++-- ports/plutovg/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/p-/plutovg.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/plutovg/portfile.cmake b/ports/plutovg/portfile.cmake index aba5b03197d4b1..28ce0b1d57d567 100644 --- a/ports/plutovg/portfile.cmake +++ b/ports/plutovg/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sammycage/plutovg REF "v${VERSION}" - SHA512 1abf7da813d00987dcf724c50e924659d76d49d13c9e37219ec151f3a7357501ae6b9c220613104623d9021db14eaa6c7cf81a79ecafd589eeaeab50a63f7031 - HEAD_REF master + SHA512 4f472542686f9ee949e6cba621f338128aaaee25e2dfde848713333eedc6de4f896bb55aac4b8296bdada73ae3327da1fd06055ef93acc920ed55bf123731f74 + HEAD_REF main ) vcpkg_cmake_configure( diff --git a/ports/plutovg/vcpkg.json b/ports/plutovg/vcpkg.json index f6c6ab50af7f99..2e4dd2d9b493c3 100644 --- a/ports/plutovg/vcpkg.json +++ b/ports/plutovg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "plutovg", - "version": "0.0.13", - "description": " Tiny 2D vector graphics library in C", + "version": "1.0.0", + "description": "Tiny 2D vector graphics library in C", "homepage": "https://github.com/sammycage/plutovg", "license": "MIT", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index bad7cde21bb9d1..e6ff1ececdf448 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7205,7 +7205,7 @@ "port-version": 0 }, "plutovg": { - "baseline": "0.0.13", + "baseline": "1.0.0", "port-version": 0 }, "pmdk": { diff --git a/versions/p-/plutovg.json b/versions/p-/plutovg.json index 401d6ea53ae468..e31d5a52810b2c 100644 --- a/versions/p-/plutovg.json +++ b/versions/p-/plutovg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3cd906777f0a1ec613f828469ce1f91a536c80ca", + "version": "1.0.0", + "port-version": 0 + }, { "git-tree": "1c5ca4f07afad9e4e0786c226e4135b4e20907b9", "version": "0.0.13", From 1d3900b4f4699f36abe4d561c66693fbe689711d Mon Sep 17 00:00:00 2001 From: toge Date: Wed, 19 Mar 2025 01:29:09 +0900 Subject: [PATCH 2/2] update plutovg --- ports/lunasvg/fix-plutovg.patch | 13 +++++++++++++ ports/lunasvg/portfile.cmake | 3 +++ ports/lunasvg/vcpkg.json | 1 + ports/plutosvg/fix-plutovg.patch | 13 +++++++++++++ ports/plutosvg/portfile.cmake | 3 +++ ports/plutosvg/vcpkg.json | 1 + versions/baseline.json | 4 ++-- versions/l-/lunasvg.json | 5 +++++ versions/p-/plutosvg.json | 5 +++++ 9 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 ports/lunasvg/fix-plutovg.patch create mode 100644 ports/plutosvg/fix-plutovg.patch diff --git a/ports/lunasvg/fix-plutovg.patch b/ports/lunasvg/fix-plutovg.patch new file mode 100644 index 00000000000000..0868906c6faeef --- /dev/null +++ b/ports/lunasvg/fix-plutovg.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 08cee28..b72d704 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,7 +6,7 @@ set(LUNASVG_VERSION_MICRO 1) + + project(lunasvg LANGUAGES CXX VERSION ${LUNASVG_VERSION_MAJOR}.${LUNASVG_VERSION_MINOR}.${LUNASVG_VERSION_MICRO}) + +-find_package(plutovg 0.0.4 QUIET) ++find_package(plutovg 1.0.0 QUIET) + if(NOT plutovg_FOUND) + add_subdirectory(plutovg) + endif() diff --git a/ports/lunasvg/portfile.cmake b/ports/lunasvg/portfile.cmake index 52a36d8481f261..3c57c1fc1cdf8e 100644 --- a/ports/lunasvg/portfile.cmake +++ b/ports/lunasvg/portfile.cmake @@ -4,6 +4,9 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 6ea8ef74a18047e2714aacc6c162c42519246c38061290053461e7c5c0922234534a031bdb84eaff7bea46da4d8edd1e3cdd00d710c066600c9024fa2a134a03 HEAD_REF master + PATCHES + # temporary patch. It should be removed once the new version of lunasvg is released. + fix-plutovg.patch ) vcpkg_cmake_configure( diff --git a/ports/lunasvg/vcpkg.json b/ports/lunasvg/vcpkg.json index cd167451dfab0c..466ae30c9ab266 100644 --- a/ports/lunasvg/vcpkg.json +++ b/ports/lunasvg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "lunasvg", "version": "3.2.1", + "port-version": 1, "description": "lunasvg is a standalone SVG rendering library in C++", "homepage": "https://github.com/sammycage/lunasvg", "license": "MIT", diff --git a/ports/plutosvg/fix-plutovg.patch b/ports/plutosvg/fix-plutovg.patch new file mode 100644 index 00000000000000..e972786b870632 --- /dev/null +++ b/ports/plutosvg/fix-plutovg.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ba7ccfa..538ec66 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,7 +6,7 @@ set(PLUTOSVG_VERSION_MICRO 6) + + project(plutosvg LANGUAGES C VERSION ${PLUTOSVG_VERSION_MAJOR}.${PLUTOSVG_VERSION_MINOR}.${PLUTOSVG_VERSION_MICRO}) + +-find_package(plutovg 0.0.4 QUIET) ++find_package(plutovg 1.0.0 QUIET) + if(NOT plutovg_FOUND) + add_subdirectory(plutovg) + endif() diff --git a/ports/plutosvg/portfile.cmake b/ports/plutosvg/portfile.cmake index 66ed227c19e87d..c892e689c7ed8e 100644 --- a/ports/plutosvg/portfile.cmake +++ b/ports/plutosvg/portfile.cmake @@ -4,6 +4,9 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 f0f2251cfb91f48b125299ec910d64181f03c14e683e1d497e2aa3f17713f5c7848247e3b7bdb6cf0dee8d98a7d25e85f7fcc440cbe55401c16fe5d1f0df1a10 HEAD_REF master + PATCHES + # temporary patch. It should be removed once the new version of plutosvg is released. + fix-plutovg.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/plutosvg/vcpkg.json b/ports/plutosvg/vcpkg.json index 1bd2e88ef571e2..6499e8c544b634 100644 --- a/ports/plutosvg/vcpkg.json +++ b/ports/plutosvg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "plutosvg", "version": "0.0.6", + "port-version": 1, "description": "Tiny SVG rendering library in C", "homepage": "https://github.com/sammycage/plutosvg", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index e6ff1ececdf448..f88722926d62ba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5766,7 +5766,7 @@ }, "lunasvg": { "baseline": "3.2.1", - "port-version": 0 + "port-version": 1 }, "luv": { "baseline": "1.44.2", @@ -7202,7 +7202,7 @@ }, "plutosvg": { "baseline": "0.0.6", - "port-version": 0 + "port-version": 1 }, "plutovg": { "baseline": "1.0.0", diff --git a/versions/l-/lunasvg.json b/versions/l-/lunasvg.json index 9cb005781d21ba..cfcc2d7b340b5d 100644 --- a/versions/l-/lunasvg.json +++ b/versions/l-/lunasvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e1e6ef5c64dc868a851d9d110d4daac385c97a8f", + "version": "3.2.1", + "port-version": 1 + }, { "git-tree": "d1c821b610c0753096112912447ad4c993518b38", "version": "3.2.1", diff --git a/versions/p-/plutosvg.json b/versions/p-/plutosvg.json index 9033625cf05a5c..d700a3e498b997 100644 --- a/versions/p-/plutosvg.json +++ b/versions/p-/plutosvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4dba94a01987e44d6ab5df6391088129b0f7cfd3", + "version": "0.0.6", + "port-version": 1 + }, { "git-tree": "55b280cc3b5a68ff88bc171e5048e695f31a4497", "version": "0.0.6",