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

harfbuzz: remove unused versions #19649

Merged
merged 2 commits into from
Oct 5, 2023
Merged

harfbuzz: remove unused versions #19649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aea80a5
harfbuzz: remove unused versions
ericLemanissier Sep 7, 2023
1adf05a
Add 7.3.0 back to keep one minor version from 7
AbrilRBS Oct 2, 2023
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
26 changes: 0 additions & 26 deletions recipes/harfbuzz/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,44 +5,18 @@ sources:
"8.0.1":
url: "https://github.com/harfbuzz/harfbuzz/releases/download/8.0.1/harfbuzz-8.0.1.tar.xz"
sha256: "c1ce780acd385569f25b9a29603d1d5bc71e6940e55bfdd4f7266fad50e42620"
"8.0.0":
url: "https://github.com/harfbuzz/harfbuzz/releases/download/8.0.0/harfbuzz-8.0.0.tar.xz"
sha256: "1f98b5e3d06a344fe667d7e8210094ced458791499839bddde98c167ce6a7c79"
"7.3.0":
url: "https://github.com/harfbuzz/harfbuzz/releases/download/7.3.0/harfbuzz-7.3.0.tar.xz"
sha256: "20770789749ac9ba846df33983dbda22db836c70d9f5d050cb9aa5347094a8fb"
"7.1.0":
url: "https://github.com/harfbuzz/harfbuzz/releases/download/7.1.0/harfbuzz-7.1.0.tar.xz"
sha256: "f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b"
"6.0.0":
url: "https://github.com/harfbuzz/harfbuzz/releases/download/6.0.0/harfbuzz-6.0.0.tar.xz"
sha256: "1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4"
"5.3.1":
url: "https://github.com/harfbuzz/harfbuzz/releases/download/5.3.1/harfbuzz-5.3.1.tar.xz"
sha256: "4a6ce097b75a8121facc4ba83b5b083bfec657f45b003cd5a3424f2ae6b4434d"
"5.3.0":
url: "https://github.com/harfbuzz/harfbuzz/releases/download/5.3.0/harfbuzz-5.3.0.tar.xz"
sha256: "a05e19e3f52da24ed071522f0fddf872157d7d25e869cfd156cd6f1e81c42152"
"5.2.0":
url: "https://github.com/harfbuzz/harfbuzz/releases/download/5.2.0/harfbuzz-5.2.0.tar.xz"
sha256: "735a94917b47936575acb4d4fa7e7986522f8a89527e4635721474dee2bc942c"
"5.1.0":
url: "https://github.com/harfbuzz/harfbuzz/releases/download/5.1.0/harfbuzz-5.1.0.tar.xz"
sha256: "2edb95db668781aaa8d60959d21be2ff80085f31b12053cdd660d9a50ce84f05"
"4.4.1":
url: "https://github.com/harfbuzz/harfbuzz/releases/download/4.4.1/harfbuzz-4.4.1.tar.xz"
sha256: "c5bc33ac099b2e52f01d27cde21cee4281b9d5bfec7684135e268512478bc9ee"
"3.2.0":
url: "https://github.com/harfbuzz/harfbuzz/releases/download/3.2.0/harfbuzz-3.2.0.tar.xz"
sha256: "0ada50a1c199bb6f70843ab893c55867743a443b84d087d54df08ad883ebc2cd"
patches:
"5.1.0":
- patch_file: "patches/0000-fix-freetype-lookup-5.1.0.patch"
patch_type: "portability"
patch_description: "fix fretype and icu dependency lookup"
patch_source: "https://github.com/harfbuzz/harfbuzz/pull/3811"
"4.4.1":
- patch_file: "patches/0000-fix-freetype-lookup-4.4.1.patch"
patch_type: "portability"
patch_description: "fix fretype and icu dependency lookup"
patch_source: "https://github.com/harfbuzz/harfbuzz/pull/3811"
5 changes: 2 additions & 3 deletions recipes/harfbuzz/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,8 @@ def validate(self):
raise ConanInvalidConfiguration(
"Linking a shared library against static glib can cause unexpected behaviour."
)
if Version(self.version) >= "4.4.0":
if self.settings.compiler == "gcc" and Version(self.settings.compiler.version) < "7":
raise ConanInvalidConfiguration("New versions of harfbuzz require at least gcc 7")
if self.settings.compiler == "gcc" and Version(self.settings.compiler.version) < "7":
raise ConanInvalidConfiguration("New versions of harfbuzz require at least gcc 7")

if self.options.with_glib and self.dependencies["glib"].options.shared and is_msvc_static_runtime(self):
raise ConanInvalidConfiguration(
Expand Down
99 changes: 0 additions & 99 deletions recipes/harfbuzz/all/patches/0000-fix-freetype-lookup-4.4.1.patch
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions recipes/harfbuzz/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,9 @@ versions:
folder: all
"8.0.1":
folder: all
"8.0.0":
folder: all
"7.3.0":
folder: all
"7.1.0":
folder: all
"6.0.0":
folder: all
"5.3.1":
folder: all
"5.3.0":
folder: all
"5.2.0":
folder: all
"5.1.0":
folder: all
"4.4.1":
folder: all
"3.2.0":
folder: all