[glib]: fix pkgconfig tools path (#26743)

* [glib]: fix pkgconfig tools path * Update version database
microsoft · Sep 13, 2022 · 88fe662 · 88fe662
1 parent 24b59b9
commit 88fe662
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake
@@ -88,16 +88,16 @@ else()
     set(SYSTEM_LIBRARIES resolv mount blkid selinux)
 endif()
 if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gio-2.0.pc")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gio-2.0.pc" "\${bindir}" "\${bindir}/../tools/${PORT}")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gio-2.0.pc" "\${bindir}" "\${prefix}/tools/${PORT}")
 endif()
 if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gio-2.0.pc")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gio-2.0.pc" "\${bindir}" "\${bindir}/../../tools/${PORT}")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gio-2.0.pc" "\${bindir}" "\${prefix}/../tools/${PORT}")
 endif()
 if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glib-2.0.pc")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glib-2.0.pc" "\${bindir}" "\${bindir}/../tools/${PORT}")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glib-2.0.pc" "\${bindir}" "\${prefix}/tools/${PORT}")
 endif()
 if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glib-2.0.pc")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glib-2.0.pc" "\${bindir}" "\${bindir}/../../tools/${PORT}")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glib-2.0.pc" "\${bindir}" "\${prefix}/../tools/${PORT}")
 endif()
 vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES ${SYSTEM_LIBRARIES})
 

diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "glib",
   "version": "2.72.3",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Portable, general-purpose utility library.",
   "homepage": "https://developer.gnome.org/glib/",
   "license": "LGPL-2.1-only",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2622,7 +2622,7 @@
     },
     "glib": {
       "baseline": "2.72.3",
-      "port-version": 2
+      "port-version": 3
     },
     "glibmm": {
       "baseline": "2.70.0",

diff --git a/versions/g-/glib.json b/versions/g-/glib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c9fbf2ec21948d70e4b8d5e633e600344982069f",
+      "version": "2.72.3",
+      "port-version": 3
+    },
     {
       "git-tree": "aed4b2abc6c22c9b49d18ad5ab5d3f12cb330d22",
       "version": "2.72.3",