[jhbuild] 3.22, 3.24: Add gtk-mac-integration

[Philip Chimento <pchimento src gnome org>]

commit a942604f87a9e49659ab733310e8a805ea72e57f
Author: Philip Chimento <philip chimento gmail com>
Date:   Fri Nov 11 13:03:25 2016 -0800

    3.22, 3.24: Add gtk-mac-integration
    
    For now added only to 3.22 and 3.24. The modules that use this are,
    according to code search: glade, gspell, gedit, goffice, and gimp. It's
    also used by dia but I didn't change that as dia is still on GTK 2.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=774453

 modulesets/gnome-apps-3.22.modules             |    3 +++
 modulesets/gnome-apps-3.24.modules             |    3 +++
 modulesets/gnome-suites-core-3.22.modules      |    3 +++
 modulesets/gnome-suites-core-3.24.modules      |    3 +++
 modulesets/gnome-suites-core-deps-3.22.modules |   12 ++++++++++++
 modulesets/gnome-suites-core-deps-3.24.modules |   12 ++++++++++++
 modulesets/gnome-world.modules                 |    6 ++++++
 7 files changed, 42 insertions(+), 0 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.22.modules b/modulesets/gnome-apps-3.22.modules
index 40394a8..5c03b6f 100644
--- a/modulesets/gnome-apps-3.22.modules
+++ b/modulesets/gnome-apps-3.22.modules
@@ -373,6 +373,9 @@
       <dep package="gtk+"/>
       <dep package="libxml2"/>
       <dep package="yelp-tools"/>
+      <if condition-set="macos">
+        <dep package="gtk-mac-integration"/>
+      </if>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-apps-3.24.modules b/modulesets/gnome-apps-3.24.modules
index babacaa..ac26188 100644
--- a/modulesets/gnome-apps-3.24.modules
+++ b/modulesets/gnome-apps-3.24.modules
@@ -400,6 +400,9 @@
       <dep package="gtk+-3"/>
       <dep package="libxml2"/>
       <dep package="yelp-tools"/>
+      <if condition-set="macos">
+        <dep package="gtk-mac-integration"/>
+      </if>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-suites-core-3.22.modules b/modulesets/gnome-suites-core-3.22.modules
index 18918bd..9c9668b 100644
--- a/modulesets/gnome-suites-core-3.22.modules
+++ b/modulesets/gnome-suites-core-3.22.modules
@@ -730,6 +730,9 @@
       <dep package="gtksourceview"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="python3-devel"/>
+      <if condition-set="macos">
+        <dep package="gtk-mac-integration"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="gspell"/>
diff --git a/modulesets/gnome-suites-core-3.24.modules b/modulesets/gnome-suites-core-3.24.modules
index 9d4ccdd..dd8425b 100644
--- a/modulesets/gnome-suites-core-3.24.modules
+++ b/modulesets/gnome-suites-core-3.24.modules
@@ -739,6 +739,9 @@
       <dep package="gtksourceview-3"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="python3-devel"/>
+      <if condition-set="macos">
+        <dep package="gtk-mac-integration"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="gspell"/>
diff --git a/modulesets/gnome-suites-core-deps-3.22.modules b/modulesets/gnome-suites-core-deps-3.22.modules
index 35ffa19..6c20923 100644
--- a/modulesets/gnome-suites-core-deps-3.22.modules
+++ b/modulesets/gnome-suites-core-deps-3.22.modules
@@ -617,6 +617,9 @@
       <dep package="enchant"/>
       <dep package="iso-codes"/>
       <dep package="m4-common"/>
+      <if condition-set="macos">
+        <dep package="gtk-mac-integration"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -777,6 +780,15 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gtk-mac-integration">
+    <branch />
+    <dependencies>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk+"/>
+      <dep package="pygobject"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gtk-vnc" autogenargs="--with-gtk=3.0 --enable-vala">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-suites-core-deps-3.24.modules b/modulesets/gnome-suites-core-deps-3.24.modules
index 1ef919f..628d6e8 100644
--- a/modulesets/gnome-suites-core-deps-3.24.modules
+++ b/modulesets/gnome-suites-core-deps-3.24.modules
@@ -646,6 +646,9 @@
       <dep package="enchant"/>
       <dep package="iso-codes"/>
       <dep package="m4-common"/>
+      <if condition-set="macos">
+        <dep package="gtk-mac-integration"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -858,6 +861,15 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gtk-mac-integration">
+    <branch />
+    <dependencies>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk+"/>
+      <dep package="pygobject"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gtk-vnc" autogenargs="--with-gtk=3.0 --enable-vala">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index 5ff67e9..2d47810 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -2600,6 +2600,9 @@
       <dep package="pango"/>
       <dep package="librsvg"/>
       <dep package="cairo"/>
+      <if condition-set="macos">
+        <dep package="gtk-mac-integration"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -2866,6 +2869,9 @@
       <dep package="gtk+-2"/>
       <dep package="intltool"/>
       <dep package="gegl"/>
+      <if condition-set="macos">
+        <dep package="gtk-mac-integration"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="iso-codes"/>