Merge branch 'testing' of ssh://git.chakraos.org:86/desktop into testing

calligra-l10n/PKGBUILD

@@ -1,8 +1,5 @@
-# Maintainer:   H W Tovetjärn (totte) <totte@tott.es>
-# Contributors: A Boersma (abveritas) <abveritas@chakra-project.org>
-
 pkgbase=calligra-l10n
-pkgver=2.9.1
+pkgver=2.9.2
 pkgrel=1
 depends=("calligra-libs>=$pkgver")
 arch=('any')
@@ -22,7 +19,7 @@ _languages=(
   [da]='Danish'
   [de]='German'
   [el]='Greek'
-  #[en-GB]='English (GB)'
+  [en_GB]='English (GB)'
   #[en-ZA]='English (ZA)'
   [es]='Spanish'
   [et]='Estonian'
@@ -50,34 +47,35 @@ _languages=(
   [zh_TW]='Chinese (traditional)'
 )
 
-md5sums=('790ea91505d5754564651a9797ad5b27'
-         '7f93061b116d0e3bb8a42230d721f52b'
-         'f085a670997dbc599dae1bd18ecfb6f3'
-         'b2c3a57f77fd2d07b51bdddc5390a81f'
-         '0747c067bbb212f1c5011e2b21ff3fff'
-         '2f5092542e13c984a07fa06a13071de5'
-         '462bdf3a1c357162947a2ac78193c0c8'
-         '0b2f118ccb93256750e93da95af9922c'
-         '23e37fd33625b3cb65864c86044cc307'
-         '6f74a2430e93a8212b52ea4a7f3db80c'
-         '2e1aa8454f058d60d6de027bf9e6013e'
-         '653556c54ee517d685bfdd274610d00f'
-         '35061f847c9df4a7d618dc2bfbd5e3d2'
-         '686701808bb98526e93a3122d8a72211'
-         'adf1689fb17cbe2bee3f00c8de68d26b'
-         '333d06893bf797ae2f15374950431379'
-         '2fb7ac4e427fb4f94b7a2f03b0df59db'
-         '68627ac4b6594297baee20c1ae1a6313'
-         'ed4fe0690d0f55776564066c469aff31'
-         '732a10099b75a3068646afcb154bdeee'
-         'cba77be979019517c35aeb1411061f74'
-         'd2a492476166abe353b722d3be83f484'
-         '86174201d1a67ee486699e39e792afe5'
-         '9e2537324e6b896c9f174289d44d2401'
-         'd94a51ff6dda4cbfe957d192775a738e'
-         '462715b91ff71b696f6c592e2879b453'
-         'cd144c35a06e68c7800235f82a34117b'
-         '6cc374e9019fb4c2f4096ab167c31787')
+md5sums=('2070b40dfd4ecf860a761a327f3463fc'
+         'b3ce8fc10b4be2d7ccad9205522b69c3'
+         '7d8475a9a1d1ab4469089902f4460534'
+         '5a53ebae95d6dd082f606489c4073467'
+         '4be303ea33737e8bb082bc55cf481b06'
+         '3c77bf246bb7e4663e260d714a8d4920'
+         'b732a3c8a46268b02c393f7da6983651'
+         '1e72fb67933711140d822af999b3a483'
+         'e5b63067ab038df231197a7ebed6ce68'
+         '48059f6475940f96e89554ed3a5fa4ce'
+         '6343ff6c408f89fb8a54fb284c0f6653'
+         '2626d400c350627494b4d5937765ccb5'
+         'e66bdc04698f29d074bd874ba2ac713b'
+         'd08e35dedf029b2ad6343697a227db33'
+         '0df375c87b322eaf59bc463c741d4fc6'
+         'effa0b3806dcb230294ca9e9e5d64c42'
+         'fa9b7fb496b948845462d87b82c12362'
+         'f86648ecee94c2c6ed006a3dbd8a88f8'
+         '8be7e15d3c49ce2f1a23f98215e76fe0'
+         'da5f5eaaa8c0e4694a7d5620349300ca'
+         '71749e6c0d1e2c8262bd1e871fdab090'
+         '46abda11730b2855396da5c49be8118d'
+         '5dfd8a63a543ccc031d6691300fc14d9'
+         '12d6a77988ec5776d935c0278c464f6f'
+         '77ae0624ee424f99b1248c429ce1d8af'
+         '0034bffa695f030a54ead482e651b934'
+         '04fc1e7c595e34dc12d008ad5b70bda6'
+         '7a4dc57842926e644cdaf462a3b8bddf'
+         'f9240d55cb05a1af64f50bcabc2d6866')
 
 build() {
     for i in ${pkgname[@]}; do

calligra/PKGBUILD

@@ -1,8 +1,3 @@
-# Maintainer:   H W Tovetjärn (totte) <totte@tott.es>
-# Contributors: Manuel Tortosa (manutortosa) <manuel.tortosa@chakra-project.org>
-#               Andrea Scarpino <andrea@archlinux.org>
-#               Ronald van Haren <ronald.archlinux.org>
-
 pkgbase=calligra
 pkgname=('calligra-braindump'
          'calligra-devtools'
@@ -17,7 +12,7 @@ pkgname=('calligra-braindump'
          'calligra-sheets'
          'calligra-stage'
          'calligra-words')
-pkgver=2.9.1
+pkgver=2.9.2
 pkgrel=1
 arch=('x86_64')
 url='http://www.calligra.org'
@@ -64,10 +59,11 @@ options=("debug")
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz")
 #source=("http://download.kde.org/unstable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz")
-md5sums=('3afd7afffbbb8078dcc1e339a85cf74c')
+md5sums=('a293d85b288468c14c8638ad0dc37947')
 
 build() {
-    cd "${srcdir}/build"
+    cd "${srcdir}"
+    mkdir -p build && cd build
     cmake "../${pkgbase}-${pkgver}" \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr \