diff options
| -rw-r--r-- | office/kchmviewer/doinst.sh | 3 | ||||
| -rw-r--r-- | office/kchmviewer/kchmviewer-5.2-kde-build.patch | 20 | ||||
| -rw-r--r-- | office/kchmviewer/kchmviewer.SlackBuild | 17 | ||||
| -rw-r--r-- | office/kchmviewer/kchmviewer.info | 8 | ||||
| -rw-r--r-- | office/kchmviewer/kchmviewer_no_msits.patch | 28 | ||||
| -rw-r--r-- | office/kchmviewer/slack-desc | 8 |
6 files changed, 47 insertions, 37 deletions
diff --git a/office/kchmviewer/doinst.sh b/office/kchmviewer/doinst.sh new file mode 100644 index 0000000000..5fb28930db --- /dev/null +++ b/office/kchmviewer/doinst.sh @@ -0,0 +1,3 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi diff --git a/office/kchmviewer/kchmviewer-5.2-kde-build.patch b/office/kchmviewer/kchmviewer-5.2-kde-build.patch deleted file mode 100644 index d6f3fcb936..0000000000 --- a/office/kchmviewer/kchmviewer-5.2-kde-build.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur build-5.2-orig/src/CMakeLists.txt build-5.2/src/CMakeLists.txt ---- build-5.2-orig/src/CMakeLists.txt 2009-12-15 06:27:57.000000000 +0000 -+++ build-5.2/src/CMakeLists.txt 2010-08-07 01:05:09.775042811 +0100 -@@ -12,6 +12,8 @@ - main.cpp - mainwindow.cpp - navigationpanel.cpp -+ toolbareditor.cpp -+ toolbarmanager.cpp - recentfiles.cpp - settings.cpp - tab_bookmarks.cpp -@@ -30,6 +32,7 @@ - dialog_about.ui - dialog_setup.ui - dialog_topicselector.ui -+ toolbareditor.ui - mainwindow.ui - navigatorpanel.ui - tab_bookmarks.ui diff --git a/office/kchmviewer/kchmviewer.SlackBuild b/office/kchmviewer/kchmviewer.SlackBuild index 246b2a9032..dbbbb347f1 100644 --- a/office/kchmviewer/kchmviewer.SlackBuild +++ b/office/kchmviewer/kchmviewer.SlackBuild @@ -24,16 +24,14 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=kchmviewer -VERSION=${VERSION:-5.2} +VERSION=${VERSION:-5.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -61,10 +59,10 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -rm -rf $TMP/build-$VERSION cd $TMP +rm -rf $PRGNAM-$VERSION tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz -cd build-$VERSION +cd $PRGNAM-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -72,9 +70,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Patch to build kchmviewer properly. Thanks to -# http://bugs.gentoo.org/320191. -patch -p1 < $CWD/kchmviewer-5.2-kde-build.patch +# Apply a patch added patch for using the version of kio_msits.so provided +# by kdegraphics (by disabling it to build here). +patch -p0 < $CWD/kchmviewer_no_msits.patch cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ @@ -84,7 +82,7 @@ cmake \ -DMAN_INSTALL_DIR=/usr/man \ -DCMAKE_BUILD_TYPE=Release . -make +make VERBOSE=1 make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ @@ -96,6 +94,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/office/kchmviewer/kchmviewer.info b/office/kchmviewer/kchmviewer.info index c43bf564af..b1e4578cc3 100644 --- a/office/kchmviewer/kchmviewer.info +++ b/office/kchmviewer/kchmviewer.info @@ -1,10 +1,10 @@ PRGNAM="kchmviewer" -VERSION="5.2" +VERSION="5.3" HOMEPAGE="http://www.kchmviewer.net" -DOWNLOAD="http://downloads.sourceforge.net/kchmviewer/kchmviewer-5.2.tar.gz" -MD5SUM="9798c7f949d1137949e69a8c226415f9" +DOWNLOAD="http://downloads.sourceforge.net/kchmviewer/kchmviewer-5.3.tar.gz" +MD5SUM="619bae91bcaf9cc81d9907f0d593798f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Michiel van Wessem" EMAIL="michiel@slackbuilds.org" -APPROVED="Erik Hanson" +APPROVED="Niels Horn" diff --git a/office/kchmviewer/kchmviewer_no_msits.patch b/office/kchmviewer/kchmviewer_no_msits.patch new file mode 100644 index 0000000000..21db687462 --- /dev/null +++ b/office/kchmviewer/kchmviewer_no_msits.patch @@ -0,0 +1,28 @@ +diff -Naur /tmp/SBo/kchmviewer-5.3-orig//CMakeLists.txt /tmp/SBo/kchmviewer-5.3/CMakeLists.txt +--- /tmp/SBo/kchmviewer-5.3-orig//CMakeLists.txt 2009-12-15 06:02:57.000000000 +0000 ++++ /tmp/SBo/kchmviewer-5.3/CMakeLists.txt 2011-03-04 22:23:38.347963065 +0000 +@@ -18,7 +18,7 @@ + + # Run in those subdirectories + ADD_SUBDIRECTORY( lib/libchmfile ) +-ADD_SUBDIRECTORY( lib/kio-msits ) ++#ADD_SUBDIRECTORY( lib/kio-msits ) + ADD_SUBDIRECTORY( src ) + ADD_SUBDIRECTORY( po ) + ADD_SUBDIRECTORY( packages ) +diff -Naur /tmp/SBo/kchmviewer-5.3-orig//kchmviewer_no_msits.patch /tmp/SBo/kchmviewer-5.3/kchmviewer_no_msits.patch +--- /tmp/SBo/kchmviewer-5.3-orig//kchmviewer_no_msits.patch 1970-01-01 00:00:00.000000000 +0000 ++++ /tmp/SBo/kchmviewer-5.3/kchmviewer_no_msits.patch 2011-03-04 22:27:20.793900840 +0000 +@@ -0,0 +1,12 @@ ++diff -Naur /tmp/SBo/kchmviewer-5.3-orig//CMakeLists.txt /tmp/SBo/kchmviewer-5.3/CMakeLists.txt ++--- /tmp/SBo/kchmviewer-5.3-orig//CMakeLists.txt 2009-12-15 06:02:57.000000000 +0000 +++++ /tmp/SBo/kchmviewer-5.3/CMakeLists.txt 2011-03-04 22:23:38.347963065 +0000 ++@@ -18,7 +18,7 @@ ++ ++ # Run in those subdirectories ++ ADD_SUBDIRECTORY( lib/libchmfile ) ++-ADD_SUBDIRECTORY( lib/kio-msits ) +++#ADD_SUBDIRECTORY( lib/kio-msits ) ++ ADD_SUBDIRECTORY( src ) ++ ADD_SUBDIRECTORY( po ) ++ ADD_SUBDIRECTORY( packages ) diff --git a/office/kchmviewer/slack-desc b/office/kchmviewer/slack-desc index 6db351cae3..c66b0f1382 100644 --- a/office/kchmviewer/slack-desc +++ b/office/kchmviewer/slack-desc @@ -7,13 +7,13 @@ |-----handy-ruler------------------------------------------------------| kchmviewer: KchmViewer (a chm viewer (MS HTML help file format) ) -kchmviewer: +kchmviewer: kchmviewer: KchmViewer is a chm (MS HTML help file format) viewer written in kchmviewer: C++. Unlike most existing CHM viewers for Unix, it uses the kchmviewer: Trolltech Qt widget library and does not depend on KDE or Gnome. kchmviewer: However, it may be compiled with full KDE support, including KDE kchmviewer: widgets and KIO/KHTML. -kchmviewer: +kchmviewer: kchmviewer: http://kchmviewer.sourceforge.net/ -kchmviewer: -kchmviewer: +kchmviewer: +kchmviewer: |