[cairomm] update to 1.16.2 (#27374) (#27376)

* [cairomm] update to 1.16.2 (#27374) * [cairomm] update to 1.16.2 (#27374) * Use VERSION defined by vcpkg, fix VCPKG_LIBRARY_LINKAGE typo, modernize release-only build handling. Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
microsoft · Oct 29, 2022 · b6cd882 · b6cd882
1 parent 61a8192
commit b6cd882
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 61 deletions.
diff --git a/ports/cairomm/build-support-msvc2022.diff b/ports/cairomm/build-support-msvc2022.diff
diff --git a/ports/cairomm/portfile.cmake b/ports/cairomm/portfile.cmake
@@ -1,21 +1,16 @@
-set(CAIROMM_VERSION 1.16.1)
-set(CAIROMM_HASH 2dbdd41f712d43573ad3118f37d443d2b9ae98737c240d5db8d830ef38f2b4a95182b2fc857577c7564eb94649e629f70380f16ee84f4978759f40e19d802757)
-
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.cairographics.org/releases/cairomm-${CAIROMM_VERSION}.tar.xz"
-    FILENAME "cairomm-${CAIROMM_VERSION}.tar.xz"
-    SHA512 ${CAIROMM_HASH}
+    URLS "https://www.cairographics.org/releases/cairomm-${VERSION}.tar.xz"
+    FILENAME "cairomm-${VERSION}.tar.xz"
+    SHA512 61dc639eabe8502e1262c53c92fe57c5647e5ab9931f86ed51e657df1b7d0e3e58c2571910a05236cc0dca8d52f1f693aed99a553430f14d0fb87be1832a6b62
 )
 
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-    PATCHES
-        build-support-msvc2022.diff
+    ARCHIVE "${ARCHIVE}"
 )
 
 vcpkg_configure_meson(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -Dbuild-examples=false
         -Dmsvc14x-parallel-installable=false    # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019
@@ -29,13 +24,9 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
-if(VCPKG_LIBRARY_LINAKGE STREQUAL "static")
-    set(_file "${CURRENT_PACKAGES_DIR}/lib/cairomm-1.16/include/cairommconfig.h")
-    if(EXISTS "${_file}")
-        vcpkg_replace_string("${_file}" "# define CAIROMM_DLL 1" "# undef CAIROMM_DLL\n# define CAIROMM_STATIC_LIB 1")
-    endif()
-    set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/cairomm-1.16/include/cairommconfig.h")
-    if(EXISTS "${_file}")
-        vcpkg_replace_string("${_file}" "# define CAIROMM_DLL 1" "# undef CAIROMM_DLL\n# define CAIROMM_STATIC_LIB 1")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/cairomm-1.16/include/cairommconfig.h" "# define CAIROMM_DLL 1" "# undef CAIROMM_DLL\n# define CAIROMM_STATIC_LIB 1")
+    if (NOT VCPKG_BUILD_TYPE)
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/cairomm-1.16/include/cairommconfig.h" "# define CAIROMM_DLL 1" "# undef CAIROMM_DLL\n# define CAIROMM_STATIC_LIB 1")
     endif()
 endif()
diff --git a/ports/cairomm/vcpkg.json b/ports/cairomm/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cairomm",
-  "version": "1.16.1",
+  "version": "1.16.2",
   "description": "A C++ wrapper for the cairo graphics library",
   "homepage": "https://www.cairographics.org",
   "license": "LGPL-2.0-only",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1273,7 +1273,7 @@
       "port-version": 4
     },
     "cairomm": {
-      "baseline": "1.16.1",
+      "baseline": "1.16.2",
       "port-version": 0
     },
     "calceph": {

diff --git a/versions/c-/cairomm.json b/versions/c-/cairomm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "07289b1edb75fecd2b706118b1a0919c5903c1c3",
+      "version": "1.16.2",
+      "port-version": 0
+    },
     {
       "git-tree": "5ae92557bdcf5f6dc8364cb179fd8fe57b0698ce",
       "version": "1.16.1",