[amqpcpp/leptonica/glibmm] Update to latest version (#20069)

* [amqpcpp/leptonica/glibmm] Update to latest version * Modify the include dir path * Modify version schemes Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com>
microsoft · Sep 16, 2021 · fd8a264 · fd8a264
1 parent 660295d
commit fd8a264
Show file tree

Hide file tree

Showing 11 changed files with 79 additions and 32 deletions.
diff --git a/ports/amqpcpp/portfile.cmake b/ports/amqpcpp/portfile.cmake
@@ -5,30 +5,29 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CopernicaMarketingSoftware/AMQP-CPP
-    REF 9fa05100f43686f617722aaba7a500cd54b9804a #v4.3.11
-    SHA512 f4d311d3f430579deb0ff9d820d9c6160dce775622afe28731ed4e6abd6b827bf20afb5bdf52d246d0fb5afc469005cc34469f57063e197375b6be8ed93afe8b
+    REF 2749d36a9cf9def86fc8a30eceb0e3a11d85815d #v4.3.14
+    SHA512 ee6df360963bb5714c7503e27a9ed0682d704a267ef615fa922bd1cb637d1c0867c9074d5aeef084621840ef39f495a4103f22bfd80b6b1dd325bc6061e9c2ca
     HEAD_REF master
     PATCHES
         find-openssl.patch
 )
 
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if(VCPKG_TARGET_IS_LINUX)
     set(LINUX_TCP ON)
 else()
     set(LINUX_TCP OFF)
 endif()
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
     OPTIONS
         -DAMQP-CPP_BUILD_SHARED=OFF
         -DAMQP-CPP_LINUX_TCP=${LINUX_TCP}
 )
 
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/ports/amqpcpp/vcpkg.json b/ports/amqpcpp/vcpkg.json
@@ -1,10 +1,18 @@
 {
   "name": "amqpcpp",
-  "version-string": "4.3.11",
+  "version": "4.3.14",
   "description": "AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker",
   "homepage": "https://github.com/CopernicaMarketingSoftware/AMQP-CPP",
   "supports": "!uwp",
   "dependencies": [
-    "openssl"
+    "openssl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/ports/glibmm/portfile.cmake b/ports/glibmm/portfile.cmake
@@ -2,9 +2,9 @@
 vcpkg_fail_port_install(ON_TARGET "UWP")
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://ftp.gnome.org/pub/GNOME/sources/glibmm/2.68/glibmm-2.68.0.tar.xz"
-    FILENAME "glibmm-2.68.0.tar.xz"
-    SHA512 a13121052315e949acf2528e226079f1a2cf7853080aec770dcb269e422997e5515ed767c7a549231fb3fa5f913b3fd9ef083080589283824b6a218d066b253e
+    URLS "https://ftp.gnome.org/pub/GNOME/sources/glibmm/2.68/glibmm-2.68.1.tar.xz"
+    FILENAME "glibmm-2.68.1.tar.xz"
+    SHA512 ca164f986da651e66bb5b98a760853e73d57ff84e035809d4c3b2c0a1b6ddf8ca68ffc49a71d0e0b2e14eca1c00e2e727e3bf3821e0b2b3a808397c3d33c6d5c
 )
 
 vcpkg_extract_source_archive_ex(
@@ -24,5 +24,5 @@ vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
 
 # Handle copyright and readme
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME readme.txt)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME readme.txt)
diff --git a/ports/glibmm/vcpkg.json b/ports/glibmm/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "glibmm",
-  "version": "2.68.0",
+  "version": "2.68.1",
   "description": "This is glibmm, a C++ API for parts of glib that are useful for C++.",
   "homepage": "https://www.gtkmm.org.",
   "supports": "!uwp",

