---
 extra/atk/build                     | 2 +-
 extra/atk/depends                   | 1 -
 extra/atk/message                   | 2 ++
 extra/freetype-harfbuzz/build       | 1 +
 extra/freetype-harfbuzz/depends     | 1 -
 extra/freetype-harfbuzz/message     | 2 ++
 extra/gdk-pixbuf/build              | 2 +-
 extra/gdk-pixbuf/depends            | 1 -
 extra/gdk-pixbuf/message            | 2 ++
 extra/gobject-introspection/message | 7 +++++++
 extra/gtk+3/build                   | 1 +
 extra/gtk+3/depends                 | 1 -
 extra/gtk+3/message                 | 2 ++
 extra/pango/build                   | 2 +-
 extra/pango/depends                 | 1 -
 extra/pango/message                 | 2 ++
 16 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 extra/atk/message
 create mode 100644 extra/freetype-harfbuzz/message
 create mode 100644 extra/gdk-pixbuf/message
 create mode 100644 extra/gobject-introspection/message
 create mode 100644 extra/gtk+3/message
 create mode 100644 extra/pango/message

diff --git a/extra/atk/build b/extra/atk/build
index 69920ff3..a2ef262f 100755
--- a/extra/atk/build
+++ b/extra/atk/build
@@ -5,7 +5,7 @@ export DESTDIR="$1"
 cl-meson \
     -Ddefault_library=both \
     -Ddocs=false \
-    -Dintrospection=true \
+    -Dintrospection=$(cpt l -C gobject-introspection true false) \
     . output
 
 ninja -C output
diff --git a/extra/atk/depends b/extra/atk/depends
index 505d6509..d9de633c 100644
--- a/extra/atk/depends
+++ b/extra/atk/depends
@@ -1,3 +1,2 @@
 glib
-gobject-introspection
 meson make
diff --git a/extra/atk/message b/extra/atk/message
new file mode 100644
index 00000000..e17cca95
--- /dev/null
+++ b/extra/atk/message
@@ -0,0 +1,2 @@
+if you want introspection support, please install
+gobject-introspection and rebuild this package
diff --git a/extra/freetype-harfbuzz/build b/extra/freetype-harfbuzz/build
index 74cfb24f..f9e5d5b9 100755
--- a/extra/freetype-harfbuzz/build
+++ b/extra/freetype-harfbuzz/build
@@ -30,6 +30,7 @@ build_harfbuzz() (
         -Dfreetype=enabled \
         -Ddefault_library=both \
         -Dicu=disabled \
+        -Dintrospection=$(cpt l -C gobject-introspection true false) \
         -Dbenchmark=disabled \
         -Dtests=disabled \
         -Dpkg_config_path="$1/usr/lib/pkgconfig" \
diff --git a/extra/freetype-harfbuzz/depends b/extra/freetype-harfbuzz/depends
index 91a2792a..3a0f0083 100644
--- a/extra/freetype-harfbuzz/depends
+++ b/extra/freetype-harfbuzz/depends
@@ -1,7 +1,6 @@
 bzip2
 expat
 glib
-gobject-introspection
 libX11
 libXau
 libXdamage
diff --git a/extra/freetype-harfbuzz/message b/extra/freetype-harfbuzz/message
new file mode 100644
index 00000000..e17cca95
--- /dev/null
+++ b/extra/freetype-harfbuzz/message
@@ -0,0 +1,2 @@
+if you want introspection support, please install
+gobject-introspection and rebuild this package
diff --git a/extra/gdk-pixbuf/build b/extra/gdk-pixbuf/build
index 0ba841ef..2c318734 100755
--- a/extra/gdk-pixbuf/build
+++ b/extra/gdk-pixbuf/build
@@ -3,7 +3,7 @@
 export DESTDIR="$1"
 
 cl-meson \
-    -Dintrospection=enabled \
+    -Dintrospection=$(cpt l -C gobject-introspection enabled disabled) \
     -Dpng=enabled \
     -Ddocs=false \
     -Dman=false \
diff --git a/extra/gdk-pixbuf/depends b/extra/gdk-pixbuf/depends
index 74ed9b60..a6b78545 100644
--- a/extra/gdk-pixbuf/depends
+++ b/extra/gdk-pixbuf/depends
@@ -1,5 +1,4 @@
 glib
-gobject-introspection
 libX11
 libpng
 meson            make
diff --git a/extra/gdk-pixbuf/message b/extra/gdk-pixbuf/message
new file mode 100644
index 00000000..e17cca95
--- /dev/null
+++ b/extra/gdk-pixbuf/message
@@ -0,0 +1,2 @@
+if you want introspection support, please install
+gobject-introspection and rebuild this package
diff --git a/extra/gobject-introspection/message b/extra/gobject-introspection/message
new file mode 100644
index 00000000..d6220077
--- /dev/null
+++ b/extra/gobject-introspection/message
@@ -0,0 +1,7 @@
+if you want introspection support,
+the packages that may need to be rebuild are:
+- atk
+- freetype-harfbuzz
+- gdk-pixbuf
+- gtk+3
+- pango
diff --git a/extra/gtk+3/build b/extra/gtk+3/build
index 1bd55b13..1d5edd95 100755
--- a/extra/gtk+3/build
+++ b/extra/gtk+3/build
@@ -18,6 +18,7 @@ cl-meson \
     -Dxinerama=yes \
     -Dx11_backend=true \
     -Dwayland_backend="$(cpt l -C wayland true false)" \
+    -Dintrospection=$(cpt l -C gobject-introspection true false) \
     -Dprint_backends=file \
     -Ddemos=false \
     -Dexamples=false \
diff --git a/extra/gtk+3/depends b/extra/gtk+3/depends
index 766f5299..59a104e1 100644
--- a/extra/gtk+3/depends
+++ b/extra/gtk+3/depends
@@ -1,7 +1,6 @@
 atk
 fribidi
 gdk-pixbuf
-gobject-introspection
 libXcomposite
 libXcursor
 libXdamage
diff --git a/extra/gtk+3/message b/extra/gtk+3/message
new file mode 100644
index 00000000..e17cca95
--- /dev/null
+++ b/extra/gtk+3/message
@@ -0,0 +1,2 @@
+if you want introspection support, please install
+gobject-introspection and rebuild this package
diff --git a/extra/pango/build b/extra/pango/build
index 43923ce0..4b69b53c 100755
--- a/extra/pango/build
+++ b/extra/pango/build
@@ -8,7 +8,7 @@ cl-meson \
     -Dcairo=enabled \
     -Dxft=enabled \
     -Dgtk_doc=false \
-    -Dintrospection=enabled \
+    -Dintrospection=$(cpt l -C gobject-introspection enabled disabled) \
     . build
 
 ninja -C build
diff --git a/extra/pango/depends b/extra/pango/depends
index 91cd9d0a..400e99c4 100644
--- a/extra/pango/depends
+++ b/extra/pango/depends
@@ -3,7 +3,6 @@ fontconfig
 freetype-harfbuzz
 fribidi
 glib
-gobject-introspection
 libXft
 libXrender
 meson      make
diff --git a/extra/pango/message b/extra/pango/message
new file mode 100644
index 00000000..e17cca95
--- /dev/null
+++ b/extra/pango/message
@@ -0,0 +1,2 @@
+if you want introspection support, please install
+gobject-introspection and rebuild this package
-- 
2.37.2