From 92f6eb402afbf32dcc8d4083ccb5ae01dcf10881 Mon Sep 17 00:00:00 2001
From: Daniel <supsuper@gmail.com>
Date: Mon, 10 Aug 2020 23:33:47 +0100
Subject: [PATCH] [fribidi] Update to 1.0.10 (#12517)

* [fribidi] Update to 1.0.10

* [fribidi] Disable tests and executables

* [fribidi] Apply FRIBIDI_LIB_STATIC to static builds

Co-authored-by: wangli28 <wangli28@beyondsoft.com>
---
 ports/fribidi/CONTROL                     |  2 +-
 ports/fribidi/fix-win-static-suffix.patch | 42 ++++++++---------------
 ports/fribidi/portfile.cmake              | 23 ++++++-------
 3 files changed, 26 insertions(+), 41 deletions(-)

diff --git a/ports/fribidi/CONTROL b/ports/fribidi/CONTROL
index edfb9c77707406..570fd13621e5b2 100644
--- a/ports/fribidi/CONTROL
+++ b/ports/fribidi/CONTROL
@@ -1,4 +1,4 @@
 Source: fribidi
-Version: 1.0.9-1
+Version: 1.0.10
 Description: GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi)
 Build-Depends: tool-meson
diff --git a/ports/fribidi/fix-win-static-suffix.patch b/ports/fribidi/fix-win-static-suffix.patch
index 87f288e939641a..953b1b91be7d19 100644
--- a/ports/fribidi/fix-win-static-suffix.patch
+++ b/ports/fribidi/fix-win-static-suffix.patch
@@ -1,39 +1,25 @@
 diff --git a/lib/meson.build b/lib/meson.build
-index 573d47f..c9b249e 100644
+index aaf2aed..3fe8937 100644
 --- a/lib/meson.build
 +++ b/lib/meson.build
-@@ -71,14 +71,26 @@ fribidi_sources = [
+@@ -71,6 +71,10 @@ fribidi_sources = [
    'fribidi-shape.c',
  ]
  
--libfribidi = library('fribidi',
--  fribidi_sources, fribidi_unicode_version_h, fribidi_config_h,
--  generated_tab_include_files, config_h,
--  include_directories: incs,
--  c_args: ['-DHAVE_CONFIG_H'] + visibility_args,
--  version: libversion,
--  soversion: soversion,
--  install: true)
++libsuffix = []
 +if host_machine.system() == 'windows' and get_option('default_library') == 'static'
-+    libfribidi = library('fribidi',
-+    fribidi_sources, fribidi_unicode_version_h, fribidi_config_h,
-+    generated_tab_include_files, config_h,
-+    include_directories: incs,
-+    c_args: ['-DHAVE_CONFIG_H'] + visibility_args,
-+    version: libversion,
-+    soversion: soversion,
-+    install: true,
-+    name_suffix: 'lib')
-+else
-+    libfribidi = library('fribidi',
-+    fribidi_sources, fribidi_unicode_version_h, fribidi_config_h,
-+    generated_tab_include_files, config_h,
-+    include_directories: incs,
-+    c_args: ['-DHAVE_CONFIG_H'] + visibility_args,
-+    version: libversion,
-+    soversion: soversion,
-+    install: true)
++  libsuffix = 'lib'
 +endif
+ libfribidi = library('fribidi',
+   fribidi_sources, fribidi_unicode_version_h, fribidi_config_h,
+   generated_tab_include_files, config_h,
+@@ -78,7 +82,8 @@ libfribidi = library('fribidi',
+   c_args: ['-DHAVE_CONFIG_H', '-DFRIBIDI_BUILD'] + fribidi_static_cargs + visibility_args,
+   version: libversion,
+   soversion: soversion,
+-  install: true)
++  install: true,
++  name_suffix: libsuffix)
  
  libfribidi_dep = declare_dependency(link_with: libfribidi,
    include_directories: incs,
diff --git a/ports/fribidi/portfile.cmake b/ports/fribidi/portfile.cmake
index 342b4d3c5786c6..740502bdd8c88d 100644
--- a/ports/fribidi/portfile.cmake
+++ b/ports/fribidi/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fribidi/fribidi
-    REF abea9f626732a9b10499d76c1cd69ce5457950cc # v1.0.9
-    SHA512 5cb28f9e35d0df205c9fb88a56776d371fdd8bca12c211cec282334cfbf12a05e3324cd14a3ae71bcc06e15ce07b06cbe97eaafe1c7368e517a4ce5a4c3a2bcc
+    REF 5464c284034da9c058269377b7f5013bb089f553 # v1.0.10
+    SHA512 82e42b022f23d6ecebac5071f997c9f46db6aa41c36f87a7f1a28a79b4ccaada10d68b233bbf687c552fc94d91f4b47161e0ef4909fd1de0b483089f1d1377f9
     HEAD_REF master
     PATCHES fix-win-static-suffix.patch
 )
@@ -11,23 +11,22 @@ vcpkg_configure_meson(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
         -Ddocs=false
+        -Dbin=false
+        -Dtests=false
         --backend=ninja
 )
 
 vcpkg_install_meson()
 vcpkg_copy_pdbs()
 
-file(GLOB EXE_FILES
-    "${CURRENT_PACKAGES_DIR}/bin/*.exe"
-    "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe"
-)
-if (EXE_FILES)
-    file(REMOVE ${EXE_FILES})
-endif()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+# Define static macro
+file(READ ${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h FRIBIDI_COMMON_H)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    string(REPLACE "#ifndef FRIBIDI_LIB_STATIC" "#if 0" FRIBIDI_COMMON_H "${FRIBIDI_COMMON_H}")
+else()
+    string(REPLACE "#ifndef FRIBIDI_LIB_STATIC" "#if 1" FRIBIDI_COMMON_H "${FRIBIDI_COMMON_H}")
 endif()
+file(WRITE ${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h "${FRIBIDI_COMMON_H}")
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file