fixes for pygtk and some dependencies (#3077)

var/spack/repos/builtin/packages/py-pygobject/package.py

@@ -31,18 +31,23 @@ class PyPygobject(AutotoolsPackage):
 
     homepage = "https://pypi.python.org/pypi/pygobject"
 
-    # FIXME: This URL is no longer available for download from PyPi
-    url      = "https://pypi.python.org/packages/6d/15/97c8b5ccca2be14cf59a2f79e15e3a82a1c3408a6b76b4107689a8b94846/pygobject-2.28.3.tar.bz2"
+    url      = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/pygobject-2.28.6.tar.bz2"
 
+    version('2.28.6', 'a43d783228dd32899e6908352b8308f3')
     version('2.28.3', 'aa64900b274c4661a5c32e52922977f9')
 
     extends('python')
+
     depends_on("libffi")
     depends_on('glib')
     depends_on('py-py2cairo')
     depends_on('gobject-introspection')
 
-    patch('pygobject-2.28.6-introspection-1.patch')
+    patch('pygobject-2.28.6-introspection-1.patch', when='@2.28.3:2.28.6')
+
+    # patch from https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/development/python-modules/pygobject/pygobject-2.28.6-gio-types-2.32.patch
+    # for https://bugzilla.gnome.org/show_bug.cgi?id=668522
+    patch('pygobject-2.28.6-gio-types-2.32.patch', when='@2.28.6')
 
     def install(self, spec, prefix):
         make('install', parallel=False)

var/spack/repos/builtin/packages/py-pygobject/pygobject-2.28.6-gio-types-2.32.patch

@@ -0,0 +1,50 @@
+From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt@desrt.ca>
+Date: Mon, 12 Mar 2012 16:44:14 -0400
+Subject: [PATCH] gio-types.defs: change some enums to flags
+
+These flags types were originally incorrectly handled in glib as being
+enums.  That bug was fixed, but they're still enums here, leading to
+warnings about the mismatch.
+
+Change them to flags.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=668522
+---
+ gio/gio-types.defs |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gio/gio-types.defs b/gio/gio-types.defs
+index 331e0bc..7eee5c8 100644
+--- a/gio/gio-types.defs
++++ b/gio/gio-types.defs
+@@ -526,7 +526,7 @@
+   )
+ )
+ 
+-(define-enum MountMountFlags
++(define-flags MountMountFlags
+   (in-module "gio")
+   (c-name "GMountMountFlags")
+   (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS")
+@@ -545,7 +545,7 @@
+   )
+ )
+ 
+-(define-enum DriveStartFlags
++(define-flags DriveStartFlags
+   (in-module "gio")
+   (c-name "GDriveStartFlags")
+   (gtype-id "G_TYPE_DRIVE_START_FLAGS")
+@@ -770,7 +770,7 @@
+   )
+ )
+ 
+-(define-enum SocketMsgFlags
++(define-flags SocketMsgFlags
+   (in-module "gio")
+   (c-name "GSocketMsgFlags")
+   (gtype-id "G_TYPE_SOCKET_MSG_FLAGS")
+-- 
+1.7.8.5
+