Merge branch '2.4' into 2.5

cairo/.footprint

@@ -15,9 +15,9 @@ drwxr-xr-x	root/root	usr/include/cairo/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libcairo.a
 -rwxr-xr-x	root/root	usr/lib/libcairo.la
-lrwxrwxrwx	root/root	usr/lib/libcairo.so -> libcairo.so.2.10800.2
-lrwxrwxrwx	root/root	usr/lib/libcairo.so.2 -> libcairo.so.2.10800.2
--rwxr-xr-x	root/root	usr/lib/libcairo.so.2.10800.2
+lrwxrwxrwx	root/root	usr/lib/libcairo.so -> libcairo.so.2.10800.4
+lrwxrwxrwx	root/root	usr/lib/libcairo.so.2 -> libcairo.so.2.10800.4
+-rwxr-xr-x	root/root	usr/lib/libcairo.so.2.10800.4
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-ft.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-glitz.pc

cairo/.md5sum

@@ -1 +1 @@
-44d406e199c338cb60f7db32ffb32bdb  cairo-1.8.2.tar.gz
+a5067e355e78294db2485aa97afd1115  cairo-1.8.4.tar.gz

cairo/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on: fontconfig, glitz, libpng, xorg-libxrender, xorg-libpixman
 
 name=cairo
-version=1.8.2
+version=1.8.4
 release=1
 source=(http://cairographics.org/releases/$name-$version.tar.gz)
 

firefox/.md5sum

@@ -1,3 +1,3 @@
-e076a4a889fce0c4ca237ac30bfadb43  firefox-3.0.3-source.tar.bz2
-11b35d2aa012b6604d1b35b33cc420d7  mozconfig
+8a1ac4a5940108a96458c5307a74c98d  firefox-3.0.4-source.tar.bz2
+9025bd123513bc5132042b7576d9efc5  mozconfig
 62530844efda8b387e518162b7922f2f  xulrunner.patch

firefox/Pkgfile

@@ -4,8 +4,8 @@
 # Depends on: xulrunner
 
 name=firefox
-version=3.0.3
-release=2
+version=3.0.4
+release=1
 source=(http://releases.mozilla.org/pub/mozilla.org/$name/releases/$version/source/$name-$version-source.tar.bz2
         mozconfig xulrunner.patch)
     

firefox/mozconfig

@@ -16,7 +16,7 @@ ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
 ac_add_options --with-system-mng
 ac_add_options --with-pthreads
-ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-1.9.0.3
+ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-1.9.0.4
 ac_add_options --enable-system-cairo
 ac_add_options --enable-optimize="#CFLAGS#"
 ac_add_options --enable-official-branding

xulrunner/.md5sum

@@ -1,3 +1,3 @@
-e076a4a889fce0c4ca237ac30bfadb43  firefox-3.0.3-source.tar.bz2
+8a1ac4a5940108a96458c5307a74c98d  firefox-3.0.4-source.tar.bz2
 3a043809a9e0dbf39efe95359fcc5fe7  mozconfig
 7a5151f90cb360bc1ea911e5cf7208e9  xulrunner.diff

xulrunner/Pkgfile

@@ -4,9 +4,9 @@
 # Depends on: libidl, nss, gtk, perl, python, dbus-glib
 
 name=xulrunner
-version=1.9.0.3
-release=2
-source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.3/source/firefox-3.0.3-source.tar.bz2
+version=1.9.0.4
+release=1
+source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.4/source/firefox-3.0.4-source.tar.bz2
         mozconfig $name.diff)
 
 build() {