diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-09-05 11:22:54 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-09-05 11:22:54 +0200 |
| commit | c779a391ea8cd73134e63d1cd0538ead2d223e03 (patch) | |
| tree | 9e6db938c527a54eda89f501179348198f6f0341 /testing | |
| parent | ca92aa9d05c23c8d7a2fda9d16e9466bb2a42502 (diff) | |
| download | aports-c779a391ea8cd73134e63d1cd0538ead2d223e03.tar.bz2 aports-c779a391ea8cd73134e63d1cd0538ead2d223e03.tar.xz | |
testing/wkhtmltopdf: upgrade to 0.12.2.4
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/wkhtmltopdf/APKBUILD | 18 | ||||
| -rw-r--r-- | testing/wkhtmltopdf/qprint.patch | 26 |
2 files changed, 7 insertions, 37 deletions
diff --git a/testing/wkhtmltopdf/APKBUILD b/testing/wkhtmltopdf/APKBUILD index 431baa52c7..f6b8cb84d9 100644 --- a/testing/wkhtmltopdf/APKBUILD +++ b/testing/wkhtmltopdf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wkhtmltopdf -pkgver=0.12.1 +pkgver=0.12.2.4 pkgrel=0 pkgdesc="Simple shell utility to convert html to pdf" url="http://wkhtmltopdf.org/" @@ -12,10 +12,9 @@ makedepends="$depends_dev qt5-qtbase-dev qt5-qtwebkit-dev qt5-qtsvg-dev qt5-qtxmlpatterns-dev" install="" subpackages="$pkgname-dev $pkgname-doc" -source="http://downloads.sourceforge.net/project/wkhtmltopdf/$pkgver/wkhtmltox-$pkgver.tar.bz2 - qprint.patch" +source="$pkgname-$pkgver.tar.gz::https://github.com/wkhtmltopdf/wkhtmltopdf/archive/$pkgver.tar.gz" -_builddir="$srcdir"/wkhtmltox-$pkgver +_builddir="$srcdir"/wkhtmltopdf-$pkgver prepare() { local i cd "$_builddir" @@ -28,7 +27,7 @@ prepare() { build() { cd "$_builddir" - qmake -makefile && make || return 1 + qmake-qt5 -makefile && make || return 1 } package() { @@ -36,9 +35,6 @@ package() { make install INSTALL_ROOT="$pkgdir"/usr || return 1 } -md5sums="6960f2e45469de41314f1a688b1fdaf0 wkhtmltox-0.12.1.tar.bz2 -b39477573f9fb162f4dfcf4f7db5b07b qprint.patch" -sha256sums="383041db30d6e08b9a6f126193a9e120e2791ff99005c39b1d0adacd53e2faca wkhtmltox-0.12.1.tar.bz2 -dfe8b8e212c7888b1a7c2d9724c2a6839592b2909953d9c5c155da25bef2fc0f qprint.patch" -sha512sums="b9fd1a3bba4daeb5cd30ad4e31cafa206a935a0bd9cf3666beebe5685acbe4b6c7a34ca7282b4d49ee607ca7153afabb4d5e3005572e64688e90bef750fe8e71 wkhtmltox-0.12.1.tar.bz2 -0358742f9e7b8d5030e7ed8dc6bcfcb73a570ae4824d48e5e961b707e48617ce6c0417072008abb8d68e56b9fd6f5a271417df5d904bde00f41a36321148be3f qprint.patch" +md5sums="c8555f1c66b61cb11c6c9ff37d0d2280 wkhtmltopdf-0.12.2.4.tar.gz" +sha256sums="dbb0166e9ce191e787e909601e4cdbae71069f29693362edf5cd7d4d44447288 wkhtmltopdf-0.12.2.4.tar.gz" +sha512sums="9d1854d9bbda57d099e1d9db87255db5f20828c2ba6828f40a1f206118bf668b22b2a2394bd4d8a836c3f65c130767c1e4b639946757ec6370320373a6933dca wkhtmltopdf-0.12.2.4.tar.gz" diff --git a/testing/wkhtmltopdf/qprint.patch b/testing/wkhtmltopdf/qprint.patch deleted file mode 100644 index cb3b5ffd77..0000000000 --- a/testing/wkhtmltopdf/qprint.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b42a07d9825aa4241e2ea77edda8ac049e67bab4 Mon Sep 17 00:00:00 2001 -From: Ashish Kulkarni <kulkarni.ashish@gmail.com> -Date: Mon, 20 Oct 2014 11:38:23 +0530 -Subject: [PATCH] fix build failure with unpatched Qt >= 5.3 - -This was originally reported as https://bugs.debian.org/763216 ---- - common.pri | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/common.pri b/common.pri -index d11e707..ef78ecb 100644 ---- a/common.pri -+++ b/common.pri -@@ -43,7 +43,10 @@ win32: CONFIG += console - win32-g++*: QMAKE_LFLAGS += -static -static-libgcc -static-libstdc++ - - QT += webkit network xmlpatterns svg --greaterThan(QT_MAJOR_VERSION, 4): QT += webkitwidgets -+greaterThan(QT_MAJOR_VERSION, 4) { -+ QT += webkitwidgets -+ greaterThan(QT_MINOR_VERSION, 2): QT += printsupport -+} - - # version related information - VERSION_TEXT=$$(WKHTMLTOX_VERSION) |