summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Michiel van Wessem2012-01-31 06:06:10 +0100
committer Robby Workman2012-01-31 06:06:10 +0100
commit6cb0764779787fcb61659ea949fa75c6d9abf0fb (patch)
treea9162509d557a19c123241d48e0d0189416809f8
parent9edb1e4ca84e0b176b3a4b841a26ed97dc38513e (diff)
downloadslackbuilds-6cb0764779787fcb61659ea949fa75c6d9abf0fb.tar.gz
office/kchmviewer: Updated for version 6.0.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--office/kchmviewer/kchmviewer.SlackBuild6
-rw-r--r--office/kchmviewer/kchmviewer.info8
-rw-r--r--office/kchmviewer/kchmviewer_no_msits.patch13
3 files changed, 5 insertions, 22 deletions
diff --git a/office/kchmviewer/kchmviewer.SlackBuild b/office/kchmviewer/kchmviewer.SlackBuild
index 26785afe72..4038cc23e2 100644
--- a/office/kchmviewer/kchmviewer.SlackBuild
+++ b/office/kchmviewer/kchmviewer.SlackBuild
@@ -24,7 +24,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=kchmviewer
-VERSION=${VERSION:-5.3}
+VERSION=${VERSION:-6.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -70,10 +70,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# Apply a patch added patch for using the version of kio_msits.so provided
-# by kdegraphics (by disabling it to build here).
-patch -p1 < $CWD/kchmviewer_no_msits.patch
-
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
diff --git a/office/kchmviewer/kchmviewer.info b/office/kchmviewer/kchmviewer.info
index b1e4578cc3..8eed777fa1 100644
--- a/office/kchmviewer/kchmviewer.info
+++ b/office/kchmviewer/kchmviewer.info
@@ -1,10 +1,10 @@
PRGNAM="kchmviewer"
-VERSION="5.3"
+VERSION="6.0"
HOMEPAGE="http://www.kchmviewer.net"
-DOWNLOAD="http://downloads.sourceforge.net/kchmviewer/kchmviewer-5.3.tar.gz"
-MD5SUM="619bae91bcaf9cc81d9907f0d593798f"
+DOWNLOAD="http://downloads.sourceforge.net/kchmviewer/kchmviewer-6.0.tar.gz"
+MD5SUM="940fdeeb5f50cdd0d0611f7a13e003f9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Michiel van Wessem"
EMAIL="michiel@slackbuilds.org"
-APPROVED="Niels Horn"
+APPROVED="rworkman"
diff --git a/office/kchmviewer/kchmviewer_no_msits.patch b/office/kchmviewer/kchmviewer_no_msits.patch
deleted file mode 100644
index 675623224b..0000000000
--- a/office/kchmviewer/kchmviewer_no_msits.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur kchmviewer-5.3/CMakeLists.txt kchmviewer-5.3_patched/CMakeLists.txt
---- kchmviewer-5.3/CMakeLists.txt 2009-12-15 06:02:57.000000000 +0000
-+++ kchmviewer-5.3_patched/CMakeLists.txt 2011-03-31 02:02:00.936125068 +0000
-@@ -18,7 +18,8 @@
-
- # Run in those subdirectories
- ADD_SUBDIRECTORY( lib/libchmfile )
--ADD_SUBDIRECTORY( lib/kio-msits )
-+# Disable use of kio-msits so it uses KDE's own.
-+#ADD_SUBDIRECTORY( lib/kio-msits )
- ADD_SUBDIRECTORY( src )
- ADD_SUBDIRECTORY( po )
- ADD_SUBDIRECTORY( packages )