aboutsummaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rw-r--r--misc/wkhtmltopdf/wkhtmltopdf.SlackBuild14
-rw-r--r--misc/wkhtmltopdf/wkhtmltopdf.info6
2 files changed, 10 insertions, 10 deletions
diff --git a/misc/wkhtmltopdf/wkhtmltopdf.SlackBuild b/misc/wkhtmltopdf/wkhtmltopdf.SlackBuild
index 03e9da72dcd43..a38295a6b7edf 100644
--- a/misc/wkhtmltopdf/wkhtmltopdf.SlackBuild
+++ b/misc/wkhtmltopdf/wkhtmltopdf.SlackBuild
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=wkhtmltopdf
-VERSION=${VERSION:-0.12.3.2}
+VERSION=${VERSION:-0.12.6}
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
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-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"
@@ -60,7 +60,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -71,7 +71,7 @@ find -L . \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
-qmake
+qmake-qt5
make
make install INSTALL_ROOT=$PKG/usr
@@ -88,7 +88,7 @@ mv $PKG/usr/share/man/* $PKG/usr/man/
rm -rf $PKG/usr/share/
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS CHANGELOG* LICENSE INSTALL.md README.md VERSION $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CHANGELOG* LICENSE README.md VERSION $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/misc/wkhtmltopdf/wkhtmltopdf.info b/misc/wkhtmltopdf/wkhtmltopdf.info
index 808b588bf71da..1fc1a55137051 100644
--- a/misc/wkhtmltopdf/wkhtmltopdf.info
+++ b/misc/wkhtmltopdf/wkhtmltopdf.info
@@ -1,8 +1,8 @@
PRGNAM="wkhtmltopdf"
-VERSION="0.12.3.2"
+VERSION="0.12.6"
HOMEPAGE="https://wkhtmltopdf.org/"
-DOWNLOAD="https://github.com/wkhtmltopdf/wkhtmltopdf/archive/0.12.3.2.tar.gz"
-MD5SUM="8b443f1c541f3f95651f6e766b3f39a6"
+DOWNLOAD="https://github.com/wkhtmltopdf/wkhtmltopdf/archive/0.12.6/wkhtmltopdf-0.12.6.tar.gz"
+MD5SUM="170ce433d1ea62128ca4713b995f8cba"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""