[Git][freetype/freetype][master] [meson] Disable FreeType in HarfBuzz fallback.

[Werner Lemberg (@wl)]

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

• b861b241
  by Xavier Claessens at 2022-06-21T08:09:16+02:00

  [meson] Disable FreeType in HarfBuzz fallback.
  
  This avoids cyclic subproject configuration when the 'harfbuzz' feature is
  enabled, or `--wrap-mode=forcefallback` is used, but HarfBuzz is built as a
  subproject.  HarfBuzz does the same and disables HarfBuzz support when
  configuring FreeType as a subproject.
  
  * meson.build (harfbuzz_dep): Implement it.
  
  * subprojects/harfbuzz.wrap: New file.
  
  * .gitlab-ci.yml [windows meson]: Use latest version of the meson 0.59
    series, which has a necessary bug fix to make CI work.
  

3 changed files:

• .gitlab-ci.yml
• meson.build
• + subprojects/harfbuzz.wrap

Changes:

.gitlab-ci.yml

---

...	...	@@ -47,7 +47,7 @@ variables:
47	47	- Import-Certificate -CertStoreLocation "Cert:\LocalMachine\Root" "C:\roots.sst"
48	48	# Make sure meson is up to date so we don't need to rebuild the image
49	49	# with each release.
50		- - pip3 install meson==0.59.1
	50	+ - pip3 install 'meson==0.59.*'
51	51	- pip3 install --upgrade certifi
52	52	- pip3 install -U ninja
53	53

meson.build

---

...	...	@@ -335,7 +335,8 @@ endif
335	335	# Harfbuzz support
336	336	harfbuzz_dep = dependency('harfbuzz',
337	337	version: '>= 2.0.0',
338		- required: get_option('harfbuzz'))
	338	+ required: get_option('harfbuzz'),
	339	+ default_options: ['freetype=disabled'])
339	340
340	341	if harfbuzz_dep.found()
341	342	ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_HARFBUZZ']

subprojects/harfbuzz.wrap

---

	1	+[wrap-file]
	2	+directory = harfbuzz-4.3.0
	3	+
	4	+source_url = https://github.com/harfbuzz/harfbuzz/releases/download/4.3.0/harfbuzz-4.3.0.tar.xz
	5	+source_filename = harfbuzz-4.3.0.tar.xz
	6	+source_hash = a49628f4c4c8e6d8df95ef44935a93446cf2e46366915b0e3ca30df21fffb530
	7	+
	8	+[provide]
	9	+harfbuzz = libharfbuzz_dep
	10	+harfbuzz-subset = libharfbuzz_subset_dep
	11	+harfbuzz-icu = libharfbuzz_icu_dep
	12	+harfbuzz-gobject = libharfbuzz_gobject_dep

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings.