Merge branch 'master' of https://github.com/archlinuxarm/PKGBUILDs

community/mongodb/PKGBUILD

@@ -11,8 +11,8 @@
 #  - ARM patches
 
 pkgname=mongodb
-pkgver=2.6.1
-pkgrel=2
+pkgver=2.6.2
+pkgrel=1
 pkgdesc='A high-performance, open source, schema-free document-oriented database'
 arch=('i686' 'x86_64')
 url='http://www.mongodb.org'
@@ -24,7 +24,7 @@ optdepends=('libpcap: needed for mongosniff')
 backup=('etc/mongodb.conf')
 install=mongodb.install
 source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
-        'mongodb.conf' 'mongodb.service' 'removeWerror.patch'
+        'mongodb.conf' 'mongodb.service'
         '0006-Fix-ARM-alignment-problems.patch')
 
 MAKEFLAGS="-j2"
@@ -35,9 +35,6 @@ build() {
 
   cd mongodb-src-r${pkgver}
 
-  # failed to build with -Werror since 2.4.0
-  patch -Np1 -i "$srcdir/removeWerror.patch"
-
   patch -Np1 -i ../0006-Fix-ARM-alignment-problems.patch
 
   scons all \
@@ -87,9 +84,8 @@ package() {
   install -dm755 "$pkgdir/var/log/mongodb"
 }
 
-sha512sums=('a07168a8fa609d2a22b04db6b761e486e58fb63c66ea4974e5cc53a1255d514cd065a84b4dc62efbb27c39a6e3881d98a3f7025c2391a78d91d5cd515b8a2e56'
+sha512sums=('b1e0fd64d6c93a3ea9b81d48fabf25f4b9d4eabd7fae19b2e97c2676b711515fbd6bc928c0e6f8a146fa83c7a43d3c40d68c377f1ebd1937cf379caff29e5e55'
             '05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c'
             '177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9'
-            '868e5f93ba3c087f80982ffbe01411644d01329a51e4a1811cf8dd6de5e155f604a924be933623b70903fb4dabb27eed100a7eb6f6edcf4bb7a0fdfddd485270'
             '9e369c499e550578bfd428d5ad0b50530426bf798a80e2354b9e84622fbef141f57002e5c362721361c16c523ff9b6bf3d5eeb16dee9c24fe246471d92d1a884'
             '2ebdc5395582d5ed8e8b97c95dedfbd279230aaf7a3da317ccdd2ef6603124e64152c738006d9bca846a44012fdacda8fab0617275f49f8696d1c3e4104fbf6e')

community/mongodb/removeWerror.patch

@@ -1,11 +0,0 @@
---- a/SConstruct	2014-04-08 22:55:57.206075327 +0800
-+++ b/SConstruct	2014-04-08 22:57:58.692240224 +0800
-@@ -819,7 +819,7 @@
-                          "-Winvalid-pch"] )
-     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
-     if linux or darwin:
--        env.Append( CCFLAGS=["-Werror", "-pipe"] )
-+        env.Append( CCFLAGS=["-pipe"] )
- 
-     env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
-     env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )

extra/imagemagick/PKGBUILD

@@ -8,8 +8,8 @@
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.8.9.2
-pkgrel=0
+pkgver=6.8.9.3
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
 license=('custom')
@@ -19,7 +19,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript'
 source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
 #source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
         perlmagick.rpath.patch)
-sha1sums=('02f0a38ed50a2f807675cfd17b788f0c50ad4daa'
+sha1sums=('6204ab02754c10220f2c7a5d0c61ab3b1172d40e'
           'SKIP'
           'e143cf9d530fabf3b58023899b5cc544ba93daec')