[jhbuild] 3.12: Move libcanberra back to core-deps

[Javier Jardón <jjardon src gnome org>]

commit 874163842e678ba640bf0c828b10ccbdd489c925
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Feb 24 00:11:15 2014 +0000

    3.12: Move libcanberra back to core-deps
    
    It has a large number of dependencies so you are
    forced to have an entire system gtk stack installed
    
    This fixes https://bugzilla.gnome.org/show_bug.cgi?id=721378

 modulesets/gnome-suites-core-deps-3.12.modules |   21 +++++++++++++++++++++
 modulesets/gnome-sysdeps-3.12.modules          |    6 ------
 2 files changed, 21 insertions(+), 6 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.12.modules b/modulesets/gnome-suites-core-deps-3.12.modules
index 3f67e1f..b9488bb 100644
--- a/modulesets/gnome-suites-core-deps-3.12.modules
+++ b/modulesets/gnome-suites-core-deps-3.12.modules
@@ -28,6 +28,8 @@
     href="git://repo.or.cz/"/>
 
 <!-- tarball repos -->
+<repository type="tarball" name="0pointer.de"
+    href="http://0pointer.de/lennart/projects/"/>
 <repository type="tarball" name="iso-codes"
     href="http://pkg-isocodes.alioth.debian.org/downloads/"/>
 <repository type="tarball" name="github.com/metabrainz"
@@ -846,6 +848,25 @@
     </suggests>
   </autotools>
 
+  <autotools id="libcanberra" autogen-sh="configure" autogenargs="--with-systemdsystemunitdir=no">
+    <pkg-config>libcanberra-gtk.pc</pkg-config>
+    <branch repo="0pointer.de"
+            module="libcanberra/libcanberra-${version}.tar.xz"
+            version="0.30"
+            hash="sha256:c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72">
+    </branch>
+    <dependencies>
+      <dep package="gtk-doc"/>
+      <dep package="libvorbis"/>
+    </dependencies>
+    <after>
+      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
+      <dep package="pulseaudio"/>
+      <dep package="gstreamer"/>
+    </after>
+  </autotools>
+
  <autotools id="libchamplain">
    <branch/>
    <dependencies>
diff --git a/modulesets/gnome-sysdeps-3.12.modules b/modulesets/gnome-sysdeps-3.12.modules
index 8c26ebd..38ff0ae 100644
--- a/modulesets/gnome-sysdeps-3.12.modules
+++ b/modulesets/gnome-sysdeps-3.12.modules
@@ -389,12 +389,6 @@
     <branch repo="system" version="2.8.0"/>
   </systemmodule>
 
-  <systemmodule id="libcanberra">
-    <pkg-config>libcanberra.pc</pkg-config>
-    <branch repo="system"
-            version="0.30"/>
-  </systemmodule>
-
   <systemmodule id="libcap">
     <branch repo="system"/>
     <systemdependencies>