diff options
| -rw-r--r-- | office/sigil/README | 4 | ||||
| -rw-r--r-- | office/sigil/sigil.SlackBuild | 36 | ||||
| -rw-r--r-- | office/sigil/sigil.info | 8 |
3 files changed, 23 insertions, 25 deletions
diff --git a/office/sigil/README b/office/sigil/README index 9831887237..bdd43d61ba 100644 --- a/office/sigil/README +++ b/office/sigil/README @@ -1,6 +1,2 @@ Sigil is a multi-platform WYSIWYG ebook editor. It is designed to edit books in ePub format. - -Optional dependencies: xerces-c, minizip - -Optional dependencies not on SBo: flightcrew diff --git a/office/sigil/sigil.SlackBuild b/office/sigil/sigil.SlackBuild index f0e54d8bf7..f9cb433fcc 100644 --- a/office/sigil/sigil.SlackBuild +++ b/office/sigil/sigil.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for sigil -# Copyright 2010-2014 Larry Hajali <larryhaja[at]gmail[dot]com> +# Copyright 2010-2018 Larry Hajali <larryhaja[at]gmail[dot]com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,13 +24,13 @@ PRGNAM=sigil SRCNAM=Sigil -VERSION=${VERSION:-0.7.4} +VERSION=${VERSION:-0.9.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -41,8 +41,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -60,19 +60,22 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -mkdir -p $PRGNAM-$VERSION -cd $PRGNAM-$VERSION -unzip $CWD/$SRCNAM-$VERSION-Code.zip +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$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 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Fix end of line encoding. -sed -i 's/\r//g' ChangeLog.txt COPYING.txt INSTALL.txt README.txt +# Don't bulid against system libminizip if installed. +# Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1424609 +sed -i '/MiniZip/s|.*|#&|' CMakeLists.txt +# Fix lib directory +sed -i "s|/lib/|/lib${LIBDIRSUFFIX}/|" \ + CMakeLists.txt src/CMakeLists.txt src/Resource_Files/bash/sigil-sh_install mkdir build cd build @@ -80,25 +83,24 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DUSE_SYSTEM_LIBS:BOOL=ON \ -DCMAKE_BUILD_TYPE=Release .. make VERBOSE=1 make install DESTDIR=$PKG cd .. -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true for i in 16 32 48 128 256 512; do - install -D -m 0644 src/Sigil/Resource_Files/icon/app_icon_${i}.png \ + install -D -m 0644 src/Resource_Files/icon/app_icon_${i}.png \ $PKG/usr/share/icons/hicolor/${i}x${i}/apps/$PRGNAM.png done rm -rf $PKG/usr/share/pixmaps mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - ChangeLog.txt COPYING.txt INSTALL.txt README.txt \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a ChangeLog.txt COPYING.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/office/sigil/sigil.info b/office/sigil/sigil.info index bb206a64f9..e33b2d157a 100644 --- a/office/sigil/sigil.info +++ b/office/sigil/sigil.info @@ -1,10 +1,10 @@ PRGNAM="sigil" -VERSION="0.7.4" +VERSION="0.9.10" HOMEPAGE="https://sigil-ebook.com/" -DOWNLOAD="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/sigil/Sigil-0.7.4-Code.zip" -MD5SUM="dde8f3b8daa0ccd37589ea2aa454e1bc" +DOWNLOAD="https://github.com/Sigil-Ebook/Sigil/archive/0.9.10/Sigil-0.9.10.tar.gz" +MD5SUM="22314e415220297782d27d85d7f1cce0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="qt5-webkit" +REQUIRES="qt5 lxml" MAINTAINER="Larry Hajali" EMAIL="larryhaja[at]gmail[dot]com" |