unify intltool

IMHO:
	- It's no longer GNOME package.
	- It seems best for everyone to use the newest version.
intltool: add propagated gettext
Merge branch 'vlada/intltool' into vlada/libpng
Merge branch 'vlada/libpng' into refs/top-bases/vlada/gtk3
Merge commit 'refs/top-bases/vlada/gtk3' into vlada/gtk3
fixed bad merge
Merge branch 'vlada/libpng' into refs/top-bases/vlada/gtk3
Merge commit 'refs/top-bases/vlada/gtk3' into vlada/gtk3
pixman_new: no longer use it in cairo (and thunderbird)
Merge branch 'vlada/libpng' into refs/top-bases/vlada/gtk3
Merge commit 'refs/top-bases/vlada/gtk3' into vlada/gtk3
freeglut: fix with new mesa -- depend on mesa_glu
cairo: minor bugfix update, depend on new pixman now
Merge commit 'refs/top-bases/vlada/libpng' into vlada/libpng

Conflicts (x-updates version):
	pkgs/development/libraries/pixman/default.nix
Merge branch 'vlada/libpng' into refs/top-bases/vlada/gtk3
Merge commit 'refs/top-bases/vlada/gtk3' into vlada/gtk3
gnome3.gconf: migrate
gnome3.libgweather: update
spidermonkey_185: propagate nspr