Merge remote-tracking branch 'x/master'

* x/master:
  librsvg: enable introspection bindings.
  gst-plugins-bad: reenable rsvg plugin.
  librsvg-devel: must depend on gdk-pixbuf-devel, inc api_depends.
  librsvg-devel: must depend on cairo-devel, bump api_depends.
  xkeyboard-config: update to 2.5.1.
  kernel-snapshot: update to 3.3.0-rc2.
  zlib: update to 1.2.6.

srcpkgs/gst-plugins-bad/gst-plugins-bad.rshlibs

@@ -48,3 +48,6 @@ libSDL-1.2.so.0
 libsndfile.so.1
 libxvidcore.so.4
 libvpx.so.1
+librsvg-2.so.2
+libgdk_pixbuf-2.0.so.0
+libcairo.so.2

srcpkgs/gst-plugins-bad/template

@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad'.
 pkgname=gst-plugins-bad
 version=0.10.22
-revision=7
+revision=8
 homepage="http://gstreamer.freedesktop.org"
 distfiles="$homepage/src/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure

srcpkgs/kernel-snapshot/files/x86_64-dotconfig

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.3.0-rc1 Kernel Configuration
+# Linux/x86_64 3.3.0-rc2 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -2108,6 +2108,7 @@ CONFIG_ATH6KL=m
 # CONFIG_ATH6KL_DEBUG is not set
 CONFIG_B43=m
 CONFIG_B43_BCMA=y
+# CONFIG_B43_BCMA_EXTRA is not set
 CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
@@ -4397,6 +4398,7 @@ CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_DELL_NETBOOKS=m
 CONFIG_LEDS_MC13783=m
 CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_OT200=m
 CONFIG_LEDS_TRIGGERS=y
 
 #
@@ -5238,9 +5240,6 @@ CONFIG_ENCRYPTED_KEYS=m
 # CONFIG_SECURITY is not set
 CONFIG_SECURITYFS=y
 # CONFIG_INTEL_TXT is not set
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_DEFAULT_SECURITY=""
 CONFIG_XOR_BLOCKS=m

srcpkgs/kernel-snapshot/template

@@ -3,8 +3,7 @@
 _kernel_snapshot=yes
 _kernel_ver=3.3
 _kernel_ver_minor=0
-_kernel_patch_ver=rc1
+_kernel_patch_ver=rc2
-revision=3
 
 . ${XBPS_SRCPKGDIR}/kernel/template
 # Override required vars.
@@ -14,6 +13,6 @@ version=${_kernel_ver}.${_kernel_ver_minor}${_kernel_patch_ver}
 short_desc="The Linux kernel (3.x series) and modules"
 wrksrc="linux-${_kernel_ver}-${_kernel_patch_ver}"
 distfiles="http://www.kernel.org/pub/linux/kernel/v3.0/testing/linux-${_kernel_ver}-${_kernel_patch_ver}.tar.xz"
-checksum=59bfea65d651c2d07c4f79ac44612abcda29d903bd775dd0c83770c40f94c9da
+checksum=e410281d366ec531646c3a01a19905ba27186a16f9c053c68031c074c97626f4
 subpackages="$pkgname-headers"
 noverifyrdeps=yes

srcpkgs/librsvg/depends

@@ -1,2 +1,2 @@
 abi_depends=">=2.26.0"
-api_depends="${abi_depends}"
+api_depends=">=2.34.2_2"

srcpkgs/librsvg/librsvg-devel.template

@@ -5,12 +5,16 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=3
+
+Add_dependency run gdk-pixbuf-devel
+Add_dependency run cairo-devel
 Add_dependency run libcroco-devel
 Add_dependency run librsvg
 
