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

From: Colin Walters <walters src gnome org>
To: commits-list gnome org
Cc:
Subject: [jhbuild/wip/sysdeps: 1/3] 3.2: Add pkg-config identifiers for a lot of tarball modules
Date: Thu, 30 Jun 2011 14:37:37 +0000 (UTC)
commit 361690e93c36fc6de0ea3c5aebad4815bd7b83c4
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-3.2.modules      |    4 +-
 modulesets/gnome-suites-core-deps-3.2.modules |   80 +++++++++++++------------
 2 files changed, 43 insertions(+), 41 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.2.modules b/modulesets/gnome-suites-core-3.2.modules
index bb80065..def4012 100644
--- a/modulesets/gnome-suites-core-3.2.modules
+++ b/modulesets/gnome-suites-core-3.2.modules
@@ -374,7 +374,7 @@
   <!-- tests fail to link on Debian for pulseaudio 0.9.22 and earlier.
        Can remove disable-default-build-tests for pulseaudio 0.9.23 and above
     -->
-  <autotools id="pulseaudio" autogenargs="--disable-udev --disable-hal --disable-oss --disable-default-build-tests">
+  <autotools id="pulseaudio" pkg-config="libpulse.pc" autogenargs="--disable-udev --disable-hal --disable-oss --disable-default-build-tests">
     <branch repo="0pointer.de" module="pulseaudio/pulseaudio-0.9.21.tar.gz" version="0.9.21"
             hash="sha256:94e22356ac70ee95388ae58da90d88c6b3186d1938618d21671627ff56cee254"
             md5sum="76e623c4c72e2258bc8bdeb1599bad74" size="2056896">
@@ -790,7 +790,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="dbus" supports-non-srcdir-builds="no" autogenargs="--with-systemdsystemunitdir=no">
+  <autotools id="dbus" pkg-config="dbus-1.pc" supports-non-srcdir-builds="no" autogenargs="--with-systemdsystemunitdir=no">
     <branch module="dbus/dbus-1.4.0.tar.gz" version="1.4.0"
 	    repo="dbus"
 	    hash="sha256:c96d2f86d40e158e2bf405925a0a42cce0533a8466098e2f2238aa1614926652"
diff --git a/modulesets/gnome-suites-core-deps-3.2.modules b/modulesets/gnome-suites-core-deps-3.2.modules
index 5c7e917..72d3c8e 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"/>
@@ -268,7 +268,7 @@
     </suggests>
   </autotools>
 
-  <autotools id="dbus-glib">
+  <autotools id="dbus-glib" pkg-config="dbus-glib-1.pc">
     <branch module="dbus-glib/dbus-glib-0.92.tar.gz" version="0.92"
 	    repo="dbus"
 	    hash="sha256:5a7fd4cf937cdcb7f2eed61341b70ee0f2607450a50db381618598adf60dd40e"
@@ -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"/>
@@ -646,7 +646,7 @@
    </suggests>
  </autotools>
 
-  <tarball id="libcroco" supports-non-srcdir-builds="no" version="0.6.2">
+  <tarball id="libcroco" pkg-config="libcroco-0.6.pc" supports-non-srcdir-builds="no" version="0.6.2">
     <source href="http://download.gnome.org/sources/libcroco/0.6/libcroco-0.6.2.tar.bz2";
             hash="sha256:be24853f64c09b63d39e563fb0222e29bae1a33c3d9f6cbffc0bc27669371749"
             md5sum="1429c597aa4b75fc610ab3a542c99209" size="415492"/>
@@ -656,14 +656,14 @@
     </dependencies>
   </tarball>
 
-  <autotools id="libdaemon" autogenargs="--disable-lynx">
+  <autotools id="libdaemon" pkg-config="libdaemon.pc" autogenargs="--disable-lynx">
     <branch repo="0pointer.de" module="libdaemon/libdaemon-0.14.tar.gz"
 	    version="0.14"
             hash="sha256:fd23eb5f6f986dcc7e708307355ba3289abe03cc381fc47a80bca4a50aa6b834"
             md5sum="509dc27107c21bcd9fbf2f95f5669563" size="340474"/>
   </autotools>
 
