From bb111f26452058570714075f8cf4c58a53ad1961 Mon Sep 17 00:00:00 2001
From: Tobias Markus <tobbi.bugs@googlemail.com>
Date: Tue, 28 May 2019 15:37:07 +0200
Subject: [PATCH 1/6] Add libraqm

---
 ports/libraqm/CMakeLists.txt    | 34 +++++++++++++++++++++++++++++++++
 ports/libraqm/CONTROL           |  4 ++++
 ports/libraqm/FindFribidi.cmake | 12 ++++++++++++
 ports/libraqm/portfile.cmake    | 29 ++++++++++++++++++++++++++++
 4 files changed, 79 insertions(+)
 create mode 100644 ports/libraqm/CMakeLists.txt
 create mode 100644 ports/libraqm/CONTROL
 create mode 100644 ports/libraqm/FindFribidi.cmake
 create mode 100644 ports/libraqm/portfile.cmake

diff --git a/ports/libraqm/CMakeLists.txt b/ports/libraqm/CMakeLists.txt
new file mode 100644
index 00000000000000..18d1a776ba02cd
--- /dev/null
+++ b/ports/libraqm/CMakeLists.txt
@@ -0,0 +1,34 @@
+cmake_minimum_required(VERSION 3.11)
+
+project(raqm)
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_MODULE_PATH}")
+
+find_package(Freetype REQUIRED)
+find_package(Fribidi REQUIRED)
+find_package(harfbuzz CONFIG REQUIRED)
+
+find_path(HARFBUZZ_INCLUDE_DIRS
+          NAMES hb.h
+          PATH_SUFFIXES harfbuzz)
+find_path(FREETYPE_ADDITIONAL_INCLUDE_DIRS NAMES ft2build.h)
+add_library(raqm ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.c ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.h)
+
+target_include_directories(raqm SYSTEM PUBLIC ${FREETYPE_ADDITIONAL_INCLUDE_DIRS})
+target_include_directories(raqm SYSTEM PUBLIC ${FREETYPE_INCLUDE_DIRS})
+target_include_directories(raqm SYSTEM PUBLIC ${HARFBUZZ_INCLUDE_DIRS})
+target_include_directories(raqm SYSTEM PUBLIC ${FRIBIDI_INCLUDE_DIR})
+
+target_link_libraries(raqm PRIVATE Freetype::Freetype)
+target_link_libraries(raqm PRIVATE harfbuzz::harfbuzz ${FRIBIDI_LIBRARY})
+
+install(TARGETS raqm 
+    RUNTIME DESTINATION bin
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib
+)
+
+set(RAQM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
+set(RAQM_LIBRARY raqm)
+set(RAQM_LIBRARIES ${HARFBUZZ_LIBRARY} ${FRIBIDI_LIBRARY} ${RAQM_LIBRARY})
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
\ No newline at end of file
diff --git a/ports/libraqm/CONTROL b/ports/libraqm/CONTROL
new file mode 100644
index 00000000000000..131527a4a53c17
--- /dev/null
+++ b/ports/libraqm/CONTROL
@@ -0,0 +1,4 @@
+Source: libraqm
+Version: 0.6.0
+Description:  A library for complex text layout 
+Build-Depends: freetype, harfbuzz, fribidi
\ No newline at end of file
diff --git a/ports/libraqm/FindFribidi.cmake b/ports/libraqm/FindFribidi.cmake
new file mode 100644
index 00000000000000..a12bdb60ea5e06
--- /dev/null
+++ b/ports/libraqm/FindFribidi.cmake
@@ -0,0 +1,12 @@
+find_path(FRIBIDI_INCLUDE_DIR
+          NAMES fribidi/fribidi.h)
+
+set(FRIBIDI_INCLUDE_DIR "${FRIBIDI_INCLUDE_DIR}/fribidi")
+find_library(FRIBIDI_LIBRARY NAMES fribidi)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(FriBidi 
+    FOUND_VAR FRIBIDI_FOUND
+    REQUIRED_VARS  FRIBIDI_LIBRARY FRIBIDI_INCLUDE_DIR
+    VERSION_VAR FRIBIDI_VERSION_STRING    
+)
\ No newline at end of file
diff --git a/ports/libraqm/portfile.cmake b/ports/libraqm/portfile.cmake
new file mode 100644
index 00000000000000..198e4b6eb169d5
--- /dev/null
+++ b/ports/libraqm/portfile.cmake
@@ -0,0 +1,29 @@
+include(vcpkg_common_functions)
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO HOST-Oman/libraqm
+    REF v0.6.0
+    SHA512 cd223d97b80e9d2cf26a5b68fbb84a87e53df819f12ffd06f84f1786a2207b34828d0888058a40c1d89a1466bb68b75dd326e25415afab029d51e1ed98f6a924
+HEAD_REF master)
+
+file(COPY ${CURRENT_PORT_DIR}/FindFribidi.cmake DESTINATION ${SOURCE_PATH})
+file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+    -DCURRENT_PACKAGES_DIR=${CURRENT_PACKAGES_DIR}
+)
+
+vcpkg_install_cmake()
+
+vcpkg_copy_pdbs()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libraqm RENAME copyright)
+
+# Post-build test for cmake libraries
+vcpkg_test_cmake(PACKAGE_NAME raqm)

