summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--office/htmldoc/htmldoc.SlackBuild21
-rw-r--r--office/htmldoc/htmldoc.info6
2 files changed, 17 insertions, 10 deletions
diff --git a/office/htmldoc/htmldoc.SlackBuild b/office/htmldoc/htmldoc.SlackBuild
index 8e6fe78099..f88d47c057 100644
--- a/office/htmldoc/htmldoc.SlackBuild
+++ b/office/htmldoc/htmldoc.SlackBuild
@@ -24,15 +24,20 @@
# Thanks to Gentoo htmldoc's .ebuild maintainer for hints about configure's
# workaround, and for a patch to fix CVE-2009-3050.
+#
+#
+# Feb 01 2017: Alfredo
+# Update script for html-1.8.29, fix the problem with /usr/share/htmldoc/data
+# not being copied into the package
PRGNAM=htmldoc
-VERSION=${VERSION:-1.8.28}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.8.29}
+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
@@ -45,8 +50,8 @@ OUTPUT=${OUTPUT:-/tmp}
DOCFILES="CHANGES.txt README.txt COMPILE.txt COPYING.txt htmldoc.readme"
-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"
@@ -124,8 +129,10 @@ cp -a desktop/htmldoc-48.png $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png
cp -a desktop/htmldoc-64.png $PKG/usr/share/icons/hicolor/64x64/apps/$PRGNAM.png
cp -a desktop/htmldoc-96.png $PKG/usr/share/icons/hicolor/96x96/apps/$PRGNAM.png
cp -a desktop/htmldoc-128.png $PKG/usr/share/icons/hicolor/128x128/apps/$PRGNAM.png
-mkdir -p $PKG/usr/share/htmldoc/fonts
-cp -a fonts $PKG/usr/share/htmldoc/fonts
+mkdir -p $PKG/usr/share/htmldoc/
+cp -a fonts $PKG/usr/share/htmldoc/
+cp -a data $PKG/usr/share/htmldoc/
+
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/htmldoc/htmldoc.info b/office/htmldoc/htmldoc.info
index 5fcaf8dace..9bb5a60b8b 100644
--- a/office/htmldoc/htmldoc.info
+++ b/office/htmldoc/htmldoc.info
@@ -1,8 +1,8 @@
PRGNAM="htmldoc"
-VERSION="1.8.28"
+VERSION="1.8.29"
HOMEPAGE="http://www.msweet.org/projects.php?Z1"
-DOWNLOAD="http://www.msweet.org/files/project1/htmldoc-1.8.28-source.tar.bz2"
-MD5SUM="8e4e3f49ee9b2c5af01eb81a518ce7e7"
+DOWNLOAD="http://www.msweet.org/files/project1/htmldoc-1.8.29-source.tar.bz2"
+MD5SUM="dd2a05e2608d4f34db13c17a6667bb5e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="fltk"