Update harfbuzz to 1.3.4

The needed local patches are now upstreamed thus no longer needed.

Also Uniscribe backend is no longer default enabled so almost no lib
is needed to be linked.

4 files changed, 8 insertions, 82 deletions

diff --git a/ports/harfbuzz/0001-Add-an-extra-path-input-for-Freetype.patch b/ports/harfbuzz/0001-Add-an-extra-path-input-for-Freetype.patch
deleted file mode 100644
index 75b81c28f..000000000
--- a/ports/harfbuzz/0001-Add-an-extra-path-input-for-Freetype.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From be3c446b1dd798b835052188813ee4e7cf135a81 Mon Sep 17 00:00:00 2001
-From: Vincent Lejeune <vljn.ovi@gmail.com>
-Date: Wed, 12 Oct 2016 00:27:35 +0200
-Subject: [PATCH] Add an extra path input for Freetype.
-
----
- win32/config-msvc.mak    | 3 +++
- win32/detectenv-msvc.mak | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/win32/config-msvc.mak b/win32/config-msvc.mak
-index e0c6468..1ad0913 100644
---- a/win32/config-msvc.mak
-+++ b/win32/config-msvc.mak
-@@ -124,6 +124,9 @@ HB_DEFINES = $(HB_DEFINES) /DHAVE_CAIRO=1
- 
- # Enable freetype if desired
- !if "$(FREETYPE)" == "1"
-+HB_CFLAGS =	\
-+	$(HB_CFLAGS)					\
-+	/I$(FREETYPE_DIR)
- HB_DEFINES = $(HB_DEFINES) /DHAVE_FREETYPE=1
- HB_SOURCES = $(HB_SOURCES) $(HB_FT_sources)
- HB_HEADERS = $(HB_HEADERS) $(HB_FT_headers)
-diff --git a/win32/detectenv-msvc.mak b/win32/detectenv-msvc.mak
-index 83d8786..ad67493 100644
---- a/win32/detectenv-msvc.mak
-+++ b/win32/detectenv-msvc.mak
-@@ -129,7 +129,7 @@ LDFLAGS_ARCH = /machine:x86
- !if "$(VALID_CFGSET)" == "TRUE"
- CFLAGS = $(CFLAGS_ADD) /W3 /Zi /I.. /I..\src /I. /I$(PREFIX)\include
- 
--LDFLAGS_BASE = $(LDFLAGS_ARCH) /libpath:$(PREFIX)\lib /DEBUG
-+LDFLAGS_BASE = $(LDFLAGS_ARCH) /libpath:$(PREFIX)\lib  /libpath:$(VCPKG_LIB_DIR) /DEBUG
- 
- !if "$(CFG)" == "debug"
- LDFLAGS = $(LDFLAGS_BASE)
--- 
-2.10.0.windows.1
-
diff --git a/ports/harfbuzz/0001-Set-d-suffix-for-debug-freetype-lib.patch b/ports/harfbuzz/0001-Set-d-suffix-for-debug-freetype-lib.patch
deleted file mode 100644
index fce3ba562..000000000
--- a/ports/harfbuzz/0001-Set-d-suffix-for-debug-freetype-lib.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 2be3a687a3079c3988d718293e4ee5d8fc9797b7 Mon Sep 17 00:00:00 2001
-From: vlj <vljn.ovi@gmail.com>
-Date: Sat, 8 Oct 2016 21:14:57 +0200
-Subject: [PATCH] Set d suffix for debug freetype lib.
-
----
- win32/config-msvc.mak | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/win32/config-msvc.mak b/win32/config-msvc.mak
-index 9cc6608..236aef7 100644
---- a/win32/config-msvc.mak
-+++ b/win32/config-msvc.mak
-@@ -12,7 +12,11 @@ HB_GLIB_LIBS = glib-2.0.lib
- HB_GOBJECT_DEP_LIBS = gobject-2.0.lib $(HB_GLIB_LIBS)
- 
- # Freetype is needed for building FreeType support and hb-view
-+!if "$(CFG)" == "debug"
-+FREETYPE_LIB = freetyped.lib
-+!else
- FREETYPE_LIB = freetype.lib
-+!endif
- 
- # Cairo is needed for building hb-view
- CAIRO_LIB = cairo.lib
--- 
-2.10.0.windows.1
-
diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL
index dd5207077..eab88ff11 100644
--- a/ports/harfbuzz/CONTROL
+++ b/ports/harfbuzz/CONTROL
@@ -1,4 +1,4 @@
 Source: harfbuzz
