From f52b58e1e972dd41dd8ba82096331b5b0a2a63d8 Mon Sep 17 00:00:00 2001 From: Alexander Verbovetsky Date: Thu, 20 Jul 2017 17:57:14 +0100 Subject: [PATCH] office/kchmviewer-qt: Updated for version 7.7 + new maintainer. Signed-off-by: David Spencer --- office/kchmviewer-qt/README | 30 +++++----- office/kchmviewer-qt/kchmviewer-qt.SlackBuild | 55 +++++++++++++------ office/kchmviewer-qt/kchmviewer-qt.info | 12 ++-- office/kchmviewer-qt/slack-desc | 16 +++--- 4 files changed, 68 insertions(+), 45 deletions(-) diff --git a/office/kchmviewer-qt/README b/office/kchmviewer-qt/README index 2bd3d33686..c476a9db47 100644 --- a/office/kchmviewer-qt/README +++ b/office/kchmviewer-qt/README @@ -1,16 +1,18 @@ -KchmViewer is a CHM (MS HTML help file format) viewer written in -C++. Unlike most existing CHM viewers for Unix, it uses the -Trolltech Qt widget library and does not depend on KDE or Gnome. -However, it may be compiled with full KDE support including KDE -widgets and KIO/KHTML. This script builds Qt-only version. +Kchmviewer is a free, open-source CHM (aka MS HTML help) and EPUB viewer +written in C++ for Unix, Mac and Windows systems. Unlike most existing +CHM viewers for Unix, it uses Trolltech Qt widget library, and could +optionally be compiled for better KDE integration. It does not require +KDE, but may be compiled with KDE widget support. Since version 5.0 it +uses the Webkit API to show the content. This script builds Qt-only +version. -The main advantage of KchmViewer is extra support for non-English -languages. Unlike other viewers, KchmViewer in most cases is able -to detect help file encoding, correctly shows tables of contents of -Russian, Korean, Chinese and Japanese help files, and does correct -search in non-English help files (search for MBCS languages - -ja/ko/ch is still in progress). +The main advantage of kchmviewer is the best support for non-English +languages. Unlike other viewers, kchmviewer in most cases is able to +correctly detect the chm file encoding and show it. It correctly shows +the index and table of context in Russian, Spanish, Romanian, Korean, +Chinese and Arabic help files, and with new search engine is able to +search in any chm file no matter what language it is written. -KchmViewer is written by George Yunaev (see the contacts page -for details), and is licensed under the GNU GPL license. It uses -chmlib and some ideas and code from xhcm. +kchmviewer is written by George Yunaev, and is licensed under GNU +General Public License version 3. It uses chmlib to handle the CHM +files, and some ideas from xchm. diff --git a/office/kchmviewer-qt/kchmviewer-qt.SlackBuild b/office/kchmviewer-qt/kchmviewer-qt.SlackBuild index e509053cbf..7baa06a1be 100644 --- a/office/kchmviewer-qt/kchmviewer-qt.SlackBuild +++ b/office/kchmviewer-qt/kchmviewer-qt.SlackBuild @@ -1,8 +1,9 @@ #!/bin/sh -# Slackware build script for KchmViewer (Qt-only version) +# Slackware build script for kchmviewer-qt # Copyright 2012-2015 Fridrich von Stauffenberg +# Copyright 2017, Alexander Verbovetsky, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -11,19 +12,19 @@ # 1. Redistributions of this script must retain the above copyright # notice, this list of conditions and the following disclaimer. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=kchmviewer-qt -VERSION=${VERSION:-7.3} +VERSION=${VERSION:-7.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -31,7 +32,7 @@ ORIG_PRGNAM=${PRGNAM%-qt} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -42,6 +43,16 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" +fi + set -e rm -rf $PKG @@ -51,20 +62,30 @@ rm -rf $ORIG_PRGNAM-$VERSION tar xvf $CWD/$ORIG_PRGNAM-$VERSION.tar.gz cd $ORIG_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 {} \; sed -i "s/$ORIG_PRGNAM/$PRGNAM/g; /^Categories/s/KDE;//; /^Name/s/$/ (Qt-only)/" packages/$ORIG_PRGNAM.desktop -qmake $ORIG_PRGNAM.pro +qmake \ + QMAKE_CFLAGS+="$SLKCFLAGS" \ + QMAKE_CXXFLAGS+="$SLKCFLAGS" \ + $ORIG_PRGNAM.pro make mkdir -p $PKG/usr/bin -cp -a bin/$ORIG_PRGNAM $PKG/usr/bin/$PRGNAM +install -m 0755 -o root -g root bin/$ORIG_PRGNAM $PKG/usr/bin/$PRGNAM mkdir -p $PKG/usr/share/{applications,pixmaps} -cp -a packages/$ORIG_PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop -cp -a packages/$ORIG_PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png +install -m 0644 -o root -g root packages/$ORIG_PRGNAM.desktop \ + $PKG/usr/share/applications/$PRGNAM.desktop +install -m 0644 -o root -g root packages/$ORIG_PRGNAM.png \ + $PKG/usr/share/pixmaps/$PRGNAM.png 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 diff --git a/office/kchmviewer-qt/kchmviewer-qt.info b/office/kchmviewer-qt/kchmviewer-qt.info index fd8e0aef75..16fd637eed 100644 --- a/office/kchmviewer-qt/kchmviewer-qt.info +++ b/office/kchmviewer-qt/kchmviewer-qt.info @@ -1,10 +1,10 @@ PRGNAM="kchmviewer-qt" -VERSION="7.3" -HOMEPAGE="http://www.kchmviewer.net" -DOWNLOAD="http://downloads.sourceforge.net/kchmviewer/kchmviewer-7.3.tar.gz" -MD5SUM="d62647d897f9196ade034363e0d58c13" +VERSION="7.7" +HOMEPAGE="http://www.ulduzsoft.com/kchmviewer" +DOWNLOAD="http://downloads.sourceforge.net/kchmviewer/kchmviewer-7.7.tar.gz" +MD5SUM="abf60f0cff69d2903600ecd372624cae" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Fridrich von Stauffenberg" -EMAIL="cancellor2@gmail.com" +MAINTAINER="Alexander Verbovetsky" +EMAIL="alik@ejik.org" diff --git a/office/kchmviewer-qt/slack-desc b/office/kchmviewer-qt/slack-desc index 2525f31a80..dbfbadbfc4 100644 --- a/office/kchmviewer-qt/slack-desc +++ b/office/kchmviewer-qt/slack-desc @@ -8,12 +8,12 @@ |-----handy-ruler------------------------------------------------------| kchmviewer-qt: kchmviewer-qt (a CHM viewer) kchmviewer-qt: -kchmviewer-qt: KchmViewer is a CHM (MS HTML help file format) viewer written in -kchmviewer-qt: C++. Unlike most existing CHM viewers for Unix, it uses the -kchmviewer-qt: Trolltech Qt widget library and does not depend on KDE or Gnome. -kchmviewer-qt: However, it may be compiled with full KDE support, including KDE -kchmviewer-qt: widgets and KIO/KHTML. This is Qt-only version. -kchmviewer-qt: -kchmviewer-qt: Homepage: http://kchmviewer.sourceforge.net -kchmviewer-qt: +kchmviewer-qt: Kchmviewer is a free, open-source CHM (aka MS HTML help) and EPUB +kchmviewer-qt: viewer written in C++ for Unix, Mac and Windows systems. Unlike most +kchmviewer-qt: existing CHM viewers for Unix, it uses Trolltech Qt widget library, +kchmviewer-qt: and could optionally be compiled for better KDE integration. It does +kchmviewer-qt: not require KDE, but may be compiled with KDE widget support. Since +kchmviewer-qt: version 5.0 it uses the Webkit API to show the content. This is +kchmviewer-qt: Qt-only version. kchmviewer-qt: +kchmviewer-qt: Homepage: http://www.ulduzsoft.com/kchmviewer