update to 0.18.5, add comment to .desktop file, disable werror with compiler flag instead of find-sed combo

3 files changed, 13 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 461f816b20be..f72f3cb1e861 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = barry
 	pkgdesc = Barry is an Open Source application that provides a Desktop GUI, synchronization, backup, restore and program management for BlackBerry ™ devices.
-	pkgver = 0.18.4
-	pkgrel = 6
+	pkgver = 0.18.5
+	pkgrel = 1
 	url = http://www.netdirect.ca/software/packages/barry
 	install = barry.install
 	arch = i686
@@ -18,13 +18,13 @@ pkgbase = barry
 	optdepends = fuse: for mounting the BB database with bfuse
 	optdepends = ppp: for tethering with pppob
 	options = !libtool
-	source = http://downloads.sourceforge.net/barry/barry-0.18.4.tar.bz2
+	source = http://sourceforge.net/projects/barry/files/barry/barry-0.18.4/sources/debian/barry_0.18.5.orig.tar.gz
 	source = barry.desktop
 	source = fix-sizeof-use.patch
 	source = wx3.0-compat.patch
 	source = c++11.patch
-	sha256sums = 4036d9eb46a86794455f9f125e8d77dd922e06f74889c5be7f35554be3f48a73
-	sha256sums = cb30b64a392ff5ff0482399cd31e6c997c57e60969145680497a54ffbb8f7d67
+	sha256sums = 66cd913bcfcb5dc0fc3dfcbe8c375845d51649d573c321acba46b96b1bc0059e
+	sha256sums = aa97e456e0bb1f39cf0d95b1f35080d328947a3bcf40b2b97a0ab11ad34ccc21
 	sha256sums = d1eb3ff669d5d8490112ceb4138fe9eb107bdbbc8621c98ead5ff47b9a7faf4e
 	sha256sums = d89dec40916c99355426a9430130a34b9c9f8deccf2e0bd2be75c6eea46249f3
 	sha256sums = bd211b7323a36f255af7cad13b886d8bb45d74f1d2bcecef00733bb5a9080f2c
diff --git a/PKGBUILD b/PKGBUILD
index 802ee2f506f0..45fbbdd798f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Hauke Wesselmann <hauke at h-dawg.de>
 
 pkgname=barry
-pkgver=0.18.4
-pkgrel=6
+pkgver=0.18.5
+pkgrel=1
 pkgdesc="Barry is an Open Source application that provides a Desktop GUI, synchronization, backup, restore and program management for BlackBerry ™ devices."
 url=('http://www.netdirect.ca/software/packages/barry')
 license=('GPL')
@@ -14,13 +14,13 @@ optdepends=('fuse: for mounting the BB database with bfuse'
             'ppp: for tethering with pppob')
 options=('!libtool')
 install=(${pkgname}.install)
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/${pkgname}-0.18.4/sources/debian/${pkgname}_${pkgver}.orig.tar.gz"
         "${pkgname}.desktop"
         "fix-sizeof-use.patch"
         "wx3.0-compat.patch"
         "c++11.patch")
-sha256sums=('4036d9eb46a86794455f9f125e8d77dd922e06f74889c5be7f35554be3f48a73'
-            'cb30b64a392ff5ff0482399cd31e6c997c57e60969145680497a54ffbb8f7d67'
+sha256sums=('66cd913bcfcb5dc0fc3dfcbe8c375845d51649d573c321acba46b96b1bc0059e'
+            'aa97e456e0bb1f39cf0d95b1f35080d328947a3bcf40b2b97a0ab11ad34ccc21'
             'd1eb3ff669d5d8490112ceb4138fe9eb107bdbbc8621c98ead5ff47b9a7faf4e'
             'd89dec40916c99355426a9430130a34b9c9f8deccf2e0bd2be75c6eea46249f3'
             'bd211b7323a36f255af7cad13b886d8bb45d74f1d2bcecef00733bb5a9080f2c')
@@ -32,10 +32,7 @@ prepare() {
   patch -Np1 -i "${srcdir}/fix-sizeof-use.patch"
   patch -Np1 -i "${srcdir}/wx3.0-compat.patch"
 
-  # Disable Werror
-  find /$(pwd) -type f -exec sed -i 's/-Werror//g' '{}' \;
-
-  #C++11 compatibility
+  # C++11 compatibility
   patch -Np1 -i "${srcdir}/c++11.patch"
 
   autoreconf -fi
@@ -45,6 +42,7 @@ build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   export CXXFLAGS="-std=c++11"
+  export CPPFLAGS="-Wno-error"
 
   ./configure --prefix=/usr --libexec=/usr/lib --sbindir=/usr/bin \
     --enable-gui \
diff --git a/barry.desktop b/barry.desktop
index cd34c95dd684..4274a3afa665 100644
--- a/barry.desktop
+++ b/barry.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Barry
+Comment=Synchronization, backup, restore and program management for BlackBerry ™ devices.
 Type=Application
 Exec=barrydesktop
 Icon=barry_logo_icon