From 45e57f319657222eda39891fba73cb51b2cf3469 Mon Sep 17 00:00:00 2001
From: Victor Romero <romerosanchezv@gmail.com>
Date: Thu, 30 May 2019 13:30:16 -0700
Subject: [PATCH 2/6] [libraqm] Whitespace changes to force rebuild

---
 ports/libraqm/CMakeLists.txt | 2 +-
 ports/libraqm/portfile.cmake | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ports/libraqm/CMakeLists.txt b/ports/libraqm/CMakeLists.txt
index 18d1a776ba02cd..f50153e6313eb3 100644
--- a/ports/libraqm/CMakeLists.txt
+++ b/ports/libraqm/CMakeLists.txt
@@ -31,4 +31,4 @@ install(TARGETS raqm
 set(RAQM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
 set(RAQM_LIBRARY raqm)
 set(RAQM_LIBRARIES ${HARFBUZZ_LIBRARY} ${FRIBIDI_LIBRARY} ${RAQM_LIBRARY})
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
\ No newline at end of file
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
diff --git a/ports/libraqm/portfile.cmake b/ports/libraqm/portfile.cmake
index 198e4b6eb169d5..0978bd013208b5 100644
--- a/ports/libraqm/portfile.cmake
+++ b/ports/libraqm/portfile.cmake
@@ -1,4 +1,5 @@
 include(vcpkg_common_functions)
+
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
@@ -6,7 +7,7 @@ vcpkg_from_github(
     REPO HOST-Oman/libraqm
     REF v0.6.0
     SHA512 cd223d97b80e9d2cf26a5b68fbb84a87e53df819f12ffd06f84f1786a2207b34828d0888058a40c1d89a1466bb68b75dd326e25415afab029d51e1ed98f6a924
-HEAD_REF master)
+    HEAD_REF master)
 
 file(COPY ${CURRENT_PORT_DIR}/FindFribidi.cmake DESTINATION ${SOURCE_PATH})
 file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
@@ -15,7 +16,7 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-    -DCURRENT_PACKAGES_DIR=${CURRENT_PACKAGES_DIR}
+        -DCURRENT_PACKAGES_DIR=${CURRENT_PACKAGES_DIR}
 )
 
 vcpkg_install_cmake()

From a7a5dcd0e0ed213ef2dde5a4969e704dc6661ff3 Mon Sep 17 00:00:00 2001
From: the-j0k3r <31389848+the-j0k3r@users.noreply.github.com>
Date: Tue, 11 Jun 2019 09:57:10 +0100
Subject: [PATCH 3/6] [openssl] unix/windows bump to 1.0.2s

---
 ports/openssl-unix/CONTROL           | 2 +-
 ports/openssl-unix/portfile.cmake    | 4 ++--
 ports/openssl-windows/CONTROL        | 2 +-
 ports/openssl-windows/portfile.cmake | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/openssl-unix/CONTROL b/ports/openssl-unix/CONTROL
index 59f68613326040..4b6ec74057581a 100644
--- a/ports/openssl-unix/CONTROL
+++ b/ports/openssl-unix/CONTROL
@@ -1,3 +1,3 @@
 Source: openssl-unix
