Merge branch 'testing' of gitorious.org:chakra-packages/desktop into testing

support-pkg-google-gadgets-qt/PKGBUILD

@@ -16,13 +16,12 @@ _origname=google-gadgets-qt
 
 pkgname=${_origname}
 pkgver=0.11.2
-pkgrel=1
+pkgrel=4
 pkgdesc="Desktop Widgets (engine) from Google"
 arch=(i686 x86_64)
 url="http://code.google.com/p/google-gadgets-for-linux/"
 license=('APACHE')
-depends=('gstreamer0.10-base-plugins' 'librsvg' 'xulrunner'
-	 "${_qtpkg}>=${_qtver}" 'desktop-file-utils' 'curl' 'spidermonkey')
+depends=('gstreamer0.10-base-plugins' 'librsvg' 'xulrunner>=2.0' "${_qtpkg}>=${_qtver}" 'desktop-file-utils' 'curl' 'spidermonkey')
 makedepends=('zip' 'unzip')
 options=('!libtool' '!splitdbg' '!splithdr')
 conflicts=('google-gadgets-gtk' 'google-gadgets' 'google-gadgets-qt' 'google-gadgets-gtk-svn' 'google-gagdets-qt-svn')
@@ -41,7 +40,7 @@ build()
 {
         cd "${srcdir}/google-gadgets-for-linux-$pkgver"
 
-        ./configure --prefix=${_installprefix} \
+        ./configure --prefix=/usr \
                     --disable-werror \
                     --disable-update-desktop-database \
                     --disable-update-mime-database \
@@ -50,6 +49,7 @@ build()
                     --disable-gtk-system-framework \
                     --disable-gtkmoz-browser-element \
                     --disable-gtk-flash-element \
+					--disable-smjs-script-runtime \
                     || return 1
 
         make || return 1

tools-pkg-cbundle/PKGBUILD

@@ -6,7 +6,7 @@
 
 pkgname=cbundle
 pkgver=0.4.5.1
-pkgrel=3
+pkgrel=2
 depends=('squashfs-tools' 'fakechroot' 'unionfs-fuse')
 makedepends=('qt' 'automoc4' 'kdebase-workspace')
 pkgdesc="A shared library for using Chakra software bundles"
@@ -29,7 +29,6 @@ mksource() {
 
 build() {
         cd "${srcdir}/cbundle"
-        patch -Np0 -i ${startdir}/debug-env.patch
 
         cmake  \
           -DCMAKE_INSTALL_PREFIX=/usr \