-Version: 1.3.2
+Version: 1.3.4
 Description: HarfBuzz OpenType text shaping engine
 Build-Depends: freetype
diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake
index 2603fdf0a..b818e0938 100644
--- a/ports/harfbuzz/portfile.cmake
+++ b/ports/harfbuzz/portfile.cmake
@@ -11,34 +11,28 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
     set(VCPKG_LIBRARY_LINKAGE dynamic)
 endif()
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/harfbuzz-1.3.2)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/harfbuzz-1.3.4)
 find_program(NMAKE nmake)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.3.2.tar.bz2"
-    FILENAME "harfbuzz-1.3.2.tar.bz2"
-    SHA512 19f846ee75d8a2d94da2a2b489fa8e54a5120599f998e451187f6695aa3931b28c491bbc0837892eaaebbd1da3441effe01f5f2470454f83cfa6a7c510ebcb32
+    URLS "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.3.4.tar.bz2"
+    FILENAME "harfbuzz-1.3.4.tar.bz2"
+    SHA512 72027ce64d735f1f7ecabcc78ba426d6155cebd564439feb77cefdfc28b00bfd9f6314e6735addaa90cee1d98cf6d2c0b61f77b446ba34e11f7eb7cdfdcd386a
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Add-an-extra-path-input-for-Freetype.patch"
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Set-d-suffix-for-debug-freetype-lib.patch"
-)
-
 file(TO_NATIVE_PATH "${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/include" FREETYPE_INCLUDE_DIR)
 file(TO_NATIVE_PATH "${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/debug/lib" FREETYPE_LIB_DIR_DBG)
 file(TO_NATIVE_PATH "${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/lib" FREETYPE_LIB_DIR_REL)
 
 vcpkg_execute_required_process(
-    COMMAND ${NMAKE} -f Makefile.vc CFG=debug FREETYPE=1 FREETYPE_DIR=${FREETYPE_INCLUDE_DIR} VCPKG_LIB_DIR=${FREETYPE_LIB_DIR_DBG}
+    COMMAND ${NMAKE} -f Makefile.vc CFG=debug FREETYPE=1 FREETYPE_DIR=${FREETYPE_INCLUDE_DIR} ADDITIONAL_LIB_DIR=${FREETYPE_LIB_DIR_DBG}
     WORKING_DIRECTORY ${SOURCE_PATH}/win32/
     LOGNAME nmake-build-${TARGET_TRIPLET}-debug
 )
 
 vcpkg_execute_required_process(
-    COMMAND ${NMAKE} -f Makefile.vc CFG=release FREETYPE=1 FREETYPE_DIR=${FREETYPE_INCLUDE_DIR} VCPKG_LIB_DIR=${FREETYPE_LIB_DIR_REL}
+    COMMAND ${NMAKE} -f Makefile.vc CFG=release FREETYPE=1 FREETYPE_DIR=${FREETYPE_INCLUDE_DIR} ADDITIONAL_LIB_DIR=${FREETYPE_LIB_DIR_REL}
     WORKING_DIRECTORY ${SOURCE_PATH}/win32/
     LOGNAME nmake-build-${TARGET_TRIPLET}-release
 )
@@ -61,5 +55,5 @@ vcpkg_execute_required_process(
 )
 
 # Handle copyright
-file(COPY ${CURRENT_BUILDTREES_DIR}/src/harfbuzz-1.3.2/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/harfbuzz)
+file(COPY ${CURRENT_BUILDTREES_DIR}/src/harfbuzz-1.3.4/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/harfbuzz)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/harfbuzz/COPYING ${CURRENT_PACKAGES_DIR}/share/harfbuzz/copyright)