-Version: 1.0.2q
+Version: 1.0.2s
 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
diff --git a/ports/openssl-unix/portfile.cmake b/ports/openssl-unix/portfile.cmake
index b0064cdf4a6869..df9b6b69fb31c6 100644
--- a/ports/openssl-unix/portfile.cmake
+++ b/ports/openssl-unix/portfile.cmake
@@ -3,14 +3,14 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAM
 endif()
 
 include(vcpkg_common_functions)
-set(OPENSSL_VERSION 1.0.2q)
+set(OPENSSL_VERSION 1.0.2s)
 
 vcpkg_find_acquire_program(PERL)
 
 vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE
     URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.0.2/openssl-${OPENSSL_VERSION}.tar.gz"
     FILENAME "openssl-${OPENSSL_VERSION}.tar.gz"
-    SHA512 403e6cad42db3ba860c3fa4fa81c1b7b02f0b873259e5c19a7fc8e42de0854602555f1b1ca74f4e3a7737a4cbd3aac063061e628ec86534586500819fae7fec0
+    SHA512 9f745452c4f777df694158e95003cde78a2cf8199bc481a563ec36644664c3c1415a774779b9791dd18f2aeb57fa1721cb52b3db12d025955e970071d5b66d2a
 )
 
 vcpkg_extract_source_archive_ex(
diff --git a/ports/openssl-windows/CONTROL b/ports/openssl-windows/CONTROL
index bdbf764ab839dc..33c30e638082df 100644
--- a/ports/openssl-windows/CONTROL
+++ b/ports/openssl-windows/CONTROL
@@ -1,3 +1,3 @@
 Source: openssl-windows
-Version: 1.0.2q-2
+Version: 1.0.2s-1
 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
diff --git a/ports/openssl-windows/portfile.cmake b/ports/openssl-windows/portfile.cmake
index b5e505a3dc1950..21191681dd1eb1 100644
--- a/ports/openssl-windows/portfile.cmake
+++ b/ports/openssl-windows/portfile.cmake
@@ -3,7 +3,7 @@ if(VCPKG_CMAKE_SYSTEM_NAME)
 endif()
 
 include(vcpkg_common_functions)
-set(OPENSSL_VERSION 1.0.2q)
+set(OPENSSL_VERSION 1.0.2s)
 
 vcpkg_find_acquire_program(PERL)
 
@@ -13,7 +13,7 @@ set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH}")
 vcpkg_download_distfile(ARCHIVE
     URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.0.2/openssl-${OPENSSL_VERSION}.tar.gz"
     FILENAME "openssl-${OPENSSL_VERSION}.tar.gz"
-    SHA512 403e6cad42db3ba860c3fa4fa81c1b7b02f0b873259e5c19a7fc8e42de0854602555f1b1ca74f4e3a7737a4cbd3aac063061e628ec86534586500819fae7fec0
+    SHA512 9f745452c4f777df694158e95003cde78a2cf8199bc481a563ec36644664c3c1415a774779b9791dd18f2aeb57fa1721cb52b3db12d025955e970071d5b66d2a
 )
 
 vcpkg_extract_source_archive_ex(

From 874eadc574b94a05607a8408958401a524c10447 Mon Sep 17 00:00:00 2001
From: Victor Romero <romerosanchezv@gmail.com>
Date: Tue, 11 Jun 2019 13:39:40 -0700
Subject: [PATCH 4/6] [harfbuzz] Propagate dependency on glib downstream

---
 ports/harfbuzz/CONTROL        |  2 +-
 ports/harfbuzz/portfile.cmake | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL
index 133d0bc0efb579..d0e544d7a70e61 100644
--- a/ports/harfbuzz/CONTROL
+++ b/ports/harfbuzz/CONTROL
@@ -1,5 +1,5 @@
 Source: harfbuzz
-Version: 2.5.1
+Version: 2.5.1-1
 Description: HarfBuzz OpenType text shaping engine
 Build-Depends: freetype, ragel, gettext (osx)
 Default-Features: ucdn
diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake
index d28bd656f71a7d..08b20f2702d013 100644
--- a/ports/harfbuzz/portfile.cmake
+++ b/ports/harfbuzz/portfile.cmake
@@ -68,9 +68,22 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
+
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/harfbuzz TARGET_PATH share/harfbuzz)
+
 vcpkg_copy_pdbs()
 
