[arch-commits] Commit in fbreader/trunk (PKGBUILD fbreader-0.99.4.patch)

[Sergej Pupykin]

    Date: Saturday, November 13, 2021 @ 19:42:24
  Author: spupykin
Revision: 1045967

upgpkg: fbreader 0.99.4-10

Added:
  fbreader/trunk/fbreader-0.99.4.patch
Modified:
  fbreader/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   24 +++++++++++++-----------
 fbreader-0.99.4.patch |    8 ++++++++
 2 files changed, 21 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-13 19:42:11 UTC (rev 1045966)
+++ PKGBUILD	2021-11-13 19:42:24 UTC (rev 1045967)
@@ -2,28 +2,30 @@
 # Contributor: William Rea <sillywilly at gmail.com>
 
 pkgname=fbreader
-pkgver=0.99.5
-pkgrel=1
+pkgver=0.99.4
+pkgrel=10
 pkgdesc="An e-book reader for Linux"
 arch=('x86_64')
 url="http://www.fbreader.org/"
 license=('GPL')
 depends=('fribidi' 'bzip2' 'curl' 'qt5-base' 'libunibreak' 'sqlite')
-source=($pkgname-$pkgver.tar.gz::https://github.com/geometer/FBReader/archive/refs/tags/$pkgver.tar.gz
+source=(http://www.fbreader.org/files/desktop/fbreader-sources-$pkgver.tgz
+	fbreader-0.99.4.patch
 	fbreader-gcc6.patch
 	fbreader-qt5.patch)
-sha256sums=('5e4fe6cd18d2fe3f8ea36084da5f15c961479e6e639fdeeff8db293e02471e3f'
+sha256sums=('3d7c31d5ea314589d2a963290ad16f4d3d631a41e802b8b39f8be0c9f71eb8e9'
+            'cb3aa6795c8f7c694ba296f6f6e6a7939648578a289bc84c10f8302c7e72df86'
             'bc67b538c51a5b77468469df6b5e96ce918ee11a5ff4e88e398ad5661d322f9c'
             '9d00f95f2a026b7bdafa6ab8519659cd2c293f1b9b00681a62d3f4992399e716')
 
 prepare() {
-  cd FBReader-$pkgver
+  cd "$srcdir"/fbreader-$pkgver
+  patch -p1 <"$srcdir"/fbreader-0.99.4.patch
 
-#  sed -i "s|VERSION|\"$pkgver\"|" fbreader/src/fbreader/FBReader.cpp
   patch -p0 -i ../fbreader-gcc6.patch # Fix build with GCC6 (Gentoo)
   patch -p1 -i ../fbreader-qt5.patch # Port to Qt5 (Gentoo)
 
-  # Use system FLAGS
+# Use system FLAGS
   sed -e "s/^CFLAGS = -pipe/CFLAGS +=/" -i makefiles/arch/desktop.mk
   sed -e "/^	CFLAGS +=/d" -i makefiles/config.mk
   sed -e "/^	LDFLAGS += -s$/d" -i makefiles/config.mk
@@ -33,15 +35,15 @@
 
 build() {
   export TARGET_ARCH=desktop
+  export UI_TYPE=qt4
   export TARGET_STATUS=release
-  export CXXFLAGS+=" -fPIC"
-  export UI_TYPE=qt
-  cd FBReader-$pkgver
+  export CXXFLAGS+=' -fPIC'
+  cd fbreader-$pkgver
   make
 }
 
 package() {
-  cd FBReader-$pkgver
+  cd fbreader-$pkgver
   export CXXFLAGS+=' -fPIC'
   make DESTDIR="$pkgdir" install
 }

Added: fbreader-0.99.4.patch
===================================================================
--- fbreader-0.99.4.patch	                        (rev 0)
+++ fbreader-0.99.4.patch	2021-11-13 19:42:24 UTC (rev 1045967)
@@ -0,0 +1,8 @@
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp	2013-02-21 13:30:31.000000000 +0700
+@@ -49,3 +49,4 @@
+ 	  path = replacement + path.substr(1);
+ 	}
++	ZLUnixFSManager::normalizeRealPath(path);
+ }