diff --git a/ports/harfbuzz/0001-circumvent-samefile-error.patch b/ports/harfbuzz/0001-circumvent-samefile-error.patch index 3db21590a64d6c..40aaac0b4d2d68 100755 --- a/ports/harfbuzz/0001-circumvent-samefile-error.patch +++ b/ports/harfbuzz/0001-circumvent-samefile-error.patch @@ -1,9 +1,9 @@ diff --git a/src/gen-harfbuzzcc.py b/src/gen-harfbuzzcc.py -index b25bcc7..97bf2ab 100644 +index b25bcc7..f3bc87a 100644 --- a/src/gen-harfbuzzcc.py +++ b/src/gen-harfbuzzcc.py @@ -15,4 +15,8 @@ with open (OUTPUT, "wb") as f: - f.write ("".join ('#include "{}"\n'.format (os.path.basename (x)) for x in sources if x.endswith (".cc")).encode ()) + f.write ("".join ('#include "{}"\n'.format (os.path.basename (x)) for x in sources if x.endswith (".cc")).encode ()) # copy it also to src/ -shutil.copyfile (OUTPUT, os.path.join (CURRENT_SOURCE_DIR, os.path.basename (OUTPUT))) @@ -13,11 +13,11 @@ index b25bcc7..97bf2ab 100644 +if not os.path.samefile(src, dst): + shutil.copyfile (src, dst) diff --git a/src/gen-hb-version.py b/src/gen-hb-version.py -index 5ec2024..59d4754 100644 +index 879811f..c376721 100644 --- a/src/gen-hb-version.py +++ b/src/gen-hb-version.py @@ -33,4 +33,8 @@ with open (INPUT, "r", encoding='utf-8') as template: - .encode ()) + .encode ()) # copy it also to src/ -shutil.copyfile (OUTPUT, os.path.join (CURRENT_SOURCE_DIR, os.path.basename (OUTPUT))) @@ -27,11 +27,11 @@ index 5ec2024..59d4754 100644 +if not os.path.samefile(src, dst): + shutil.copyfile (src, dst) diff --git a/src/gen-ragel-artifacts.py b/src/gen-ragel-artifacts.py -index b60ec3b..288e224 100644 +index d22e03a..2b1e819 100644 --- a/src/gen-ragel-artifacts.py +++ b/src/gen-ragel-artifacts.py @@ -22,4 +22,8 @@ hh = rl.replace ('.rl', '.hh') - subprocess.Popen ([ragel, '-e', '-F1', '-o', hh, rl], cwd=outdir).wait () + subprocess.Popen (ragel.split() + ['-e', '-F1', '-o', hh, rl], cwd=outdir).wait () # copy it also to src/ -shutil.copyfile (os.path.join (outdir, hh), os.path.join (CURRENT_SOURCE_DIR, hh)) @@ -40,4 +40,3 @@ index b60ec3b..288e224 100644 +# Avoid SameFileError +if not os.path.samefile(src, dst): + shutil.copyfile (src, dst) - diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 277a2c5b908506..7b3caed4c46f14 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 b37f03f16b39d397a626f097858e9ae550234ca0 # 2.8.1 - SHA512 3eef62df397bc1fe1d08d7d91ff7d38d7af54bb85562915bba65d86cf6862384f5b4538f685d93eead595389d2f417176827fd2f72b3ce71a5562a8ff80f17f4 + REF 63e15eac4f443fa53565d1e4fb9611cdd7814f28 # 2.8.2 + SHA512 8a743ce465f01d6cb49ac74efb1159d965e41c89267eeb4078ec4c342c24599e14419a0416f8d35a0b9dd00e76cc79b4dbd6f50ddd1b8da761d61158d1018ebc 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 6d5007235641b4..2eb7e6d3f5d71f 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,7 +1,6 @@ { "name": "harfbuzz", - "version": "2.8.1", - "port-version": 1, + "version": "2.8.2", "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 28551738f9eb5a..f5a55ea0dd0914 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2501,8 +2501,8 @@ "port-version": 0 }, "harfbuzz": { - "baseline": "2.8.1", - "port-version": 1 + "baseline": "2.8.2", + "port-version": 0 }, "hayai": { "baseline": "2019-08-10", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 698b0ded440a34..ced513c5e85bf5 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "823024398648ee98849f8a4f73f778a8f97ccd1f", + "version": "2.8.2", + "port-version": 0 + }, { "git-tree": "0af28da9fe1d9f70c2f0b572c8e9eee085eb7c3b", "version": "2.8.1",