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

kdepim-runtime/PKGBUILD

@@ -17,8 +17,8 @@ _origname=kdepim-runtime
 pkgname=${_origname}
 arch=('i686' 'x86_64')
 #pkgver=${_kdever}
-pkgver=4.4.10
-pkgrel=3
+pkgver=4.4.11
+pkgrel=1
 
 pkgdesc="KDE Pim Runtime"
 url="http://www.kde.org"
@@ -37,7 +37,7 @@ groups=("kde" "kde-complete" "kde-uninstall" "kde-minimal")
 
 #source=("$_mirror/${_origname}-$_kdever.tar.bz2")
 source=("ftp://ftp.gwdg.de/pub/x11/kde/stable/kdepim-$pkgver/src/${_origname}-$pkgver.tar.bz2")
-sha1sums=('a0e74f95daf8c28f7b3bd1ee84b6a86fc509d0ff')
+sha1sums=('e3105eb99ab0de47c617f8491774b2e3ee4cdd4a')
 
 #
 # build and install

kdepim/PKGBUILD

@@ -88,8 +88,8 @@ packs=('ar'
         
 arch=('i686' 'x86_64')
 #pkgver=${_kdever}
-pkgver=4.4.10
-pkgrel=3
+pkgver=4.4.11.1
+pkgrel=1
 
 pkgdesc="split package"
 url="http://www.kde.org"
@@ -104,7 +104,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' "kdelibs>=${_kdever}" "kdepi
 #source=("$_mirror/${_origname}-$_kdever.tar.bz2")
 source=("ftp://ftp.gwdg.de/pub/x11/kde/stable/kdepim-$pkgver/src/${_origname}-$pkgver.tar.bz2"
         "http://chakra-project.org/sources/kde-l10n/kdepim-l10n-4.4.10.tar.xz")
-sha1sums=('b9c45e80dddc3bff201df6ddd76fdf4f1f18d5c3'
+sha1sums=('49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2'
           'ce16a0cbd172376bc999b5bcbf29733273cc866c')
 
 #

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 \