[arch-commits] Commit in zeal/repos/community-x86_64 (3 files)

[Bartłomiej Piotrowski]

    Date: Tuesday, February 20, 2018 @ 19:10:12
  Author: bpiotrowski
Revision: 296584

archrelease: copy trunk to community-x86_64

Added:
  zeal/repos/community-x86_64/PKGBUILD
    (from rev 296583, zeal/trunk/PKGBUILD)
Deleted:
  zeal/repos/community-x86_64/0001-Revert-doc-Add-Carbon-ad-to-the-welcome-page.patch
  zeal/repos/community-x86_64/PKGBUILD

---------------------------------------------------------+
 0001-Revert-doc-Add-Carbon-ad-to-the-welcome-page.patch |   27 -----
 PKGBUILD                                                |   70 +++++++-------
 2 files changed, 36 insertions(+), 61 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:55 UTC (rev 296583)
+++ 0001-Revert-doc-Add-Carbon-ad-to-the-welcome-page.patch	2018-02-20 19:10:12 UTC (rev 296584)
@@ -1,27 +0,0 @@
-From 19a1554726d1e8589f99af2b1e90c6e116eef632 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <bpiotrowski at archlinux.org>
-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
-

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-20 19:09:55 UTC (rev 296583)
+++ PKGBUILD	2018-02-20 19:10:12 UTC (rev 296584)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Oleg Shparber <trollixx+aur at gmail.com>
-# Contributor: Thomas Weißschuh <thomas t-8ch de>
-
-pkgname=zeal
-epoch=1
-pkgver=0.5.0
-pkgrel=1
-pkgdesc='An offline API documentation browser'
-arch=('x86_64')
-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')
-
-prepare() {
-  cd $pkgname-$pkgver
-  # patch -p1 -i "$srcdir/0001-Revert-doc-Add-Carbon-ad-to-the-welcome-page.patch"
-}
-
-build() {
-  cd $pkgname-$pkgver
-  qmake-qt5 CONFIG+=force_debug_info
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make INSTALL_ROOT="$pkgdir" install
-}

Copied: zeal/repos/community-x86_64/PKGBUILD (from rev 296583, zeal/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-02-20 19:10:12 UTC (rev 296584)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Oleg Shparber <trollixx+aur at gmail.com>
+# Contributor: Thomas Weißschuh <thomas t-8ch de>
+
+pkgname=zeal
+epoch=1
+pkgver=0.6.0
+pkgrel=1
+pkgdesc='An offline API documentation browser'
+arch=('x86_64')
+url='https://zealdocs.org/'
+license=(GPL3)
+depends=(qt5-webkit hicolor-icon-theme libarchive qt5-x11extras)
+makedepends=(cmake ninja extra-cmake-modules)
+source=(zeal-${pkgver}.tar.gz::https://github.com/zealdocs/zeal/archive/v${pkgver}.tar.gz)
+sha256sums=('ef307d3ad4f03c76fa5fc249f8e7e04de879aa7574bec1ff8be548dbc2c02973')
+
+prepare() {
+  mkdir -p build
+}
+
+build() {
+  cd build
+
+  cmake -G Ninja \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    "$srcdir/$pkgname-$pkgver"
+
+  ninja
+}
+
+package() {
+  DESTDIR="$pkgdir" ninja -C build install
+}