[arch-commits] Commit in zeal/repos (6 files)

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Wed Sep 6 08:15:31 UTC 2017


    Date: Wednesday, September 6, 2017 @ 08:15:30
  Author: bpiotrowski
Revision: 256026

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

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

--------------------------------------------------------------------------+
 /PKGBUILD                                                                |   70 ++++++++++
 community-i686/0001-Revert-doc-Add-Carbon-ad-to-the-welcome-page.patch   |   27 +++
 community-i686/PKGBUILD                                                  |   28 ----
 community-x86_64/0001-Revert-doc-Add-Carbon-ad-to-the-welcome-page.patch |   27 +++
 community-x86_64/PKGBUILD                                                |   28 ----
 5 files changed, 124 insertions(+), 56 deletions(-)

Copied: zeal/repos/community-i686/0001-Revert-doc-Add-Carbon-ad-to-the-welcome-page.patch (from rev 256025, zeal/trunk/0001-Revert-doc-Add-Carbon-ad-to-the-welcome-page.patch)
===================================================================
--- community-i686/0001-Revert-doc-Add-Carbon-ad-to-the-welcome-page.patch	                        (rev 0)
+++ community-i686/0001-Revert-doc-Add-Carbon-ad-to-the-welcome-page.patch	2017-09-06 08:15:30 UTC (rev 256026)
@@ -0,0 +1,27 @@
+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: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2017-09-06 08:15:19 UTC (rev 256025)
+++ community-i686/PKGBUILD	2017-09-06 08:15:30 UTC (rev 256026)
@@ -1,28 +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.3.1
-pkgrel=2
-pkgdesc='An offline API documentation browser'
-arch=('i686' 'x86_64')
-url='https://zealdocs.org/'
-license=('GPL3')
-depends=('qt5-webkit' 'hicolor-icon-theme' 'desktop-file-utils' 'libarchive'
-         'qt5-x11extras')
-source=("zeal-${pkgver}.tar.gz::https://github.com/zealdocs/zeal/archive/v${pkgver}.tar.gz")
-sha256sums=('55f8511977818612e00ae87a4fddaa346210189531469690f2e3961bb4c2c318')
-
-build() {
-  cd $pkgname-$pkgver
-  QT_SELECT=5 qmake CONFIG+=force_debug_info
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make INSTALL_ROOT="$pkgdir" install
-}

Copied: zeal/repos/community-i686/PKGBUILD (from rev 256025, zeal/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-09-06 08:15:30 UTC (rev 256026)
@@ -0,0 +1,35 @@
+# $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.4.0
+pkgrel=1
+pkgdesc='An offline API documentation browser'
+arch=('i686' 'x86_64')
+url='https://zealdocs.org/'
+license=(GPL3)
+depends=(qt5-webkit hicolor-icon-theme desktop-file-utils 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=('1f6b50026036923ae0cfbf3f4eb1066ee2fdaf0425d4c321203e0dd9506823fd'
+            '6b0a5642be3bd6b36f02973a0b28c15334803cf93ec70a5d18601852a974dac1')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i "$srcdir/0001-Revert-doc-Add-Carbon-ad-to-the-welcome-page.patch"
+}
+
+build() {
+  cd $pkgname-$pkgver
+  QT_SELECT=5 qmake CONFIG+=force_debug_info
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make INSTALL_ROOT="$pkgdir" install
+}

Copied: zeal/repos/community-x86_64/0001-Revert-doc-Add-Carbon-ad-to-the-welcome-page.patch (from rev 256025, zeal/trunk/0001-Revert-doc-Add-Carbon-ad-to-the-welcome-page.patch)
===================================================================
--- community-x86_64/0001-Revert-doc-Add-Carbon-ad-to-the-welcome-page.patch	                        (rev 0)
+++ community-x86_64/0001-Revert-doc-Add-Carbon-ad-to-the-welcome-page.patch	2017-09-06 08:15:30 UTC (rev 256026)
@@ -0,0 +1,27 @@
+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: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2017-09-06 08:15:19 UTC (rev 256025)
+++ community-x86_64/PKGBUILD	2017-09-06 08:15:30 UTC (rev 256026)
@@ -1,28 +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.3.1
-pkgrel=2
-pkgdesc='An offline API documentation browser'
-arch=('i686' 'x86_64')
-url='https://zealdocs.org/'
-license=('GPL3')
-depends=('qt5-webkit' 'hicolor-icon-theme' 'desktop-file-utils' 'libarchive'
-         'qt5-x11extras')
-source=("zeal-${pkgver}.tar.gz::https://github.com/zealdocs/zeal/archive/v${pkgver}.tar.gz")
-sha256sums=('55f8511977818612e00ae87a4fddaa346210189531469690f2e3961bb4c2c318')
-
-build() {
-  cd $pkgname-$pkgver
-  QT_SELECT=5 qmake CONFIG+=force_debug_info
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make INSTALL_ROOT="$pkgdir" install
-}

Copied: zeal/repos/community-x86_64/PKGBUILD (from rev 256025, zeal/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-09-06 08:15:30 UTC (rev 256026)
@@ -0,0 +1,35 @@
+# $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.4.0
+pkgrel=1
+pkgdesc='An offline API documentation browser'
+arch=('i686' 'x86_64')
+url='https://zealdocs.org/'
+license=(GPL3)
+depends=(qt5-webkit hicolor-icon-theme desktop-file-utils 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=('1f6b50026036923ae0cfbf3f4eb1066ee2fdaf0425d4c321203e0dd9506823fd'
+            '6b0a5642be3bd6b36f02973a0b28c15334803cf93ec70a5d18601852a974dac1')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i "$srcdir/0001-Revert-doc-Add-Carbon-ad-to-the-welcome-page.patch"
+}
+
+build() {
+  cd $pkgname-$pkgver
+  QT_SELECT=5 qmake CONFIG+=force_debug_info
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make INSTALL_ROOT="$pkgdir" install
+}



More information about the arch-commits mailing list