From 620bee919aae13bb383de64ac86c64332cc67ff9 Mon Sep 17 00:00:00 2001 From: kirawi Date: Tue, 13 Apr 2021 18:15:46 -0400 Subject: [PATCH 01/12] wip --- ports/harfbuzz/portfile.cmake | 4 ++-- ports/harfbuzz/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 54cc71fbab1f44..5b5cf8936902a4 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO harfbuzz/harfbuzz - REF 7236c7e29cef1c2d76c7a284c5081ff4d3aa1127 # 2.7.4 - SHA512 d231a788ea4e52231d4c363c1eca76424cb82ed0952b5c24d0b082e88b3dddbda967e7fffe67fffdcb22c7ebfbf0ec923365eb4532be772f2e61fa7d29b51998 + REF 03538e872a0610a65fad692b33d3646f387cf578 # 2.8.0 + SHA512 3d9d2804776ce01cf3fe1fe789c584f59cb9f4f57312fac50e195cb455936613d96f0c1920d0e09217c8fb5cbb4ba4f366cb1ff8ff0643a7f8a68f2a1c3d2a3d HEAD_REF master PATCHES # This patch is a workaround that is needed until the following issues are resolved upstream: diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index c2e9ab742139a5..4896cfcbf7477e 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "harfbuzz", - "version-string": "2.7.4", + "version-string": "2.8.0", "port-version": 1, "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", From 3426b41920a131c810a708d14aac9db27da954dd Mon Sep 17 00:00:00 2001 From: kirawi Date: Tue, 13 Apr 2021 18:24:50 -0400 Subject: [PATCH 02/12] wip --- versions/baseline.json | 2 +- versions/h-/harfbuzz.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 6de4dd162df382..770273f848c6de 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2409,7 +2409,7 @@ "port-version": 0 }, "harfbuzz": { - "baseline": "2.7.4", + "baseline": "2.8.0", "port-version": 1 }, "hayai": { diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 7bdb4e94c9a0f2..92c68f22a9fbac 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ee0ac8f52fec63034cb0245be9cd3cfff1f4f8d", + "version-string": "2.8.0", + "port-version": 1 + }, { "git-tree": "e985af9b39fb57ee491c1a773c43334665ddb3d3", "version-string": "2.7.4", From b253ba53eeb4e595ca4abe9ef2c25e2af99d1920 Mon Sep 17 00:00:00 2001 From: Shafkath Shuhan Date: Wed, 14 Apr 2021 22:58:41 -0400 Subject: [PATCH 03/12] wip --- ports/harfbuzz/vcpkg.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 4896cfcbf7477e..51e521d1d94be1 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,7 +1,6 @@ { "name": "harfbuzz", - "version-string": "2.8.0", - "port-version": 1, + "version": "2.8.0", "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "dependencies": [ From 217b03f1c3dea0997cd84dd301898f8556d55c20 Mon Sep 17 00:00:00 2001 From: Shafkath Shuhan Date: Wed, 14 Apr 2021 23:01:28 -0400 Subject: [PATCH 04/12] wip --- versions/baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index bbc3395ed97229..604ba2292f0978 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2410,7 +2410,7 @@ }, "harfbuzz": { "baseline": "2.8.0", - "port-version": 1 + "port-version": 0 }, "hayai": { "baseline": "2019-08-10", From cdbe3588b1e42e4295b550c1a46829d42cebcc26 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Fri, 16 Apr 2021 10:52:19 +0800 Subject: [PATCH 05/12] update version --- versions/h-/harfbuzz.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 92c68f22a9fbac..176159b5ff8133 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,9 +1,9 @@ { "versions": [ { - "git-tree": "3ee0ac8f52fec63034cb0245be9cd3cfff1f4f8d", - "version-string": "2.8.0", - "port-version": 1 + "git-tree": "d168d021573763bacefcbdd7750168ba9a70abf4", + "version": "2.8.0", + "port-version": 0 }, { "git-tree": "e985af9b39fb57ee491c1a773c43334665ddb3d3", From 28a6109e3a536a738ee9862889577b4d3833974c Mon Sep 17 00:00:00 2001 From: kirawi Date: Sun, 2 May 2021 17:13:37 -0400 Subject: [PATCH 06/12] fix port git-tree sha --- versions/h-/harfbuzz.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 176159b5ff8133..2aba38fef547a3 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d168d021573763bacefcbdd7750168ba9a70abf4", + "git-tree": "14b26ebe0122cd5546c795d988ac677c31d3afa8", "version": "2.8.0", "port-version": 0 }, From a5b16b0b2382ee90d370cdef7aea7e36ea8b01a6 Mon Sep 17 00:00:00 2001 From: Shafkath Shuhan Date: Tue, 18 May 2021 10:00:24 -0400 Subject: [PATCH 07/12] wip --- versions/h-/harfbuzz.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 2aba38fef547a3..89c07cdf14c9ce 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -5,6 +5,11 @@ "version": "2.8.0", "port-version": 0 }, + { + "git-tree": "3f1e0749ade6fb27bbb6103e1faab23b2719dcda", + "version": "2.7.4", + "port-version": 2 + }, { "git-tree": "e985af9b39fb57ee491c1a773c43334665ddb3d3", "version-string": "2.7.4", From 6474429aada1abe32f10cef272421d009703c3ce Mon Sep 17 00:00:00 2001 From: Shafkath Shuhan Date: Tue, 18 May 2021 10:15:05 -0400 Subject: [PATCH 08/12] restart ci From bb32de7a59a26c7d99436d89979b3b607cf26027 Mon Sep 17 00:00:00 2001 From: Shafkath Shuhan Date: Wed, 19 May 2021 20:44:18 -0400 Subject: [PATCH 09/12] restart ci From d2df5fde81b0faac4f679da6081a664a4c629355 Mon Sep 17 00:00:00 2001 From: Shafkath Shuhan Date: Thu, 20 May 2021 10:02:37 -0400 Subject: [PATCH 10/12] update to 2.8.1 --- ports/harfbuzz/portfile.cmake | 4 ++-- ports/harfbuzz/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 869fe4b95698e7..277a2c5b908506 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO harfbuzz/harfbuzz - REF 03538e872a0610a65fad692b33d3646f387cf578 # 2.8.0 - SHA512 3d9d2804776ce01cf3fe1fe789c584f59cb9f4f57312fac50e195cb455936613d96f0c1920d0e09217c8fb5cbb4ba4f366cb1ff8ff0643a7f8a68f2a1c3d2a3d + REF b37f03f16b39d397a626f097858e9ae550234ca0 # 2.8.1 + SHA512 3eef62df397bc1fe1d08d7d91ff7d38d7af54bb85562915bba65d86cf6862384f5b4538f685d93eead595389d2f417176827fd2f72b3ce71a5562a8ff80f17f4 HEAD_REF master PATCHES # This patch is a workaround that is needed until the following issues are resolved upstream: diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 91d7507383bdde..b612063268ea7f 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "harfbuzz", - "version": "2.8.0", + "version": "2.8.1", "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "dependencies": [ From 130e86fe5dd675eced0065741c8ce7b2ea42c316 Mon Sep 17 00:00:00 2001 From: Shafkath Shuhan Date: Thu, 20 May 2021 10:05:57 -0400 Subject: [PATCH 11/12] retry --- versions/baseline.json | 2 +- versions/h-/harfbuzz.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 5bee281dda93fd..5c9e8763d130e8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2437,7 +2437,7 @@ "port-version": 0 }, "harfbuzz": { - "baseline": "2.8.0", + "baseline": "2.8.1", "port-version": 0 }, "hayai": { diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 89c07cdf14c9ce..4a0171cee6541a 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "32e5438e1f8c76646b657f14fbe0dac7646d80f6", + "version": "2.8.1", + "port-version": 0 + }, { "git-tree": "14b26ebe0122cd5546c795d988ac677c31d3afa8", "version": "2.8.0", From 7eef9c88c3ff3bc5258582e7e8d2df927f36a7da Mon Sep 17 00:00:00 2001 From: Kirawi <67773714+kirawi@users.noreply.github.com> Date: Thu, 20 May 2021 21:53:42 -0400 Subject: [PATCH 12/12] Update harfbuzz.json --- versions/h-/harfbuzz.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 4a0171cee6541a..66f3d1ecc21fbb 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -5,11 +5,6 @@ "version": "2.8.1", "port-version": 0 }, - { - "git-tree": "14b26ebe0122cd5546c795d988ac677c31d3afa8", - "version": "2.8.0", - "port-version": 0 - }, { "git-tree": "3f1e0749ade6fb27bbb6103e1faab23b2719dcda", "version": "2.7.4",