From ea43edde1d4617fb627619bf7518163ba171983f Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 28 Mar 2020 15:26:04 +0100
Subject: 20200328.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 office/coolreader/coolreader.SlackBuild | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'office/coolreader/coolreader.SlackBuild')

diff --git a/office/coolreader/coolreader.SlackBuild b/office/coolreader/coolreader.SlackBuild
index ce30ee6681..991db8b37f 100644
--- a/office/coolreader/coolreader.SlackBuild
+++ b/office/coolreader/coolreader.SlackBuild
@@ -31,16 +31,13 @@
 # - add supported filetypes to README and slack-desc
 # - save/load settings (.ini file) to ~/.cr3, not /usr/share/cr3.
 
+# Upsteam url: https://sourceforge.net/p/crengine/crengine/ci/master/tree/
+
 PRGNAM=coolreader
-VERSION=${VERSION:-3.0.56}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20180814_b28e194}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-ORIG_PRGNAM=cr3
-ORIG_VERSION=$VERSION-7
-ORIG_DIRNAME=cr$ORIG_VERSION
-ORIG_FILENAME=${ORIG_PRGNAM}_$VERSION.orig.tar.gz
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -68,21 +65,25 @@ else
   LIBDIRSUFFIX=""
 fi
 
+ORIG_PRGNAM=cr3
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $ORIG_DIRNAME
-tar xvf $CWD/$ORIG_FILENAME
-cd $ORIG_DIRNAME
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
 chown -R root:root .
+find -L . \
+  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+   -o -perm 511 \) -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Fix upstream typo
-sed -i 's,documetn,document,g' cr3qt/src/*.ui cr3qt/src/i18n/*.ts
-
-# Don't try to load/save .ini file from /usr/share
-patch -p1 < $CWD/inifile.diff
+sed -i 's,documetn,document,g' cr3qt/src/*.ui cr3qt/src/i18n/*.ts || exit 1
 
 mkdir -p build
 cd build
-- 
cgit v1.2.3