Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

harbfuzz: add new version 9.0.0 #23319

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions recipes/harfbuzz/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"9.0.0":
url: "https://github.com/harfbuzz/harfbuzz/releases/download/9.0.0/harfbuzz-9.0.0.tar.xz"
sha256: "a41b272ceeb920c57263ec851604542d9ec85ee3030506d94662067c7b6ab89e"
"8.3.0":
url: "https://github.com/harfbuzz/harfbuzz/releases/download/8.3.0/harfbuzz-8.3.0.tar.xz"
sha256: "109501eaeb8bde3eadb25fab4164e993fbace29c3d775bcaa1c1e58e2f15f847"
Expand Down
19 changes: 13 additions & 6 deletions recipes/harfbuzz/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@

class HarfbuzzConan(ConanFile):
name = "harfbuzz"
description = "HarfBuzz is an OpenType text shaping engine."
topics = ("opentype", "text", "engine")
description = "an OpenType text shaping engine."
license = "MIT"
url = "https://github.com/conan-io/conan-center-index"
homepage = "https://harfbuzz.github.io/"
license = "MIT"
package_type = "library"
topics = ("opentype", "text", "engine")
settings = "os", "arch", "compiler", "build_type"
package_type = "library"
options = {
"shared": [True, False],
"fPIC": [True, False],
Expand Down Expand Up @@ -154,14 +154,21 @@ def is_vs_2017():
"tests": "disabled",
"docs": "disabled",
"benchmark": "disabled",
"icu_builtin": "false"
"icu_builtin": "false",
})
if Version(self.version) >= "7.3.0":
tc.project_options.update({
"utilities": "disabled",
})
tc.cpp_args += cxxflags
tc.generate()

def build(self):
apply_conandata_patches(self)
replace_in_file(self, os.path.join(self.source_folder, "meson.build"), "subdir('util')", "")
if Version(self.version) < "7.3.0":
replace_in_file(self, os.path.join(self.source_folder, "meson.build"), "subdir('util')", "")
if Version(self.version) >= "8.4.0":
replace_in_file(self, os.path.join(self.source_folder, "meson.build"), "version: freetype_min_version,", "")
Comment on lines +170 to +171
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This workaround shouldn't be necessary when #22974 is merged.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jwillikers
Thanks a lot!
I'm waiting for it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this no longer needed then?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@toge bump here - can this workaround be removed now that the linked PR has been merged?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ping @toge

meson = Meson(self)
meson.configure()
meson.build()
Expand Down
2 changes: 2 additions & 0 deletions recipes/harfbuzz/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"9.0.0":
folder: all
"8.3.0":
folder: all
"8.2.2":
Expand Down
Loading