-  <tarball id="libdiscid" version="0.2.2">
+  <tarball id="libdiscid" pkg-config="libdiscid.pc" version="0.2.2">
     <source href="http://users.musicbrainz.org/~matt/libdiscid-0.2.2.tar.gz";
             hash="sha256:974b5d5ab23fb45910a4fe171045a22a749cd8cb9833168f7178839993a58402"
             md5sum="ee21ddbe696a3c60e14827a75f3bcf5b" size="347907"/>
@@ -688,7 +688,7 @@
     </dependencies>
   </autotools>
 
-  <tarball id="libgee" version="0.6.0">
+  <tarball id="libgee" pkg-config="gee-1.0.pc" version="0.6.0">
     <source href="http://download.gnome.org/sources/libgee/0.6/libgee-0.6.0.tar.bz2";
             hash="sha256:e586678d0a88637abeaaf850b62231000772e79ea6d9c4b45dc3cea99f778a7a"
             md5sum="4eb513b23ab6ea78884989518a4acf6f" size="477609"/>
@@ -741,7 +741,7 @@
     </dependencies>
   </autotools>
 
-  <cmake id="libmusicbrainz">
+  <cmake id="libmusicbrainz" pkg-config="libmusicbrainz3.pc">
     <branch module="libmusicbrainz-3.0.2.tar.gz" version="3.0.2"
             repo="ftp.musicbrainz.org"
             hash="sha256:b9a35e56826239add731cf083108cbc313d4a2d1770e6f5006966daa66a21eda"
@@ -753,7 +753,7 @@
     </dependencies>
   </cmake>
 
-  <tarball id="libnice" version="0.1.0">
+  <tarball id="libnice" pkg-config="nice.pc" version="0.1.0">
     <source href="http://nice.freedesktop.org/releases/libnice-0.1.0.tar.gz";
             hash="sha256:c79b85f53c63fc676c6f84f4a40a5e210106cc7856ba17580fc2716f36c720ff"
             md5sum="c077e2aa74c9afb4b4e157efc8a6ad9d" size="655234"/>
@@ -772,7 +772,7 @@
     </dependencies>
   </autotools>
 
-  <tarball id="liboil" version="0.3.17">
+  <tarball id="liboil" pkg-config="liboil-0.3.pc" version="0.3.17">
     <source href="http://liboil.freedesktop.org/download/liboil-0.3.17.tar.gz";
             hash="sha256:105f02079b0b50034c759db34b473ecb5704ffa20a5486b60a8b7698128bfc69"
             md5sum="47dc734f82faeb2964d97771cfd2e701" size="912563"/>
@@ -790,7 +790,7 @@
     </suggests>
   </autotools>
 
-  <cmake id="libproxy"
+  <cmake id="libproxy" pkg-config="libproxy-1.0.pc"
          cmakeargs="-DCMAKE_BUILD_TYPE=None -DWITH_KDE4=OFF -DWITH_PYTHON=OFF -DWITH_PERL=OFF -DWITH_VALA=ON -DWITH_DOTNET=OFF -DWITH_MOZJS=OFF -DWITH_WEBKIT=ON -DGAC_DIR=${prefix}/lib/mono">
     <branch repo="libproxy.googlecode.com"
             module="libproxy-0.4.6.tar.gz" version="0.4.6"
@@ -818,7 +818,7 @@
     </dependencies>
   </autotools>
 
-  <tarball id="libsndfile" version="1.0.23" supports-non-srcdir-builds="no"
+  <tarball id="libsndfile" pkg-config="sndfile.pc" version="1.0.23" supports-non-srcdir-builds="no"
            autogenargs="--disable-flac">
     <source href="http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.23.tar.gz";
             hash="sha256:54c9c375598538263395a691f9b30987a2faa3d8a166d27e6a09ba4700223d4d"
@@ -837,13 +837,13 @@
     </dependencies>
   </autotools>
 
-  <tarball id="libtasn1" version="2.2" supports-non-srcdir-builds="no">
+  <tarball id="libtasn1" pkg-config="libtasn1.pc" version="2.2" supports-non-srcdir-builds="no">
     <source href="ftp://ftp.gnu.org/gnu/libtasn1/libtasn1-2.2.tar.gz";
             hash="sha256:5dd7956d62a351bb657f18d228c5d5b9e9455355543f59ff36484a9d389e36b9"
             md5sum="14cc361500d2e768a8a6ec538ce3fecb" size="1641693" />
   </tarball>
 
