Date: Tuesday, February 20, 2018 @ 19:09:55 Author: bpiotrowski Revision: 296583
1:0.6.0-1: new upstream relase Modified: zeal/trunk/PKGBUILD Deleted: zeal/trunk/0001-Revert-doc-Add-Carbon-ad-to-the-welcome-page.patch ---------------------------------------------------------+ 0001-Revert-doc-Add-Carbon-ad-to-the-welcome-page.patch | 27 -------------- PKGBUILD | 26 +++++++------ 2 files changed, 14 insertions(+), 39 deletions(-) Deleted: 0001-Revert-doc-Add-Carbon-ad-to-the-welcome-page.patch =================================================================== --- 0001-Revert-doc-Add-Carbon-ad-to-the-welcome-page.patch 2018-02-20 19:09:45 UTC (rev 296582) +++ 0001-Revert-doc-Add-Carbon-ad-to-the-welcome-page.patch 2018-02-20 19:09:55 UTC (rev 296583) @@ -1,27 +0,0 @@ -From 19a1554726d1e8589f99af2b1e90c6e116eef632 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <[email protected]> -Date: Wed, 6 Sep 2017 10:10:06 +0200 -Subject: [PATCH] Revert "doc: Add Carbon ad to the welcome page" - -This reverts commit a90fef36dfa970427bf879b998897e95cafeeff1. ---- - src/app/resources/browser/welcome.html | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/app/resources/browser/welcome.html b/src/app/resources/browser/welcome.html -index afe9e2a..490a0fb 100644 ---- a/src/app/resources/browser/welcome.html -+++ b/src/app/resources/browser/welcome.html -@@ -34,9 +34,6 @@ - <div class="hero-foot"> - <div class="container"> - <div class="content has-text-centered"> -- <div id="carbon" class="box"> -- <script async type="text/javascript" src="https://cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=zealdocsforwindowsorg"; id="_carbonads_js"></script> -- </div> - <p> - <a class="icon" href="https://github.com/zealdocs/zeal";> - <i class="fa fa-github"></i> --- -2.14.1 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-02-20 19:09:45 UTC (rev 296582) +++ PKGBUILD 2018-02-20 19:09:55 UTC (rev 296583) @@ -5,7 +5,7 @@ pkgname=zeal epoch=1 -pkgver=0.5.0 +pkgver=0.6.0 pkgrel=1 pkgdesc='An offline API documentation browser' arch=('x86_64') @@ -12,23 +12,25 @@ url='https://zealdocs.org/' license=(GPL3) depends=(qt5-webkit hicolor-icon-theme libarchive qt5-x11extras) -source=(zeal-${pkgver}.tar.gz::https://github.com/zealdocs/zeal/archive/v${pkgver}.tar.gz - 0001-Revert-doc-Add-Carbon-ad-to-the-welcome-page.patch) -sha256sums=('3efb7b1b5d9a05f0fc60a6686571f7a4b58fa6f6d66f1baf608e83b10fb1290c' - '6b0a5642be3bd6b36f02973a0b28c15334803cf93ec70a5d18601852a974dac1') +makedepends=(cmake ninja extra-cmake-modules) +source=(zeal-${pkgver}.tar.gz::https://github.com/zealdocs/zeal/archive/v${pkgver}.tar.gz) +sha256sums=('ef307d3ad4f03c76fa5fc249f8e7e04de879aa7574bec1ff8be548dbc2c02973') prepare() { - cd $pkgname-$pkgver - # patch -p1 -i "$srcdir/0001-Revert-doc-Add-Carbon-ad-to-the-welcome-page.patch" + mkdir -p build } build() { - cd $pkgname-$pkgver - qmake-qt5 CONFIG+=force_debug_info - make + cd build + + cmake -G Ninja \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + "$srcdir/$pkgname-$pkgver" + + ninja } package() { - cd $pkgname-$pkgver - make INSTALL_ROOT="$pkgdir" install + DESTDIR="$pkgdir" ninja -C build install }
