[jhbuild/wip/sysdeps: 2/4] 3.2: Add pkg-config identifiers for a lot of tarball modules

[Colin Walters <walters src gnome org>]

commit 9a1c69992747a5b8d1d4d7286d09ca2b1c3a78b7
Author: Colin Walters <walters verbum org>
Date:   Thu Jun 23 16:59:20 2011 -0400

    3.2: Add pkg-config identifiers for a lot of tarball modules
    
    Some things are still missing .pc files.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=564373

 modulesets/gnome-suites-core-deps-3.2.modules |   28 +++++++++++++-----------
 1 files changed, 15 insertions(+), 13 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.2.modules b/modulesets/gnome-suites-core-deps-3.2.modules
index 78a055b..0b75328 100644
--- a/modulesets/gnome-suites-core-deps-3.2.modules
+++ b/modulesets/gnome-suites-core-deps-3.2.modules
@@ -89,7 +89,7 @@
     </dependencies>
   </tarball>
 
-  <tarball id="libical" version="0.43">
+  <tarball id="libical" pkg-config="libical.pc" version="0.43">
     <source href="http://downloads.sourceforge.net/freeassociation/libical-0.43.tar.gz";
             hash="sha256:099f3e29a864de324477983eefaf17a4ef3b4ec8f075f95384db1ac67b6663a6"
             md5sum="5f0a1feb60894d0be537aefea5647474" size="1145724"/>
@@ -97,7 +97,7 @@
     </dependencies>
   </tarball>
 
-  <tarball id="libgdata" version="0.8.0">
+  <tarball id="libgdata" pkg-config="libgdata.pc" version="0.8.0">
     <source href="http://download.gnome.org/sources/libgdata/0.8/libgdata-0.8.0.tar.bz2";
             hash="sha256:1a816dda7de8ce162e00cc1c782a5ae25230a36d56c590a67d86848058797c9f"
             md5sum="43ad483c17446dcc7d1c8d3fa49dcc90" size="1240410"/>
@@ -128,7 +128,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="cairo" autogenargs="--enable-xlib">
+  <autotools id="cairo" pkg-config="cairo.pc" autogenargs="--enable-xlib">
     <branch module="releases/cairo-1.10.0.tar.gz" version="1.10.0"
             repo="cairo.org"
             hash="sha256:0f2ce4cc4615594088d74eb8b5360bad7c3cc3c3da9b61af9bfd979ed1ed94b2"
@@ -145,7 +145,7 @@
     </after>
   </autotools>
 
-  <tarball id="cogl" version="1.7.0">
+  <tarball id="cogl" pkg-config="cogl-1.0.pc" version="1.7.0">
       <source href="http://download.gnome.org/sources/cogl/1.7/cogl-1.7.0.tar.bz2";
               hash="sha256:ac4b30d002f39cb2d22307351b840e3c2e77676bdc77d4eec2709a1adb03f16c"
               md5sum="6a2549ac55216cbb62dc2079b6dc4f46" size="2583130"/>
@@ -305,7 +305,7 @@
     </dependencies>
   </tarball>
 
-  <tarball id="enchant" version="1.6.0">
+  <tarball id="enchant" pkg-config="enchant.pc" version="1.6.0">
     <source href="http://www.abisource.com/downloads/enchant/1.6.0/enchant-1.6.0.tar.gz";
 	    hash="sha256:2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03f7097f"
 	    md5sum="de11011aff801dc61042828041fb59c7" size="607018"/>
@@ -343,7 +343,7 @@
     </dependencies>
   </tarball>
 
-  <tarball id="fontconfig" version="2.8.0">
+  <tarball id="fontconfig" pkg-config="fontconfig.pc" version="2.8.0">
     <source href="http://www.fontconfig.org/release/fontconfig-2.8.0.tar.gz";
             hash="sha256:fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335"
             md5sum="77e15a92006ddc2adbb06f840d591c0e" size="1548409"/>
@@ -870,14 +870,14 @@
 </autotools>
 -->
 
-  <autotools id="libxml2">
+  <autotools id="libxml2" pkg-config="libxml-2.0.pc">
     <branch module="libxml2/libxml2-2.7.8.tar.gz"
             repo="xmlsoft.org" version="2.7.8"
             hash="sha256:cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec"
             md5sum="8127a65e8c3b08856093099b52599c86" size="4881808"/>
   </autotools>
 
-  <autotools id="libxslt" check-target="false">
+  <autotools id="libxslt" pkg-config="libxslt.pc" check-target="false">
     <branch module="libxml2/libxslt-1.1.26.tar.gz"
             repo="xmlsoft.org" version="1.1.26"
             hash="sha256:55dd52b42861f8a02989d701ef716d6280bfa02971e967c285016f99c66e3db1"
@@ -893,7 +893,7 @@
   <repository type="tarball" name="ftp.mozilla.org"
       href="https://ftp.mozilla.org/pub/mozilla.org/"/>
 
-  <autotools id="nspr" autogen-sh="autogen.sh"
+  <autotools id="nspr" pkg-config="nspr.pc" autogen-sh="autogen.sh"
              autogenargs="--enable-ipv6 --with-mozilla" check-target="false">
     <branch repo="ftp.mozilla.org"
             module="nspr/releases/v4.8.6/src/nspr-4.8.6.tar.gz"
@@ -922,7 +922,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="nss" autogen-sh="autogen.sh" supports-non-srcdir-builds="no"
+  <autotools id="nss" pkg-config="nss.pc"
+	     autogen-sh="autogen.sh" supports-non-srcdir-builds="no"
              check-target="false">
     <branch repo="ftp.mozilla.org"
             module="security/nss/releases/NSS_3_12_6_RTM/src/nss-3.12.6.tar.gz"
@@ -975,7 +976,8 @@
   </autotools>
 <!-- End Mozilla stuff subsection -->
 
-  <autotools id="pixman" autogenargs="--disable-gtk">
+  <autotools id="pixman" pkg-config="pixman-1.pc"
+	     autogenargs="--disable-gtk">
     <branch module="releases/pixman-0.20.2.tar.gz" version="0.20.2"
             repo="cairo.org"
             hash="sha256:27b4e58ae8dcf8787cc309bc2b119ca6b6e353b3283a7821896e454ae8bd9725"
@@ -1068,7 +1070,7 @@
     </branch>
   </autotools>
 
-  <tarball id="startup-notification" version="0.12">
+  <tarball id="startup-notification" pkg-config="libstartup-notification-1.0.pc" version="0.12">
     <source href="http://www.freedesktop.org/software/startup-notification/releases/startup-notification-0.12.tar.gz";
             hash="sha256:3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"
             size="355285"/>
@@ -1267,7 +1269,7 @@
   <!-- Deprecated dependencies -->
 
   <autotools id="gtk+-2">
-    <branch checkoutdir="gtk+-2" module="gtk+" revision="gtk-2-24"/>
+    <branch checkoutdir="gtk+-2" module="gtk+" revision="gtk-2-24" />
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>