-  <autotools id="libunique">
+  <autotools id="libunique" pkg-config="unique-3.0.pc">
     <branch module="libunique/3.0/libunique-3.0.2.tar.bz2" repo="gnome.org"
             version="3.0.2" checkoutdir="libunique-3.0.2"
             hash="sha256:50269a87c7aabf1e25f01b3bbb280133138ffd7b6776289894c614a4b6ca968d"
@@ -866,7 +866,7 @@
     </branch>
   </autotools>
 
-  <tarball id="libxklavier" supports-non-srcdir-builds="no" version="5.1">
+  <tarball id="libxklavier" pkg-config="libxklavier.pc" supports-non-srcdir-builds="no" version="5.1">
     <source href="http://download.gnome.org/sources/libxklavier/5.1/libxklavier-5.1.tar.bz2";
             hash="sha256:1d7e8a6ed842d415d2f95b827e7d04ecf515ed5be2aaee262a8dd1c5cbe10ff1"
             md5sum="cbc2a760827c20aef61eb7b18a6ce598"
@@ -892,14 +892,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"
@@ -915,7 +915,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"
@@ -944,7 +944,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"
@@ -997,7 +998,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"
@@ -1014,7 +1016,7 @@
     </dependencies>
   </autotools>
 
-  <tarball id="poppler" version="0.16.0" autogenargs="--enable-xpdf-headers">
+  <tarball id="poppler" pkg-config="poppler.pc" version="0.16.0" autogenargs="--enable-xpdf-headers">
     <source href="http://poppler.freedesktop.org/poppler-0.16.0.tar.gz";
             hash="sha256:e93e104abd710c310ebb98838f8147b198fbe0564cf8f5b273a75a1f7a01c5ac"
             md5sum="654f8e8debf028085173d76e3c34b652" size="1945847"/>
@@ -1031,7 +1033,7 @@
     </after>
   </tarball>
 
-  <autotools id="pycairo">
+  <autotools id="pycairo" pkg-config="pycairo.pc">
     <branch module="releases/pycairo-1.8.2.tar.gz" version="1.8.2"
             repo="cairo.org"
             hash="sha256:77a8cbe388fd66825056744f2fc5c58b3afc247748bc2c777751cc0c2eb30a2f"
@@ -1051,7 +1053,7 @@
     </dependencies>
   </autotools>
 
-  <tarball id="rarian" version="0.8.1" supports-non-srcdir-builds="no">
+  <tarball id="rarian" pkg-config="rarian.pc" version="0.8.1" supports-non-srcdir-builds="no">
     <source href="http://download.gnome.org/sources/rarian/0.8/rarian-0.8.1.tar.bz2";
             hash="sha256:aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"
             md5sum="75091185e13da67a0ff4279de1757b94" size="324441"/>
@@ -1072,13 +1074,13 @@
     </dependencies>
   </tarball>
 
-  <tarball id="speex" version="1.2rc1">
+  <tarball id="speex" pkg-config="speex.pc" version="1.2rc1">
     <source href="http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz";
             hash="sha256:342f30dc57bd4a6dad41398365baaa690429660b10d866b7d508e8f1179cb7a6"
             md5sum="c4438b22c08e5811ff10e2b06ee9b9ae" size="1061882"/>
   </tarball>
 
-  <autotools id="sqlite3"
+  <autotools id="sqlite3" pkg-config="sqlite3.pc"
              autogenargs="--disable-tcl --enable-threadsafe --enable-readline --enable-static --enable-load-extension"
              check-target="false">
     <branch module="sqlite-3.7.1.tar.gz" version="3.7.1"
@@ -1090,13 +1092,13 @@
     </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"/>
   </tarball>
 
-  <tarball id="telepathy-glib" version="0.15.2" autogenargs="--enable-vala-bindings">
+  <tarball id="telepathy-glib" pkg-config="telepathy-glib.pc" version="0.15.2" autogenargs="--enable-vala-bindings">
     <source href="http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.15.2.tar.gz";
             hash="sha256:fce80d588a4d375c17929a83521721a3a75efcb4bf21ab477a3aa080df411337"
             md5sum="f3bc6d74a39ea1ad6b190ac1975404ab" size="3072646"/>
@@ -1112,7 +1114,7 @@
     </suggests>
   </tarball>
 