-do_install()
+do_install() {
-{
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
 	vmove usr/share/gtk-doc usr/share
+	vmove usr/share/gir-1.0 usr/share
 }

srcpkgs/librsvg/template

@@ -1,9 +1,11 @@
 # Template build file for 'librsvg'.
 pkgname=librsvg
 version=2.34.2
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/2.34/$pkgname-$version.tar.xz"
 build_style=gnu-configure
-configure_args="--with-croco --with-svgz --disable-static"
+configure_args="--with-croco --with-svgz --disable-static
+--enable-introspection"
 short_desc="SVG library for GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=5de701325b84c0a15ab6892f49ffd6471722044bfe0b350725bf420642ee4464
@@ -24,3 +26,4 @@ Add_dependency build python	">=0"
 Add_dependency build libcroco-devel
 Add_dependency build gtk+-devel
 Add_dependency build gtk+3-devel
+Add_dependency build gobject-introspection

srcpkgs/xkeyboard-config/template

@@ -1,6 +1,6 @@
 # Template build file for 'xkeyboard-config'.
 pkgname=xkeyboard-config
-version=2.5
+version=2.5.1
 distfiles="http://xorg.freedesktop.org/releases/individual/data/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--with-xkb-rules-symlink=xfree86,xorg --enable-compat-rules"
@@ -8,7 +8,7 @@ short_desc="X Keyboard Configuration Database"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
 license="MIT"
-checksum=0f50579d34e56d817a1bf7ff26582984dd7262209e9e74862237cfae5a7a2961
+checksum=eb80e8dc38c389728bfca1f041af7658e7dd67faca8c763de02d5014ffd2cc92
 long_desc="
  The xkeyboard-config package provides a non-arch keyboard configuration
  database for the X Window System with support for non-standard

srcpkgs/zlib/patches/makefile_ranlib_syntax.patch

@@ -0,0 +1,19 @@
+--- Makefile.in.orig	2012-01-28 23:48:50.000000000 +0100
++++ Makefile.in	2012-02-01 00:28:04.898440495 +0100
+@@ -190,7 +190,7 @@ install-libs: $(LIBS)
+ 	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
+ 	cp $(STATICLIB) $(DESTDIR)$(libdir)
+ 	chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
+-	-@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1
++	-@$(RANLIB) $(DESTDIR)$(libdir)/libz.a
+ 	-@if test -n "$(SHAREDLIBV)"; then \
+ 	  cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
+ 	  echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
+@@ -199,7 +199,6 @@ install-libs: $(LIBS)
+ 	  rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
+ 	  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
+ 	  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
+-	  ($(LDCONFIG) || true)  >/dev/null 2>&1; \
+ 	fi
+ 	cp zlib.3 $(DESTDIR)$(man3dir)
+ 	chmod 644 $(DESTDIR)$(man3dir)/zlib.3

srcpkgs/zlib/patches/zlib-1.2.5-lfs-decls.patch

@@ -1,13 +0,0 @@
-Index: zlib-1.2.5/zlib.h
-===================================================================
---- zlib.h
-+++ zlib.h
-@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
- #  define gzoffset gzoffset64
- #  define adler32_combine adler32_combine64
- #  define crc32_combine crc32_combine64
--#  ifdef _LARGEFILE64_SOURCE
-+#  ifndef _LARGEFILE64_SOURCE
-      ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-      ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
-      ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));

srcpkgs/zlib/template

@@ -1,8 +1,8 @@
 # Template build file for 'zlib'
 pkgname=zlib
-version=1.2.5
+version=1.2.6
-revision=5
+homepage="http://www.zlib.net"
-distfiles="http://www.zlib.net/$pkgname-$version.tar.bz2"
+distfiles="$homepage/$pkgname-$version.tar.bz2"
 build_style=configure
 configure_args="--prefix=/usr --shared"
 if [ "${XBPS_MACHINE}" = "x86_64" ]; then
@@ -12,7 +12,8 @@ make_build_args="CFLAGS=-fPIC"
 make_install_args="LDCONFIG="
 short_desc="A compression/decompression Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307
+license="zlib"
+checksum=fa3e3e4881fa5810b8903f2c7e0dcd5a0a673535f0438021c4bbb5db1b918c8e
 long_desc="
  This is a general purpose data compression library. All the code
  is thread safe. The data format used by the library is described
@@ -21,10 +22,6 @@ long_desc="
 bootstrap=yes
 subpackages="zlib-devel"
 
-post_install()
+if [ "$BOOTSTRAP_PKG_REBUILD" ]; then
-{
+	Add_dependency build coreutils
-	chmod 755 ${DESTDIR}/usr/lib/libz.so.${version}
+fi
-	cd ${DESTDIR}/usr/lib && \
-		ln -s libz.so.${version} libz.so.1 &&
-		ln -s libz.so.${version} libz.so
-}

srcpkgs/zlib/zlib-devel.template

@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=2
-
 Add_dependency run glibc-devel
 Add_dependency run zlib