diff options
author | Matteo Bernardini | 2020-05-03 10:26:34 +0200 |
---|---|---|
committer | Matteo Bernardini | 2020-05-03 10:26:34 +0200 |
commit | 48259ed40770acaca280ee12a8434410f58aff30 (patch) | |
tree | f1ed654e2693aa523ece7d3bb3cadf0fe9089d66 /office/coolreader | |
parent | a5a09aea950fef7569ac816b34a99b71830760d4 (diff) | |
download | slackbuilds-current-20200503.1.tar.gz |
20200503.1 global branch merge.current-20200503.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'office/coolreader')
-rw-r--r-- | office/coolreader/coolreader.SlackBuild | 29 | ||||
-rw-r--r-- | office/coolreader/coolreader.info | 6 | ||||
-rw-r--r-- | office/coolreader/inifile.diff | 21 |
3 files changed, 18 insertions, 38 deletions
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 diff --git a/office/coolreader/coolreader.info b/office/coolreader/coolreader.info index 2a462222f6..89d8d5a773 100644 --- a/office/coolreader/coolreader.info +++ b/office/coolreader/coolreader.info @@ -1,8 +1,8 @@ PRGNAM="coolreader" -VERSION="3.0.56" +VERSION="20180814_b28e194" HOMEPAGE="https://sourceforge.net/projects/crengine/" -DOWNLOAD="https://downloads.sourceforge.net/crengine/CoolReader3/cr3_3.0.56.orig.tar.gz" -MD5SUM="cc221a608a1b5fea2db5a519c14eeb39" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/coolreader-20180814_b28e194.tar.xz" +MD5SUM="52c422c04a5f4faa004bb4dc3cbcfe51" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/office/coolreader/inifile.diff b/office/coolreader/inifile.diff deleted file mode 100644 index 9290599e69..0000000000 --- a/office/coolreader/inifile.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur cr3.0.56-7/cr3qt/src/mainwindow.cpp cr3.0.56-7.patched/cr3qt/src/mainwindow.cpp ---- cr3.0.56-7/cr3qt/src/mainwindow.cpp 2012-03-21 01:39:19.000000000 -0400 -+++ cr3.0.56-7.patched/cr3qt/src/mainwindow.cpp 2020-01-26 19:26:09.590595122 -0500 -@@ -79,7 +79,6 @@ - QString bookmarksDir = homeDir + "bookmarks"; - QString histFile = exeDir + "cr3hist.bmk"; - QString histFile2 = homeDir + "cr3hist.bmk"; -- QString iniFile2 = exeDir + "cr3.ini"; - QString iniFile = homeDir + "cr3.ini"; - QString cssFile = homeDir + "fb2.css"; - QString cssFile2 = exeDir + "fb2.css"; -@@ -91,8 +90,7 @@ - - ldomDocCache::init( qt2cr( cacheDir ), DOC_CACHE_SIZE ); - ui->view->setPropsChangeCallback( this ); -- if ( !ui->view->loadSettings( iniFile ) ) -- ui->view->loadSettings( iniFile2 ); -+ ui->view->loadSettings( iniFile ); - if ( !ui->view->loadHistory( histFile ) ) - ui->view->loadHistory( histFile2 ); - if ( !ui->view->loadCSS( cssFile ) ) |