diff options
author | Matteo Bernardini | 2020-01-18 10:16:11 +0100 |
---|---|---|
committer | Matteo Bernardini | 2020-01-18 10:16:11 +0100 |
commit | 54d3863f4487caf692625d6d85d083f03915b05a (patch) | |
tree | 6e6ba1d4f953177ef295937086863b69130b4ba4 /office/htmldoc | |
parent | e7c5997b9311a3ac31e986a3d4f525c9af840c89 (diff) | |
download | slackbuilds-54d3863f4487caf692625d6d85d083f03915b05a.tar.gz |
20200118.1 global branch merge.current-20200118.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'office/htmldoc')
-rw-r--r-- | office/htmldoc/build_fix.patch | 11 | ||||
-rw-r--r-- | office/htmldoc/htmldoc.SlackBuild | 20 | ||||
-rw-r--r-- | office/htmldoc/htmldoc.info | 6 |
3 files changed, 22 insertions, 15 deletions
diff --git a/office/htmldoc/build_fix.patch b/office/htmldoc/build_fix.patch new file mode 100644 index 0000000000..f0e2e64993 --- /dev/null +++ b/office/htmldoc/build_fix.patch @@ -0,0 +1,11 @@ +--- htmldoc/ps-pdf.cxx.orig 2018-04-10 11:56:03 UTC ++++ htmldoc/ps-pdf.cxx +@@ -5361,7 +5361,7 @@ parse_pre(tree_t *t, /* I - Tree to parse */ + line[10240], + *lineptr, + *dataptr; +- int col; ++ volatile int col; + float width, + height, + rgb[3]; diff --git a/office/htmldoc/htmldoc.SlackBuild b/office/htmldoc/htmldoc.SlackBuild index f88d47c057..4336fd627f 100644 --- a/office/htmldoc/htmldoc.SlackBuild +++ b/office/htmldoc/htmldoc.SlackBuild @@ -31,7 +31,7 @@ # not being copied into the package PRGNAM=htmldoc -VERSION=${VERSION:-1.8.29} +VERSION=${VERSION:-1.9.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -48,7 +48,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCFILES="CHANGES.txt README.txt COMPILE.txt COPYING.txt htmldoc.readme" +DOCFILES="CHANGES.md README.md COPYING" if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" @@ -70,7 +70,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION-source.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -79,6 +79,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# https://github.com/michaelrsweet/htmldoc/issues/349#issuecomment-486094260 +patch -p0 < $CWD/build_fix.patch + # workaround to avoid /usr/share/doc/htmldoc's use for help function sed -r -i 's|^#define DOCUMENTATION "$prefix/share/doc/htmldoc"|\ #define DOCUMENTATION "$prefix/doc/htmldoc-$VERSION"|g' ./configure @@ -117,23 +120,16 @@ mkdir -p $PKG/usr/man/man1 cp -a doc/$PRGNAM.1 $PKG/usr/man/man1 mkdir -p $PKG/usr/share/applications cp -a desktop/$PRGNAM.desktop $PKG/usr/share/applications -mkdir -p $PKG/usr/share/mimelnk/application -cp -a desktop/vnd.htmldoc-book.desktop $PKG/usr/share/mimelnk/application mkdir -p $PKG/usr/share/mime/packages cp -a desktop/htmldoc.xml $PKG/usr/share/mime/packages -mkdir -p $PKG/usr/share/icons/hicolor/{16x16,24x24,32x32,48x48,64x64,96x96,128x128}/apps/ -cp -a desktop/htmldoc-16.png $PKG/usr/share/icons/hicolor/16x16/apps/$PRGNAM.png -cp -a desktop/htmldoc-24.png $PKG/usr/share/icons/hicolor/24x24/apps/$PRGNAM.png +mkdir -p $PKG/usr/share/icons/hicolor/{32x32,128x128}/apps/ $PKG/usr/share/pixmaps cp -a desktop/htmldoc-32.png $PKG/usr/share/icons/hicolor/32x32/apps/$PRGNAM.png -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 +cp -a desktop/htmldoc.xpm $PKG/usr/share/pixmaps/$PRGNAM.xpm 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 5bdd183509..d74acb287c 100644 --- a/office/htmldoc/htmldoc.info +++ b/office/htmldoc/htmldoc.info @@ -1,8 +1,8 @@ PRGNAM="htmldoc" -VERSION="1.8.29" +VERSION="1.9.5" HOMEPAGE="https://www.msweet.org/htmldoc/index.html" -DOWNLOAD="http://www.mirrorservice.org/sites/distfiles.finkmirrors.net/md5/dd2a05e2608d4f34db13c17a6667bb5e/htmldoc-1.8.29-source.tar.bz2" -MD5SUM="dd2a05e2608d4f34db13c17a6667bb5e" +DOWNLOAD="https://github.com/michaelrsweet/htmldoc/archive/v1.9.5/htmldoc-1.9.5.tar.gz" +MD5SUM="afcb95956be031ed8964322385c73e0d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="fltk" |