mirror of
https://github.com/SlackBuildsOrg/slackbuilds
synced 2024-09-30 05:39:56 +02:00
office/htmldoc: Updated for version 1.8.28.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
parent
978445bce2
commit
385559d6ff
4 changed files with 24 additions and 58 deletions
|
@ -1,7 +1,7 @@
|
||||||
if [ -x /usr/bin/update-desktop-database ]; then
|
if [ -x /usr/bin/update-desktop-database ]; then
|
||||||
/usr/bin/update-desktop-database -q usr/share/applications
|
/usr/bin/update-desktop-database -q usr/share/applications
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -x /usr/bin/update-mime-database ]; then
|
if [ -x /usr/bin/update-mime-database ]; then
|
||||||
/usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
|
/usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
|
@ -11,4 +11,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
|
||||||
/usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
|
/usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
# Slackware build script for htmldoc
|
# Slackware build script for htmldoc
|
||||||
|
|
||||||
# Copyright 2009-2013 LukenShiro, Italy
|
# Copyright 2009-2014 LukenShiro, Italy
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
#
|
#
|
||||||
# Redistribution and use of this script, with or without modification, is
|
# Redistribution and use of this script, with or without modification, is
|
||||||
|
@ -26,8 +26,8 @@
|
||||||
# workaround, and for a patch to fix CVE-2009-3050.
|
# workaround, and for a patch to fix CVE-2009-3050.
|
||||||
|
|
||||||
PRGNAM=htmldoc
|
PRGNAM=htmldoc
|
||||||
VERSION=1.8.27
|
VERSION=${VERSION:-1.8.28}
|
||||||
BUILD=${BUILD:-5}
|
BUILD=${BUILD:-1}
|
||||||
TAG=${TAG:-_SBo}
|
TAG=${TAG:-_SBo}
|
||||||
|
|
||||||
if [ -z "$ARCH" ]; then
|
if [ -z "$ARCH" ]; then
|
||||||
|
@ -43,7 +43,7 @@ TMP=${TMP:-/tmp/SBo}
|
||||||
PKG=$TMP/package-$PRGNAM
|
PKG=$TMP/package-$PRGNAM
|
||||||
OUTPUT=${OUTPUT:-/tmp}
|
OUTPUT=${OUTPUT:-/tmp}
|
||||||
|
|
||||||
DOCFILES="CHANGES.txt README.txt COMPILE.txt COPYING.txt htmldoc.eula htmldoc.readme"
|
DOCFILES="CHANGES.txt README.txt COMPILE.txt COPYING.txt htmldoc.readme"
|
||||||
|
|
||||||
if [ "$ARCH" = "i486" ]; then
|
if [ "$ARCH" = "i486" ]; then
|
||||||
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
|
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
|
||||||
|
@ -69,17 +69,22 @@ tar xvf $CWD/$PRGNAM-$VERSION-source.tar.bz2
|
||||||
cd $PRGNAM-$VERSION
|
cd $PRGNAM-$VERSION
|
||||||
chown -R root:root .
|
chown -R root:root .
|
||||||
find -L . \
|
find -L . \
|
||||||
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
|
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
|
||||||
-exec chmod 755 {} \; -o \
|
-o -perm 511 \) -exec chmod 755 {} \; -o \
|
||||||
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
\( -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 {} \;
|
||||||
|
|
||||||
# workaround to avoid /usr/share/doc/htmldoc's use for help function
|
# workaround to avoid /usr/share/doc/htmldoc's use for help function
|
||||||
sed -i 's|^#define DOCUMENTATION "$prefix/share/doc/htmldoc"|\
|
sed -r -i 's|^#define DOCUMENTATION "$prefix/share/doc/htmldoc"|\
|
||||||
#define DOCUMENTATION "$prefix/doc/htmldoc-1.8.27"|g' ./configure
|
#define DOCUMENTATION "$prefix/doc/htmldoc-$VERSION"|g' ./configure
|
||||||
|
|
||||||
|
# to avoid an invalid implicit declaration of function (for 'CUPS_SRAND' and 'CUPS_RAND')
|
||||||
|
sed -r -i 's|CUPS_SRAND|srand|g' htmldoc/http.c
|
||||||
|
sed -r -i 's|CUPS_RAND|rand|g' htmldoc/http.c
|
||||||
|
|
||||||
# --mandir seems to be ignored; --docdir doesn't exist
|
# --mandir seems to be ignored; --docdir doesn't exist
|
||||||
# internal jpeg/png/zlib libs disabled (using system ones)
|
# internal jpeg/png/zlib libs disabled (using system ones)
|
||||||
|
# it does not build correctly with gnutls (disabled)
|
||||||
CFLAGS="$SLKCFLAGS" \
|
CFLAGS="$SLKCFLAGS" \
|
||||||
CXXFLAGS="$SLKCFLAGS" \
|
CXXFLAGS="$SLKCFLAGS" \
|
||||||
./configure \
|
./configure \
|
||||||
|
@ -89,20 +94,18 @@ CXXFLAGS="$SLKCFLAGS" \
|
||||||
--with-gui \
|
--with-gui \
|
||||||
--disable-localjpeg \
|
--disable-localjpeg \
|
||||||
--disable-localzlib \
|
--disable-localzlib \
|
||||||
--disable-localpng
|
--disable-localpng \
|
||||||
|
--disable-gnutls \
|
||||||
|
--build=$ARCH-slackware-linux
|
||||||
|
|
||||||
# workaround to avoid /usr/share/doc/htmldoc's use for doc installation
|
# workaround to avoid /usr/share/doc/htmldoc's use for doc installation
|
||||||
sed -i 's|\$(datadir)/doc/htmldoc|\$(prefix)/doc/htmldoc-1.8.27|g' \
|
sed -r -i 's|\$(datadir)/doc/htmldoc|\$(prefix)/doc/htmldoc-$VERSION|g' \
|
||||||
doc/Makefile
|
doc/Makefile
|
||||||
|
|
||||||
# Apply patch to fix several insecure calls to sscanf().
|
make all
|
||||||
# It's intended to resolve CVE-2009-3050 vulnerability.
|
|
||||||
patch -p0 < $CWD/insecure_sscanf_patch.diff
|
|
||||||
|
|
||||||
make all || exit 1
|
|
||||||
|
|
||||||
# DESTDIR= is not supported
|
# DESTDIR= is not supported
|
||||||
make prefix=$PKG/usr install || exit 1
|
make prefix=$PKG/usr install
|
||||||
|
|
||||||
# Copy some files who are not automatically installed (main binary, .desktop, icons, etc..)
|
# Copy some files who are not automatically installed (main binary, .desktop, icons, etc..)
|
||||||
mkdir -p $PKG/usr/bin
|
mkdir -p $PKG/usr/bin
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
PRGNAM="htmldoc"
|
PRGNAM="htmldoc"
|
||||||
VERSION="1.8.27"
|
VERSION="1.8.28"
|
||||||
HOMEPAGE="http://www.msweet.org/projects.php?Z1"
|
HOMEPAGE="http://www.msweet.org/projects.php?Z1"
|
||||||
DOWNLOAD="http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/htmldoc/1.8.27/htmldoc-1.8.27-source.tar.bz2"
|
DOWNLOAD="http://www.msweet.org/files/project1/htmldoc-1.8.28-source.tar.bz2"
|
||||||
MD5SUM="35589e7b8fe9c54e11be87cd5aec4dcc"
|
MD5SUM="8e4e3f49ee9b2c5af01eb81a518ce7e7"
|
||||||
DOWNLOAD_x86_64=""
|
DOWNLOAD_x86_64=""
|
||||||
MD5SUM_x86_64=""
|
MD5SUM_x86_64=""
|
||||||
REQUIRES="fltk"
|
REQUIRES="fltk"
|
||||||
|
|
|
@ -1,36 +0,0 @@
|
||||||
diff -ru htmldoc/htmllib.cxx htmldoc/htmllib.cxx
|
|
||||||
--- htmldoc/htmllib.cxx 2006-06-07 19:43:52.000000000 +0200
|
|
||||||
+++ htmldoc/htmllib.cxx 2009-08-01 19:52:46.301099436 +0200
|
|
||||||
@@ -2139,7 +2139,7 @@
|
|
||||||
* assigned charset...
|
|
||||||
*/
|
|
||||||
|
|
||||||
- if (sscanf(line, "%*s%*s%*s%*s%f%*s%*s%s", &width, glyph) != 2)
|
|
||||||
+ if (sscanf(line, "%*s%*s%*s%*s%f%*s%*s%63s", &width, glyph) != 2)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
for (ch = 0; ch < 256; ch ++)
|
|
||||||
diff -ru htmldoc/ps-pdf.cxx htmldoc/ps-pdf.cxx
|
|
||||||
--- htmldoc/ps-pdf.cxx 2006-08-01 18:58:50.000000000 +0200
|
|
||||||
+++ htmldoc/ps-pdf.cxx 2009-08-01 19:53:14.300610480 +0200
|
|
||||||
@@ -12512,7 +12512,7 @@
|
|
||||||
* assigned charset...
|
|
||||||
*/
|
|
||||||
|
|
||||||
- if (sscanf(line, "%*s%*s%*s%*s%d%*s%*s%s", &width, glyph) != 2)
|
|
||||||
+ if (sscanf(line, "%*s%*s%*s%*s%d%*s%*s%63s", &width, glyph) != 2)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
for (ch = 0; ch < 256; ch ++)
|
|
||||||
diff -ru htmldoc/util.cxx htmldoc/util.cxx
|
|
||||||
--- htmldoc/util.cxx 2005-04-24 21:20:32.000000000 +0200
|
|
||||||
+++ htmldoc/util.cxx 2009-08-01 19:52:14.469652088 +0200
|
|
||||||
@@ -484,7 +484,7 @@
|
|
||||||
PageWidth = 595;
|
|
||||||
PageLength = 792;
|
|
||||||
}
|
|
||||||
- else if (sscanf(size, "%fx%f%s", &width, &length, units) >= 2)
|
|
||||||
+ else if (sscanf(size, "%fx%f%254s", &width, &length, units) >= 2)
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* Custom size...
|
|
Loading…
Reference in a new issue