r24535 by jghali - Fix build with harfbuzz-subset versions between 2.0.0 and 2.6.4

[scribus-commit]

Author: jghali
Date: Mon Mar  1 19:40:17 2021
New Revision: 24535

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24535
Log:
Fix build with harfbuzz-subset versions between 2.0.0 and 2.6.4

Modified:
    trunk/Scribus/CMakeLists_Dependencies.cmake
    trunk/Scribus/scribus/fonts/sfnt.cpp

Modified: trunk/Scribus/CMakeLists_Dependencies.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24535&path=/trunk/Scribus/CMakeLists_Dependencies.cmake
==============================================================================
--- trunk/Scribus/CMakeLists_Dependencies.cmake	(original)
+++ trunk/Scribus/CMakeLists_Dependencies.cmake	Mon Mar  1 19:40:17 2021
@@ -319,7 +319,7 @@
 pkg_check_modules(ICU REQUIRED icu-uc)
 
 # OpenType subsetting support
-pkg_check_modules(HARFBUZZ_SUBSET harfbuzz-subset>=2.0.0)
+pkg_check_modules(HARFBUZZ_SUBSET harfbuzz-subset>=2.4.0)
 if (HARFBUZZ_SUBSET_FOUND)
 	message("Harfbuzz subset library Found OK")
 	set (HAVE_HARFBUZZ_SUBSET ON)

Modified: trunk/Scribus/scribus/fonts/sfnt.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24535&path=/trunk/Scribus/scribus/fonts/sfnt.cpp
==============================================================================
--- trunk/Scribus/scribus/fonts/sfnt.cpp	(original)
+++ trunk/Scribus/scribus/fonts/sfnt.cpp	Mon Mar  1 19:40:17 2021
@@ -1259,7 +1259,9 @@
 	
 		hb_subset_input_set_retain_gids(hbSubsetInput.get(), true);
 		hb_subset_input_set_drop_hints(hbSubsetInput.get(), false);
+#if HB_VERSION_ATLEAST(2, 6, 5)
 		hb_subset_input_set_name_legacy(hbSubsetInput.get(), true);
+#endif
 
 		QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get()));
 		if (hbSubsetFace.isNull())