[gobject-introspection] Fixed pkg-config file to follow vcpkg directo…

…ry layout rule (microsoft#36279) * Fixed g-ir-scanner, g-ir-compiler, and g-ir-generator path in .pc to follow vcpkg directory layout rule * Bumped port-version * Run x-add-version --------- Co-authored-by: Takuro Iizuka <[email protected]>
azure-sdk · Jan 23, 2024 · 2b681d9 · 2b681d9
1 parent fa6e6a6
commit 2b681d9
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 2 deletions.
diff --git a/ports/gobject-introspection/fix-pkgconfig.patch b/ports/gobject-introspection/fix-pkgconfig.patch
@@ -0,0 +1,17 @@
+diff --git a/meson.build b/meson.build
+index b253927..312fbdc 100644
+--- a/meson.build
++++ b/meson.build
+@@ -254,9 +254,9 @@ endif
+ pkgconfig_variables = [
+   'datadir=' + '${prefix}' / get_option('datadir'),
+   'bindir=' + '${prefix}' / get_option('bindir'),
+-  'g_ir_scanner=${bindir}/g-ir-scanner',
+-  'g_ir_compiler=${bindir}/g-ir-compiler@0@'.format(exe_ext),
+-  'g_ir_generate=${bindir}/g-ir-generate@0@'.format(exe_ext),
++  'g_ir_scanner=${prefix}/tools/gobject-introspection/g-ir-scanner',
++  'g_ir_compiler=${prefix}/tools/gobject-introspection/g-ir-compiler@0@'.format(exe_ext),
++  'g_ir_generate=${prefix}/tools/gobject-introspection/g-ir-generate@0@'.format(exe_ext),
+   'gidatadir=${datadir}/gobject-introspection-1.0',
+   'girdir=' + gir_dir_pc_prefix / 'gir-1.0',
+   'typelibdir=${libdir}/girepository-1.0',
diff --git a/ports/gobject-introspection/portfile.cmake b/ports/gobject-introspection/portfile.cmake
@@ -16,6 +16,7 @@ vcpkg_extract_source_archive(
         0002-cross-build.patch
         0003-fix-paths.patch
         python.patch
+        fix-pkgconfig.patch
 )
 
 vcpkg_find_acquire_program(FLEX)

diff --git a/ports/gobject-introspection/vcpkg.json b/ports/gobject-introspection/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gobject-introspection",
   "version": "1.72.0",
-  "port-version": 6,
+  "port-version": 7,
   "description": "A middleware layer between C libraries (using GObject) and language bindings.",
   "homepage": "https://gi.readthedocs.io/en/latest/",
   "license": null,

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -3070,7 +3070,7 @@
     },
     "gobject-introspection": {
       "baseline": "1.72.0",
-      "port-version": 6
+      "port-version": 7
     },
     "google-cloud-cpp": {
       "baseline": "2.20.0",

diff --git a/versions/g-/gobject-introspection.json b/versions/g-/gobject-introspection.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9d0cfb4e7056136db4c9def1e64b88b7417dc0e8",
+      "version": "1.72.0",
+      "port-version": 7
+    },
     {
       "git-tree": "aa7163808411a8ff5641022957909a6d681cea69",
       "version": "1.72.0",