[arch-commits] Commit in wkhtmltopdf/repos (4 files)

Evangelos Foutras foutrelis at archlinux.org
Thu Apr 20 23:01:22 UTC 2017


    Date: Thursday, April 20, 2017 @ 23:01:21
  Author: foutrelis
Revision: 224031

archrelease: copy trunk to community-i686, community-x86_64

Added:
  wkhtmltopdf/repos/community-i686/PKGBUILD
    (from rev 224030, wkhtmltopdf/trunk/PKGBUILD)
  wkhtmltopdf/repos/community-x86_64/PKGBUILD
    (from rev 224030, wkhtmltopdf/trunk/PKGBUILD)
Deleted:
  wkhtmltopdf/repos/community-i686/PKGBUILD
  wkhtmltopdf/repos/community-x86_64/PKGBUILD

---------------------------+
 /PKGBUILD                 |   86 ++++++++++++++++++++++++++++++++++++++++++++
 community-i686/PKGBUILD   |   35 -----------------
 community-x86_64/PKGBUILD |   35 -----------------
 3 files changed, 86 insertions(+), 70 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2017-04-20 23:01:09 UTC (rev 224030)
+++ community-i686/PKGBUILD	2017-04-20 23:01:21 UTC (rev 224031)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-
-pkgname=wkhtmltopdf
-pkgver=0.12.3
-pkgrel=2
-pkgdesc="Command line tools to render HTML into PDF and various image formats"
-arch=('i686' 'x86_64')
-url="http://wkhtmltopdf.org/"
-license=('LGPL3')
-depends=('qt5-webkit' 'qt5-svg')
-optdepends=('xorg-server: wkhtmltopdf needs X or Xvfb to operate')
-source=($pkgname-$pkgver.tar.gz::https://github.com/wkhtmltopdf/wkhtmltopdf/archive/$pkgver.tar.gz)
-sha256sums=('0d55ad5d0582a8a62f3f108c41be071c9762ee970bdc6ed47a22067350e9d2ed')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  qmake-qt5 wkhtmltopdf.pro
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make INSTALL_ROOT="$pkgdir/usr" install
-
-  # Generate and install man page
-  install -d "$pkgdir/usr/share/man/man1"
-  LD_LIBRARY_PATH=bin ./bin/wkhtmltopdf --manpage \
-    >"$pkgdir/usr/share/man/man1/wkhtmltopdf.1"
-  LD_LIBRARY_PATH=bin ./bin/wkhtmltoimage --manpage \
-    >"$pkgdir/usr/share/man/man1/wkhtmltoimage.1"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: wkhtmltopdf/repos/community-i686/PKGBUILD (from rev 224030, wkhtmltopdf/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-04-20 23:01:21 UTC (rev 224031)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+
+pkgname=wkhtmltopdf
+pkgver=0.12.4
+pkgrel=1
+pkgdesc="Command line tools to render HTML into PDF and various image formats"
+arch=('i686' 'x86_64')
+url="https://wkhtmltopdf.org/"
+license=('LGPL3')
+depends=('qt5-webkit' 'qt5-svg')
+makedepends=('git')
+optdepends=('xorg-server: wkhtmltopdf needs X or Xvfb to operate')
+source=("git+https://github.com/wkhtmltopdf/wkhtmltopdf.git#tag=$pkgver")
+sha256sums=('SKIP')
+
+prepare() {
+  cd $pkgname
+
+  # fix build without patched Qt
+  git cherry-pick -n af95531eabb212ae16a9fb689bb25a767eb580bc
+}
+
+build() {
+  cd $pkgname
+
+  qmake-qt5 wkhtmltopdf.pro
+  make
+}
+
+package() {
+  cd $pkgname
+  make INSTALL_ROOT="$pkgdir/usr" install
+
+  # Generate and install man page
+  install -d "$pkgdir/usr/share/man/man1"
+  LD_LIBRARY_PATH=bin ./bin/wkhtmltopdf --manpage \
+    >"$pkgdir/usr/share/man/man1/wkhtmltopdf.1"
+  LD_LIBRARY_PATH=bin ./bin/wkhtmltoimage --manpage \
+    >"$pkgdir/usr/share/man/man1/wkhtmltoimage.1"
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2017-04-20 23:01:09 UTC (rev 224030)
+++ community-x86_64/PKGBUILD	2017-04-20 23:01:21 UTC (rev 224031)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-
-pkgname=wkhtmltopdf
-pkgver=0.12.3
-pkgrel=2
-pkgdesc="Command line tools to render HTML into PDF and various image formats"
-arch=('i686' 'x86_64')
-url="http://wkhtmltopdf.org/"
-license=('LGPL3')
-depends=('qt5-webkit' 'qt5-svg')
-optdepends=('xorg-server: wkhtmltopdf needs X or Xvfb to operate')
-source=($pkgname-$pkgver.tar.gz::https://github.com/wkhtmltopdf/wkhtmltopdf/archive/$pkgver.tar.gz)
-sha256sums=('0d55ad5d0582a8a62f3f108c41be071c9762ee970bdc6ed47a22067350e9d2ed')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  qmake-qt5 wkhtmltopdf.pro
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make INSTALL_ROOT="$pkgdir/usr" install
-
-  # Generate and install man page
-  install -d "$pkgdir/usr/share/man/man1"
-  LD_LIBRARY_PATH=bin ./bin/wkhtmltopdf --manpage \
-    >"$pkgdir/usr/share/man/man1/wkhtmltopdf.1"
-  LD_LIBRARY_PATH=bin ./bin/wkhtmltoimage --manpage \
-    >"$pkgdir/usr/share/man/man1/wkhtmltoimage.1"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: wkhtmltopdf/repos/community-x86_64/PKGBUILD (from rev 224030, wkhtmltopdf/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-04-20 23:01:21 UTC (rev 224031)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+
+pkgname=wkhtmltopdf
+pkgver=0.12.4
+pkgrel=1
+pkgdesc="Command line tools to render HTML into PDF and various image formats"
+arch=('i686' 'x86_64')
+url="https://wkhtmltopdf.org/"
+license=('LGPL3')
+depends=('qt5-webkit' 'qt5-svg')
+makedepends=('git')
+optdepends=('xorg-server: wkhtmltopdf needs X or Xvfb to operate')
+source=("git+https://github.com/wkhtmltopdf/wkhtmltopdf.git#tag=$pkgver")
+sha256sums=('SKIP')
+
+prepare() {
+  cd $pkgname
+
+  # fix build without patched Qt
+  git cherry-pick -n af95531eabb212ae16a9fb689bb25a767eb580bc
+}
+
+build() {
+  cd $pkgname
+
+  qmake-qt5 wkhtmltopdf.pro
+  make
+}
+
+package() {
+  cd $pkgname
+  make INSTALL_ROOT="$pkgdir/usr" install
+
+  # Generate and install man page
+  install -d "$pkgdir/usr/share/man/man1"
+  LD_LIBRARY_PATH=bin ./bin/wkhtmltopdf --manpage \
+    >"$pkgdir/usr/share/man/man1/wkhtmltopdf.1"
+  LD_LIBRARY_PATH=bin ./bin/wkhtmltoimage --manpage \
+    >"$pkgdir/usr/share/man/man1/wkhtmltoimage.1"
+}
+
+# vim:set ts=2 sw=2 et:



More information about the arch-commits mailing list