From: Paul Bredbury <brebs@sent.com>
To: alpine-aports@lists.alpinelinux.org
Cc: Paul Bredbury <brebs@sent.com>
Subject: [alpine-aports] [PATCH] community/midori: upgrade to 8.0
Date: Mon,  4 Mar 2019 00:09:36 +0000
Message-Id: <20190304000936.4446-1-brebs@sent.com>
Precedence: list
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Add libarchive-dev and json-glib-dev as build requirements.

Remove obsolete cmake options.
---
 community/midori/APKBUILD | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/community/midori/APKBUILD b/community/midori/APKBUILD
index 9eb29ed80d..7b34f3047a 100644
--- a/community/midori/APKBUILD
+++ b/community/midori/APKBUILD
@@ -1,43 +1,39 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=midori
-pkgver=6.0
+pkgver=8.0
 pkgrel=0
 pkgdesc="A lightweight web browser based on Gtk WebKit"
-url="http://www.midori-browser.org"
+url="https://www.midori-browser.org"
 arch="all"
 license="LGPL-2.0-or-later"
 depends=
 makedepends="cmake librsvg-dev paxmark python2 vala gtk+3.0-dev gcr-dev
-	libunique-dev webkit2gtk-dev libpeas-dev"
+	libarchive-dev libunique-dev json-glib-dev webkit2gtk-dev libpeas-dev"
 subpackages="$pkgname-lang $pkgname-doc"
 install=""
 options="!check" # unable to check
-source="https://github.com/midori-browser/core/releases/download/v${pkgver%.0}/midori-v$pkgver.tar.gz
-	"
-builddir="${srcdir}/${pkgname}-${pkgver}"
+source="https://github.com/midori-browser/core/releases/download/v$pkgver/midori-v$pkgver.tar.gz"
+builddir="${srcdir}/${pkgname}-v${pkgver}/build"
 
-unpack() {
-	mkdir -p "$builddir"
-	tar -zxf "${srcdir}/midori-v$pkgver.tar.gz" -C "$builddir"
+prepare() {
+	default_prepare
+	mkdir "$builddir"
 }
 
 build() {
-	mkdir "$builddir"/build
-	cd "$builddir"/build
+	cd "$builddir"
 	cmake \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
-		-DUSE_GTK3=ON \
-		-DHALF_BRO_INCOM_WEBKIT2=ON \
-		-DUSE_ZEITGEIST=OFF \
+		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
 		..
 	make
 }
 
 package() {
-	cd "$builddir"/build
+	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="2b3e4808b1297a3ef8436b45ac38782e070658a0ecc62bcf8d0b2cf49f256cdad799ccc5d28df11ff595c042e8474fa2e87065d9a89cdb5a936237c44fdfd9e7  midori-v6.0.tar.gz"
+sha512sums="3a8cbca941637160a41f8a638e2153ddd5d8930a3d26df2031d90de40234743f5663c853ddf655673331b8a9ec07c65d8920768a4744fa5412bc2eddf2b8d81f  midori-v8.0.tar.gz"
-- 
2.21.0



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---