+if (HAVE_GLIB)
+    # Propagate dependency on glib downstream
+    file(READ "${CURRENT_PACKAGES_DIR}/share/harfbuzz/harfbuzzConfig.cmake" _contents)
+    file(WRITE "${CURRENT_PACKAGES_DIR}/share/harfbuzz/harfbuzzConfig.cmake" "
+include(CMakeFindDependencyMacro)
+find_dependency(unofficial-glib CONFIG)
+    
+${_contents}
+")
+endif()
+
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/harfbuzz RENAME copyright)
 

From 35cb935cbaee60baaf66fc82a73246561b092876 Mon Sep 17 00:00:00 2001
From: Victor Romero <romerosanchezv@gmail.com>
Date: Wed, 12 Jun 2019 15:23:32 -0700
Subject: [PATCH 5/6] [fribidi] Force rebuild on CI

---
 ports/fribidi/portfile.cmake | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ports/fribidi/portfile.cmake b/ports/fribidi/portfile.cmake
index ec5dc15538ae8c..5b45a17b164a70 100644
--- a/ports/fribidi/portfile.cmake
+++ b/ports/fribidi/portfile.cmake
@@ -5,12 +5,15 @@ vcpkg_from_github(
     REPO fribidi/fribidi
     REF 58c6cb390a9a18c98b2cbaac555d8ea9352a9e4f
     SHA512 1ec9c19faa87886786ce1589e2c66cab173b48e34d0e43487becc8606001f21f6ed17d0abd1c322fbbcaeb96a47ed882cad228be2e9beb019020ca2a475fc298
-HEAD_REF master)
+    HEAD_REF master
+)
 
-vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH}
+vcpkg_configure_meson(
+    SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
         -Ddocs=false
-        --backend=ninja)
+        --backend=ninja
+)
 
 vcpkg_install_meson()
 vcpkg_copy_pdbs()
@@ -28,4 +31,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
 endif()
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/fribidi RENAME copyright)
\ No newline at end of file
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/fribidi RENAME copyright)

From da4fd28a025119b020d04973b937fa9131ddee6f Mon Sep 17 00:00:00 2001
From: Victor Romero <romerosanchezv@gmail.com>
Date: Wed, 12 Jun 2019 15:33:39 -0700
Subject: [PATCH 6/6] [libraqm] Force CI build

---
 ports/harfbuzz/portfile.cmake | 2 ++
 ports/libraqm/portfile.cmake  | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake
index 08b20f2702d013..48cfaf1b744268 100644
--- a/ports/harfbuzz/portfile.cmake
+++ b/ports/harfbuzz/portfile.cmake
@@ -17,9 +17,11 @@ vcpkg_from_github(
 )
 
 file(READ ${SOURCE_PATH}/CMakeLists.txt _contents)
+
 if("${_contents}" MATCHES "include \\(FindFreetype\\)")
     message(FATAL_ERROR "Harfbuzz's cmake must not directly include() FindFreetype.")
 endif()
+
 if("${_contents}" MATCHES "find_library\\(GLIB_LIBRARIES")
     message(FATAL_ERROR "Harfbuzz's cmake must not directly find_library() glib.")
 endif()
diff --git a/ports/libraqm/portfile.cmake b/ports/libraqm/portfile.cmake
index 0978bd013208b5..067f63ddea5d81 100644
--- a/ports/libraqm/portfile.cmake
+++ b/ports/libraqm/portfile.cmake
@@ -7,7 +7,8 @@ vcpkg_from_github(
     REPO HOST-Oman/libraqm
     REF v0.6.0
     SHA512 cd223d97b80e9d2cf26a5b68fbb84a87e53df819f12ffd06f84f1786a2207b34828d0888058a40c1d89a1466bb68b75dd326e25415afab029d51e1ed98f6a924
-    HEAD_REF master)
+    HEAD_REF master
+)
 
 file(COPY ${CURRENT_PORT_DIR}/FindFribidi.cmake DESTINATION ${SOURCE_PATH})
 file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})