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

[Alad Wenter]

    Date: Friday, March 15, 2019 @ 00:08:34
  Author: alad
Revision: 441802

archrelease: copy trunk to community-x86_64

Added:
  edbrowse/repos/community-x86_64/PKGBUILD
    (from rev 441801, edbrowse/trunk/PKGBUILD)
Deleted:
  edbrowse/repos/community-x86_64/PKGBUILD
  edbrowse/repos/community-x86_64/curl-7.62.patch

-----------------+
 PKGBUILD        |   81 +++++++++++++++++++++++++++---------------------------
 curl-7.62.patch |   26 -----------------
 2 files changed, 41 insertions(+), 66 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-15 00:08:00 UTC (rev 441801)
+++ PKGBUILD	2019-03-15 00:08:34 UTC (rev 441802)
@@ -1,40 +0,0 @@
-# Maintainer: Alad Wenter <alad (at) mailbox.org>
-# Contributor: Chris Brannon <cmbrannon (at) cox.net>
-# Contributor: joyfulgirl <joyfulgirl (at) archlinux.us>
-# Contributor: Chuck Boucher <jofywyxaxukyvofa (at) tempomail.fr>
-# Contributor: aksr <aksr at t-com dot me>
-
-pkgname=edbrowse
-pkgver=3.7.4
-pkgrel=1
-pkgdesc='Line-oriented editor, browser and mail client'
-arch=('x86_64')
-url="http://edbrowse.org/"
-license=('GPL' 'MPL')
-depends=('duktape' 'tidy' 'curl' 'pcre')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/CMB/edbrowse/archive/v$pkgver.tar.gz")
-source=("$pkgname-$pkgver.tar.gz::https://github.com/CMB/edbrowse/archive/v$pkgver.tar.gz"
-        curl-7.62.patch)
-sha256sums=('ae7717c4c30297a01185ae2705fd55a7cd5f5484db05d5dfc02b7932b5766498'
-            'b4eff80c296d5d1531255f3b0b9337efee06e070c4c7d92569517d853805bae7')
-
-prepare() {
-    cd "$pkgname-$pkgver"
-    patch -Np1 -i ../curl-7.62.patch
-}
-
-build() {
-    cd "$pkgname-$pkgver"
-    make CFLAGS="-I/usr/include/tidy" all
-}
-
-package() {
-    cd "$pkgname-$pkgver"
-    make -C src DESTDIR="$pkgdir" prefix=/usr install
-
-    install -Dm644 README CHANGES -t "$pkgdir/usr/share/doc/$pkgname/README"
-    install -Dm644 COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
-    install -Dm644 doc/usersguide.html doc/sample.ebrc -t "$pkgdir/usr/share/doc/edbrowse"
-    install -Dm644 doc/man-edbrowse-debian.1 -T "$pkgdir/usr/share/man/man1/edbrowse.1"
-}
-

Copied: edbrowse/repos/community-x86_64/PKGBUILD (from rev 441801, edbrowse/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-03-15 00:08:34 UTC (rev 441802)
@@ -0,0 +1,41 @@
+# Maintainer: Alad Wenter <alad (at) mailbox.org>
+# Contributor: Chris Brannon <cmbrannon (at) cox.net>
+# Contributor: joyfulgirl <joyfulgirl (at) archlinux.us>
+# Contributor: Chuck Boucher <jofywyxaxukyvofa (at) tempomail.fr>
+# Contributor: aksr <aksr at t-com dot me>
+
+pkgname=edbrowse
+pkgver=3.7.4
+pkgrel=2
+_commit=7e1be6c69fd336561c89c94a549d7cd454470dee # 3.7.4
+pkgdesc='Line-oriented editor, browser and mail client'
+arch=('x86_64')
+url='http://edbrowse.org'
+license=('GPL' 'MPL')
+depends=('duktape' 'tidy' 'curl' 'pcre')
+makedepends=('git')
+source=("$pkgname-$pkgver::git+https://github.com/CMB/edbrowse#commit=$_commit")
+sha256sums=('SKIP')
+
+prepare() {
+    cd "$pkgname-$pkgver"
+
+    # Fix build with curl 7.62.0
+    git cherry-pick -n 5d2b9e21fdf019f461ebe62738d615428d5db963
+}
+
+build() {
+    cd "$pkgname-$pkgver"
+    make CFLAGS="-I/usr/include/tidy" all
+}
+
+package() {
+    cd "$pkgname-$pkgver"
+    make -C src DESTDIR="$pkgdir" prefix=/usr install
+
+    install -Dm644 README CHANGES -t "$pkgdir/usr/share/doc/$pkgname/README"
+    install -Dm644 COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
+    install -Dm644 doc/usersguide.html doc/sample.ebrc -t "$pkgdir/usr/share/doc/edbrowse"
+    install -Dm644 doc/man-edbrowse-debian.1 -T "$pkgdir/usr/share/man/man1/edbrowse.1"
+}
+

Deleted: curl-7.62.patch
===================================================================
--- curl-7.62.patch	2019-03-15 00:08:00 UTC (rev 441801)
+++ curl-7.62.patch	2019-03-15 00:08:34 UTC (rev 441802)
@@ -1,26 +0,0 @@
-From 5d2b9e21fdf019f461ebe62738d615428d5db963 Mon Sep 17 00:00:00 2001
-From: Po-Chuan Hsieh <sunpoet at sunpoet.net>
-Date: Sat, 3 Nov 2018 18:11:14 +0800
-Subject: [PATCH] Fix build with curl 7.62.0
-
-from CHANGES:
-ssl: deprecate CURLE_SSL_CACERT in favour of a unified error code
-Long live CURLE_PEER_FAILED_VERIFICATION
----
- src/http.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/http.c b/src/http.c
-index 56eebab..ccafc8f 100644
---- a/src/http.c
-+++ b/src/http.c
-@@ -1557,7 +1557,9 @@ void ebcurl_setError(CURLcode curlret, const char *url, int action,
- 		break;
- 
- 	case CURLE_PEER_FAILED_VERIFICATION:
-+#if LIBCURL_VERSION_NUM < 0x073e00
- 	case CURLE_SSL_CACERT:
-+#endif
- 		(*fn) (MSG_NoCertify, host);
- 		break;
-