-  <tarball id="telepathy-logger" version="0.2.10">
+  <tarball id="telepathy-logger" pkg-config="telepathy-logger-0.2.pc" version="0.2.10">
     <source href="http://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-0.2.10.tar.bz2";
             hash="sha256:6496a31ea975217c5c36a4e8f1e0544c7e523f527ef423385f20bfd85da45fc0"
             md5sum="ec01a8f99fc11406e85153095433c155" size="449495"/>
@@ -1123,7 +1125,7 @@
     </dependencies>
   </tarball>
 
-  <tarball id="telepathy-farsight" version="0.0.14" autogenargs="--disable-python">
+  <tarball id="telepathy-farsight" pkg-config="telepathy-farsight.pc" version="0.0.14" autogenargs="--disable-python">
     <source href="http://telepathy.freedesktop.org/releases/telepathy-farsight/telepathy-farsight-0.0.14.tar.gz";
             hash="sha256:3074d40b33ecd08d7fc0168dfb4a4dd4f98ef3fd5c4708074b9669b3f39457b5"
             md5sum="1e6af31be4d5cdfc72a3f06542de96c0" size="547695"/>
@@ -1147,7 +1149,7 @@
     </suggests>
   </autotools>
 
-  <autotools id="tracker" skip-autogen="never" autogen-sh="configure" autogenargs="--enable-miner-evolution=no --disable-unit-tests" check-target="false">
+  <autotools id="tracker" pkg-config="tracker-client-0.10.pc" skip-autogen="never" autogen-sh="configure" autogenargs="--enable-miner-evolution=no --disable-unit-tests" check-target="false">
     <branch module="tracker/0.10/tracker-0.10.2.tar.bz2" version="0.10.2" repo="gnome.org"
             hash="sha256:33a426f47497d69ecf46e934701fd6d70c2e849800dc4f65a2b91ec2cbd7477d"
             md5sum="b6b83267c71755e235b517edf2d9b905" size="7928845">
@@ -1174,7 +1176,7 @@
     </suggests>
   </autotools>
 
-  <tarball id="vala" version="0.12.0" autogenargs="--enable-vapigen">
+  <tarball id="vala" pkg-config="libvala-0.12.pc" version="0.12.0" autogenargs="--enable-vapigen">
     <source href="http://download.gnome.org/sources/vala/0.12/vala-0.12.0.tar.bz2";
             hash="sha256:9a398e16fba2c78c9bcadb05e489c9bc318e34901d43451ac5d2ce4bc46b1225"
             md5sum="b11fafaa705085342156312e356b6ff2" size="2852200"/>
@@ -1183,7 +1185,7 @@
     </dependencies>
   </tarball>
 
-  <autotools id="WebKit" makefile="GNUmakefile"
+  <autotools id="WebKit" pkg-config="webkitgtk-3.0.pc" makefile="GNUmakefile"
              autogenargs="--with-gtk=3.0 --enable-introspection">
     <branch repo="webkitgtk.org"
             module="webkit-1.5.1.tar.gz" version="1.5.1"
@@ -1255,7 +1257,7 @@
 
   <!-- OS Core Services dependencies -->
 
-  <autotools id="libnl" skip-autogen="never" autogen-sh="configure" check-target="false">
+  <autotools id="libnl" pkg-config="libnl-1.pc" skip-autogen="never" autogen-sh="configure" check-target="false">
     <branch repo="people.suug.ch/~tgr/libnl/"
             module="libnl-1.1.tar.gz" version="1.1"
             md5sum="ae970ccd9144e132b68664f98e7ceeb1" size="288932">
@@ -1263,7 +1265,7 @@
     </branch>
   </autotools>
 
- <tarball id="lcms2" version="2.2" checkoutdir="lcms-2.2">
+ <tarball id="lcms2" pkg-config="lcms2.pc" version="2.2" checkoutdir="lcms-2.2">
     <source href="http://downloads.sourceforge.net/lcms/lcms2-2.2.tar.gz";
             hash="sha256:b6f2a1be1a2b7ca54bfab69b32242d383a176637f161eeeaef451bd9fc1195cc"
             md5sum="aaf33c7c25675e6163189ba488ae20f5" size="4193353"/>
@@ -1289,7 +1291,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"/>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]