From 2b681d95e08447fde261b4404fbeab324f7d1e5b Mon Sep 17 00:00:00 2001
From: Takuro IIZUKA <iitaku@gmail.com>
Date: Mon, 22 Jan 2024 16:02:32 -0800
Subject: [PATCH] [gobject-introspection] Fixed pkg-config file to follow vcpkg
 directory layout rule (#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 <t_iizuka@fixstars.com>
---
 ports/gobject-introspection/fix-pkgconfig.patch | 17 +++++++++++++++++
 ports/gobject-introspection/portfile.cmake      |  1 +
 ports/gobject-introspection/vcpkg.json          |  2 +-
 versions/baseline.json                          |  2 +-
 versions/g-/gobject-introspection.json          |  5 +++++
 5 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 ports/gobject-introspection/fix-pkgconfig.patch

diff --git a/ports/gobject-introspection/fix-pkgconfig.patch b/ports/gobject-introspection/fix-pkgconfig.patch
new file mode 100644
index 0000000000..8c8dfd2574
--- /dev/null
+++ 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
index a100fe08f8..b11c2efd26 100644
--- 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
index b6f1a0a437..eb5c570a70 100644
--- 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
index 3939570855..701a63d91d 100644
--- 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
index 5c5ac27213..f87d5c78eb 100644
--- 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",