[gimp/gtk3-port-meson] Rename Py2 dependencies. Disable pygimp for now.

[Félix Piédallu <fpiedallu src gnome org>]

commit 78c6be7ffbbb63bd34664185afd56222bfb4e942
Author: Félix Piédallu <felix piedallu me>
Date:   Fri Feb 16 17:37:21 2018 +0100

    Rename Py2 dependencies. Disable pygimp for now.

 meson.build                 |    9 ++---
 plug-ins/meson.build        |    2 +-
 plug-ins/pygimp/meson.build |   80 +++++++++++++++++++++++++++++--------------
 3 files changed, 59 insertions(+), 32 deletions(-)
---
diff --git a/meson.build b/meson.build
index cf70ae9..23c49e3 100644
--- a/meson.build
+++ b/meson.build
@@ -695,12 +695,11 @@ if have_python
   python2 = find_program('python2')
 
   libpython2= dependency('python2',       version: '>=2.5.0')
-  pygobject = dependency('pygobject-2.0', version: '>=2.10.4')
-  pygtk2    = dependency('pygtk-2.0',     version: '>=2.10.4')
-  pycairo   = dependency('pycairo',       version: '>=1.0.2')
+  py2gobject= dependency('pygobject-3.0', version: '>=2.10.4')
+  py2cairo  = dependency('pycairo',       version: '>=1.0.2')
 
-  pygobjectcodegen = find_program('pygobject-codegen-2.0')
-  pygtk_defsdir = pygtk2.get_pkgconfig_variable('defsdir')
+  # pygobjectcodegen = find_program('pygobject-codegen-2.0')
+  # pygtk_defsdir = pygtk2.get_pkgconfig_variable('defsdir')
 endif
 
 
diff --git a/plug-ins/meson.build b/plug-ins/meson.build
index 70cba60..09bff6a 100644
--- a/plug-ins/meson.build
+++ b/plug-ins/meson.build
@@ -25,7 +25,7 @@ subdir('map-object')
 subdir('metadata')
 subdir('pagecurl')
 subdir('print')
-subdir('pygimp')
+# subdir('pygimp')
 subdir('screenshot')
 subdir('script-fu')
 subdir('selection-to-path')
diff --git a/plug-ins/pygimp/meson.build b/plug-ins/pygimp/meson.build
index 7fb9ebd..9592463 100644
--- a/plug-ins/pygimp/meson.build
+++ b/plug-ins/pygimp/meson.build
@@ -3,21 +3,21 @@ if have_python
 subdir('doc')
 subdir('plug-ins')
 
-pwd = meson.current_source_dir()
-pygtk_generator = generator(pygobjectcodegen,
-  arguments: [
-      '--override', join_paths(pwd, '@BASENAME@.override'),
-      '--register', join_paths(pygtk_defsdir, 'gdk-types.defs'),
-      '--register', join_paths(pygtk_defsdir, 'gtk-types.defs'),
-      '--register', join_paths(pwd, 'gimp-types.defs'),
-      '--register', join_paths(pwd, 'gimpcolor-types.defs'),
-      '--register', join_paths(pwd, 'gimpenums-types.defs'),
-      '--prefix', '@BASENAME@',
-      '@INPUT@',
-  ],
-  output: '@BASENAME@.c',
-  capture: true,
-)
+# pwd = meson.current_source_dir()
+# pygtk_generator = generator(pygobjectcodegen,
+#   arguments: [
+#       '--override', join_paths(pwd, '@BASENAME@.override'),
+#       '--register', join_paths(pygtk_defsdir, 'gdk-types.defs'),
+#       '--register', join_paths(pygtk_defsdir, 'gtk-types.defs'),
+#       '--register', join_paths(pwd, 'gimp-types.defs'),
+#       '--register', join_paths(pwd, 'gimpcolor-types.defs'),
+#       '--register', join_paths(pwd, 'gimpenums-types.defs'),
+#       '--prefix', '@BASENAME@',
+#       '@INPUT@',
+#   ],
+#   output: '@BASENAME@.c',
+#   capture: true,
+# )
 
 
 python_so_libs = [
@@ -33,7 +33,11 @@ python_so_libs = [
       'pygimp-tile.c',
       'pygimp-vectors.c',
     ],
-    [ pycairo, cairo, gtk3, ],
+    [
+      py2cairo,
+      cairo,
+      gtk3,
+    ],
     [
       libgimp,
       libgimpbase,
@@ -42,15 +46,27 @@ python_so_libs = [
     ],
   ],
   [ '_gimpenums',
-    [ 'gimpenumsmodule.c', ],
-    [ gobject, cairo, gtk3, ],
+    [
+      'gimpenumsmodule.c',
+    ],
+    [
+      gobject,
+      cairo,
+      gtk3,
+    ],
     [
       libgimp,libgimpbase
     ],
   ],
   [ '_gimpui',
-    [ 'gimpuimodule.c',    pygtk_generator.process('gimpui.defs'), ],
-    [ pygtk2, pycairo, gtk3, ],
+    [
+      'gimpuimodule.c',
+      # pygtk_generator.process('gimpui.defs'),
+    ],
+    [
+      py2cairo,
+      gtk3,
+    ],
     [
       libgimp,
       libgimpbase,
@@ -61,14 +77,26 @@ python_so_libs = [
     ],
   ],
   [ 'gimpcolor',
-    [ 'gimpcolormodule.c', 'pygimp-colors.c', ],
-    [cairo],
-    [ libgimpcolor, ],
+    [
+      'gimpcolormodule.c',
+      'pygimp-colors.c',
+    ],
+    [
+      cairo
+    ],
+    [
+      libgimpcolor,
+    ],
   ],
   [ 'gimpthumb',
-    [ 'gimpthumbmodule.c', pygtk_generator.process('gimpthumb.defs'), ],
+    [
+      'gimpthumbmodule.c',
+      # pygtk_generator.process('gimpthumb.defs'),
+    ],
     [],
-    [ libgimpthumb, ],
+    [
+      libgimpthumb,
+    ],
   ],
 ]
 
@@ -77,7 +105,7 @@ foreach pylib : python_so_libs
     pylib[1],
     include_directories: [ rootInclude, ],
     dependencies: pylib[2] + [
-      libpython2, pygobject,
+      libpython2, py2gobject,
       gdk_pixbuf, gegl,
     ],
     link_with: pylib[3],