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.

Sign up for GitHub

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

Jump to bottom

harbfuzz: add new version 9.0.0 #23319

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

harbfuzz: add new version 9.0.0 #23319

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5208935
harbfuzz: add version 8.4.0
toge Mar 31, 2024
537249e
set `utilities` option on >= 7.3.0
toge Mar 31, 2024
a6e1b27
Merge branch 'master' into harfbuzz-8.4.0
toge Apr 23, 2024
0fab2cf
update 8.5.0
toge May 14, 2024
af4f815
remove 8.4.0
toge May 14, 2024
519939b
Merge branch 'master' into harfbuzz-8.4.0
toge May 20, 2024
6e479c1
update 9.0.0
toge Jul 5, 2024
81ec550
update 10.1.0
toge Nov 5, 2024
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"8.4.0":
url: "https://github.com/harfbuzz/harfbuzz/releases/download/8.4.0/harfbuzz-8.4.0.tar.xz"
sha256: "af4ea73e25ab748c8c063b78c2f88e48833db9b2ac369e29bd115702e789755e"
"8.3.0":
url: "https://github.com/harfbuzz/harfbuzz/releases/download/8.3.0/harfbuzz-8.3.0.tar.xz"
sha256: "109501eaeb8bde3eadb25fab4164e993fbace29c3d775bcaa1c1e58e2f15f847"
Expand Down
11 changes: 9 additions & 2 deletions recipes/harfbuzz/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"8.4.0":
folder: all
"8.3.0":
folder: all
"8.2.2":
Expand Down
Loading