From 79c53063c3ce7d82b68de931a6cacf065f6eafd4 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Mon, 4 Jun 2018 23:35:57 +0000
Subject: [PATCH] community/fbreader to 0.99.4-7

---
 community/fbreader/PKGBUILD            | 30 +++++++++++++++-----------
 community/fbreader/fbreader-gcc6.patch | 11 ++++++++++
 2 files changed, 28 insertions(+), 13 deletions(-)
 create mode 100644 community/fbreader/fbreader-gcc6.patch

diff --git a/community/fbreader/PKGBUILD b/community/fbreader/PKGBUILD
index 9930c9493..c058cdcc2 100644
--- a/community/fbreader/PKGBUILD
+++ b/community/fbreader/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 85342 2013-03-01 10:29:55Z andrea $
+# $Id$
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
@@ -7,23 +7,27 @@
 
 pkgname=fbreader
 pkgver=0.99.4
-pkgrel=6
+pkgrel=7
 pkgdesc="An e-book reader for Linux"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.fbreader.org/"
 license=('GPL')
 depends=('fribidi' 'bzip2' 'curl' 'qt4' 'libunibreak' 'sqlite')
 makedepends=('ccache')
-source=(http://www.fbreader.org/files/desktop/fbreader-sources-$pkgver.tgz
-	"fbreader-0.99.4.patch::http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-text/fbreader/files/fbreader-0.99.4.patch?revision=1.1"
+source=(https://www.fbreader.org/files/desktop/fbreader-sources-$pkgver.tgz
+	"fbreader-0.99.4.patch::https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-text/fbreader/files/fbreader-0.99.4.patch?revision=1.1"
+        fbreader-gcc6.patch
         arm.patch)
-md5sums=('ed13a9c3aeb68aaa98a1dd6f7947a31d'
-         'bc8975fc8235f393ef011b564addf300'
-         '9e6f7c9437c193be6c7fb18978bdf876')
+sha256sums=('3d7c31d5ea314589d2a963290ad16f4d3d631a41e802b8b39f8be0c9f71eb8e9'
+            'cb3aa6795c8f7c694ba296f6f6e6a7939648578a289bc84c10f8302c7e72df86'
+            'bc67b538c51a5b77468469df6b5e96ce918ee11a5ff4e88e398ad5661d322f9c'
+            '10ac99e349344b7b0c882d5c6cf50c535321b529d59935d890596ba00349cc25')
 
 prepare() {
-  cd $srcdir/fbreader-$pkgver
-  patch -p1 <$srcdir/fbreader-0.99.4.patch
+  cd "$srcdir"/fbreader-$pkgver
+  patch -p1 <"$srcdir"/fbreader-0.99.4.patch
+
+  patch -p0 -i ../fbreader-gcc6.patch # Fix build with GCC6 (Gentoo)
   patch -p1 -i ../arm.patch
 }
 
@@ -31,11 +35,11 @@ build() {
   export TARGET_ARCH=desktop
   export UI_TYPE=qt4
   export TARGET_STATUS=release
-  cd $srcdir/fbreader-$pkgver
+  cd "$srcdir"/fbreader-$pkgver
   make ZLSHARED=no MOC=/usr/bin/moc-qt4
 }
 
 package() {
-  cd $srcdir/fbreader-$pkgver
-  make ZLSHARED=no DESTDIR=$pkgdir install
+  cd "$srcdir"/fbreader-$pkgver
+  make ZLSHARED=no DESTDIR="$pkgdir" install
 }
diff --git a/community/fbreader/fbreader-gcc6.patch b/community/fbreader/fbreader-gcc6.patch
new file mode 100644
index 000000000..c6f87a292
--- /dev/null
+++ b/community/fbreader/fbreader-gcc6.patch
@@ -0,0 +1,11 @@
+--- fbreader/src/formats/doc/OleStorage.cpp	2012-11-30 13:41:25.000000000 +0100
++++ fbreader/src/formats/doc/OleStorage.cpp-new	2016-08-31 17:23:18.232536401 +0200
+@@ -59,7 +59,7 @@
+ 		clear();
+ 		return false;
+ 	}
+-	static const char OLE_SIGN[] = {0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1, 0};
++	static const char OLE_SIGN[] = {(char)0xD0, (char)0xCF, (char)0x11, (char)0xE0, (char)0xA1, (char)0xB1, (char)0x1A, (char)0xE1, 0};
+ 	if (std::strncmp(oleBuf, OLE_SIGN, 8) != 0) {
+ 		clear();
+ 		return false;