netsurf-3.3-3.parabola1: disable WebP support

1 files changed, 11 insertions, 22 deletions

diff --git a/libre/netsurf/PKGBUILD b/libre/netsurf/PKGBUILD
index 97ba868d8..9b9a7d3b2 100644
--- a/libre/netsurf/PKGBUILD
+++ b/libre/netsurf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 154682 2015-12-28 20:58:40Z heftig $
+# $Id: PKGBUILD 160132 2016-02-03 21:51:59Z arodseth $
 # Maintainer (Arch): Alexander Rødseth <rodseth@gmail.com>
 # Contributor (Arch): Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor (Arch): Georgij Kondratjev <smpuj@bk.ru>
@@ -7,25 +7,24 @@
 
 pkgname=netsurf
 pkgver=3.3
-pkgrel=2.parabola1
+pkgrel=3.parabola1
 pkgdesc='Lightweight and fast web browser, without non-privacy search engines'
 arch=('x86_64' 'i686' 'armv7h')
 url='http://www.netsurf-browser.org/'
 license=('MIT' 'GPL2')
 replaces=(${pkgname}-libre)
 conflicts=(${pkgname}-libre)
-depends=('libmng' 'librsvg' 'libwebp' 'curl' 'lcms' 'desktop-file-utils' 'libnsbmp>=0.1.1' 'libnsgif>=0.1.1' 'libcss>=0.5.0' 'libdom>=0.1.2' 'gtk2' 'libutf8proc' 'libnsutils' 'libwebp') # gtk3
-makedepends=('re2c' 'netsurf-buildsystem' 'perl-html-parser' 'nsgenbind' 'inetutils' 'libwebp')
+depends=('libmng' 'librsvg' 'curl' 'lcms' 'desktop-file-utils' 'libnsbmp>=0.1.1' 'libnsgif>=0.1.1' 'libcss>=0.5.0' 'libdom>=0.1.2' 'gtk2' 'libnsutils' 'libutf8proc>1.3.1-2') # 'libwebp' 'gtk3'
+makedepends=('re2c' 'netsurf-buildsystem' 'perl-html-parser' 'nsgenbind' 'inetutils' 'libutf8proc>1.3.1-2' 'git') # 'libwebp'
 install="$pkgname.install"
-source=("http://download.$pkgname-browser.org/$pkgname/releases/source/$pkgname-$pkgver-src.tar.gz"
-        'netsurf-remove_webp.patch'
+#source=("git://git.netsurf-browser.org/netsurf.git#commit=3cc80"
+source=("git://git.netsurf-browser.org/netsurf.git#tag=release/$pkgver"
         'netsurf.sh')
-sha256sums=('23f92a0940f577b9605f2e54786fea3521680d32d6c00f2a3db1eae3f29e3686'
-            'f3729afed925f2762b4800c40065d352f70ac5a77c17df031f1943e3ee68c080'
+sha256sums=('SKIP'
             '70310682d1612457d7bb3096549110b6ec127f50e97853259fada6be0c52924b')
 
 prepare() {
-  cd "$pkgname-$pkgver"
+  cd "$pkgname"
 
   sed 's:_BSD_SOURCE:_DEFAULT_SOURCE:' -i gtk/Makefile.target
   sed 's:netsurf-gtk:netsurf:' -i gtk/res/netsurf-gtk.desktop
@@ -34,10 +33,6 @@ prepare() {
   sed 's:utf8proc_normalise:utf8proc_reencode:' -i utils/idna.c
   # There are several errors. Asking netsurf upstream to look at it.
 
-  if [ "$CARCH" == "armv7h" ]; then
-    patch -Np1 -i "$srcdir/netsurf-remove_webp.patch"
-  fi
-
   # remove non-privacy search engines
   sed -i '\|Google|d
           \|Yahoo|d
@@ -105,23 +100,17 @@ prepare() {
 }
 
 build() {
-  if [ "$CARCH" == "armv7h" ]; then
-    extra="NETSURF_USE_WEBP=NO"
-  else
-    extra="NETSURF_USE_WEBP=YES"
-  fi
-
-  make -C "$pkgname-$pkgver" \
+  make -C "$pkgname" \
     PREFIX=/usr \
     TARGET=gtk \
-    $extra \
+    NETSURF_USE_WEBP=NO \
     NETSURF_USE_VIDEO=NO \
     NETSURF_USE_JS=NO \
     NETSURF_USE_MOZJS=NO # Javascript is disabled, for now. See FS#41582
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd "$pkgname"
 
   make install PREFIX=/usr DESTDIR="$pkgdir"