diff --git a/ports/leptonica/Modify-include-dir.patch b/ports/leptonica/Modify-include-dir.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5aed94f..9bfcff9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -212,7 +212,7 @@ include(Configure)
+
+ configure_file(${AUTOCONFIG_SRC} ${AUTOCONFIG} @ONLY)
+
+-set(INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" "${CMAKE_INSTALL_PREFIX}/include/leptonica")
++set(INCLUDE_DIR "\${CMAKE_CURRENT_LIST_DIR}/../../include" "\${CMAKE_CURRENT_LIST_DIR}/../../include/leptonica")
+
+ ###############################################################################
+ #
diff --git a/ports/leptonica/portfile.cmake b/ports/leptonica/portfile.cmake
@@ -1,32 +1,37 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO DanBloomberg/leptonica
-    REF 1ac72c93fef1a5eb76b76d6723d2aee843dd6e51 # 1.80.0
-    SHA512 d6d1af744691b70601b9f3d292d4593c36d392bcfd9e4c190fd533c2df40fcedfc226868429c25fad9b54c8ed68b61750832c9984c47ff72fc702dd3c3f438d6
+    REF 2ff4313a85427ceb272540c570106b2f893da097 # 1.81.1
+    SHA512 0e35538f1407e7220e68d635e5fd4c82219b58fb4b6ca8132d72892f52853e13451a2a160644a122c47598f77d2e87046cfb072be261be9a941342f476dc6376
     HEAD_REF master
     PATCHES
         fix-cmakelists.patch
         find-dependency.patch
         fix-find-libwebp.patch
+        Modify-include-dir.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC)
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
     OPTIONS
         -DSW_BUILD=OFF
+        -DCPPAN_BUILD=OFF
         -DSTATIC=${STATIC}
         -DCMAKE_REQUIRED_INCLUDES=${CURRENT_INSTALLED_DIR}/include # for check_include_file()
+    MAYBE_UNUSED_VARIABLES
+        STATIC
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+vcpkg_fixup_pkgconfig()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
 
 vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL ${SOURCE_PATH}/leptonica-license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/leptonica-license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/leptonica/vcpkg.json b/ports/leptonica/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "leptonica",
-  "version-string": "1.80.0",
-  "port-version": 3,
+  "version": "1.81.1",
   "description": "An open source library containing software that is broadly useful for image processing and image analysis applications",
   "homepage": "https://github.com/DanBloomberg/leptonica",
   "dependencies": [
@@ -11,6 +10,14 @@
     "libwebp",
     "openjpeg",
     "tiff",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
     "zlib"
   ]
 }
diff --git a/versions/a-/amqpcpp.json b/versions/a-/amqpcpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e17952ad85007dbc08e20711b8f5bd462712e4e0",
+      "version": "4.3.14",
+      "port-version": 0
+    },
     {
       "git-tree": "7f99b7612476d68b1cd6a026696741da9b90c230",
       "version-string": "4.3.11",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -69,7 +69,7 @@
       "port-version": 1
     },
     "amqpcpp": {
-      "baseline": "4.3.11",
+      "baseline": "4.3.14",
       "port-version": 0
     },
     "anax": {
@@ -2409,7 +2409,7 @@
       "port-version": 0
     },
     "glibmm": {
-      "baseline": "2.68.0",
+      "baseline": "2.68.1",
       "port-version": 0
     },
     "glm": {
@@ -3145,8 +3145,8 @@
       "port-version": 1
     },
     "leptonica": {
-      "baseline": "1.80.0",
-      "port-version": 3
+      "baseline": "1.81.1",
+      "port-version": 0
     },
     "lerc": {
       "baseline": "2.2",

diff --git a/versions/g-/glibmm.json b/versions/g-/glibmm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e43bb60b861fbd9469297581a968e3a647537b4d",
+      "version": "2.68.1",
+      "port-version": 0
+    },
     {
       "git-tree": "6074f2bdadef39758cbfc1238b03dc5051bf774d",
       "version": "2.68.0",

diff --git a/versions/l-/leptonica.json b/versions/l-/leptonica.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "215a8a32b41e1561998ac840c3c35404707186a2",
+      "version": "1.81.1",
+      "port-version": 0
+    },
     {
       "git-tree": "5068586428e64792c526ff7192b26ca96f27a673",
       "version-string": "1.80.0",