[arch-commits] Commit in fbreader/repos/community-x86_64 (3 files)

[Antonio Rojas]

    Date: Monday, June 4, 2018 @ 22:31:47
  Author: arojas
Revision: 340476

archrelease: copy trunk to community-x86_64

Added:
  fbreader/repos/community-x86_64/PKGBUILD
    (from rev 340475, fbreader/trunk/PKGBUILD)
  fbreader/repos/community-x86_64/fbreader-gcc6.patch
    (from rev 340475, fbreader/trunk/fbreader-gcc6.patch)
Deleted:
  fbreader/repos/community-x86_64/PKGBUILD

---------------------+
 PKGBUILD            |   74 ++++++++++++++++++++++++++------------------------
 fbreader-gcc6.patch |   11 +++++++
 2 files changed, 50 insertions(+), 35 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-04 22:31:19 UTC (rev 340475)
+++ PKGBUILD	2018-06-04 22:31:47 UTC (rev 340476)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=fbreader
-pkgver=0.99.4
-pkgrel=6
-pkgdesc="An e-book reader for Linux"
-arch=('i686' '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")
-md5sums=('ed13a9c3aeb68aaa98a1dd6f7947a31d'
-         'bc8975fc8235f393ef011b564addf300')
-
-prepare() {
-  cd $srcdir/fbreader-$pkgver
-  patch -p1 <$srcdir/fbreader-0.99.4.patch
-}
-
-build() {
-  export TARGET_ARCH=desktop
-  export UI_TYPE=qt4
-  export TARGET_STATUS=release
-  cd $srcdir/fbreader-$pkgver
-  make ZLSHARED=no MOC=/usr/bin/moc-qt4
-}
-
-package() {
-  cd $srcdir/fbreader-$pkgver
-  make ZLSHARED=no DESTDIR=$pkgdir install
-}

Copied: fbreader/repos/community-x86_64/PKGBUILD (from rev 340475, fbreader/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-06-04 22:31:47 UTC (rev 340476)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=fbreader
+pkgver=0.99.4
+pkgrel=7
+pkgdesc="An e-book reader for Linux"
+arch=('x86_64')
+url="http://www.fbreader.org/"
+license=('GPL')
+depends=('fribidi' 'bzip2' 'curl' 'qt4' 'libunibreak' 'sqlite')
+makedepends=('ccache')
+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)
+sha256sums=('3d7c31d5ea314589d2a963290ad16f4d3d631a41e802b8b39f8be0c9f71eb8e9'
+            'cb3aa6795c8f7c694ba296f6f6e6a7939648578a289bc84c10f8302c7e72df86'
+            'bc67b538c51a5b77468469df6b5e96ce918ee11a5ff4e88e398ad5661d322f9c')
+
+prepare() {
+  cd "$srcdir"/fbreader-$pkgver
+  patch -p1 <"$srcdir"/fbreader-0.99.4.patch
+
+  patch -p0 -i ../fbreader-gcc6.patch # Fix build with GCC6 (Gentoo)
+}
+
+build() {
+  export TARGET_ARCH=desktop
+  export UI_TYPE=qt4
+  export TARGET_STATUS=release
+  cd "$srcdir"/fbreader-$pkgver
+  make ZLSHARED=no MOC=/usr/bin/moc-qt4
+}
+
+package() {
+  cd "$srcdir"/fbreader-$pkgver
+  make ZLSHARED=no DESTDIR="$pkgdir" install
+}

Copied: fbreader/repos/community-x86_64/fbreader-gcc6.patch (from rev 340475, fbreader/trunk/fbreader-gcc6.patch)
===================================================================
--- fbreader-gcc6.patch	                        (rev 0)
+++ fbreader-gcc6.patch	2018-06-04 22:31:47 UTC (rev 340476)
@@ -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;