[arch-commits] Commit in netsurf/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Saturday, February 20, 2016 @ 18:33:23
  Author: arodseth
Revision: 162862

upgpkg: netsurf 3.4-1

Modified:
  netsurf/trunk/PKGBUILD

----------+
 PKGBUILD |   25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-20 17:30:39 UTC (rev 162861)
+++ PKGBUILD	2016-02-20 17:33:23 UTC (rev 162862)
@@ -5,16 +5,16 @@
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=netsurf
-pkgver=3.3
-pkgrel=3
+pkgver=3.4
+pkgrel=1
 pkgdesc='Lightweight and fast web browser'
 arch=('x86_64' 'i686')
 url='http://www.netsurf-browser.org/'
 license=('MIT' 'GPL2')
-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'
+depends=('libmng' 'librsvg' 'curl' 'lcms' 'desktop-file-utils' 'libnsbmp>=0.1.3' 'libnsgif>=0.1.3' 'libcss>=0.6.0-2' 'libdom>=0.3.0' 'libnsutils>=0.0.2' 'libutf8proc>=1.3.1-3' 'gtk3') # 'duktape'
+makedepends=('re2c' 'netsurf-buildsystem' 'perl-html-parser' 'nsgenbind' 'inetutils' 'libutf8proc>1.3.1-2' 'git' 'setconf' 'check' 'gtk3') # 'duktape'
 install="$pkgname.install"
-#source=("git://git.netsurf-browser.org/netsurf.git#commit=3cc80"
+#source=("git://git.netsurf-browser.org/netsurf.git#commit=592ff0ef76199e4cc5089e7e76036ae259bcdcd2"
 source=("git://git.netsurf-browser.org/netsurf.git#tag=release/$pkgver"
         'netsurf.sh')
 sha256sums=('SKIP'
@@ -28,23 +28,20 @@
   sed 's:libutf8proc/::' -i utils/idna.c
   sed 's:UTF8PROC_CCC_VIRAMA:UTF8PROC_BIDI_CLASS_EN:' -i utils/idna.c
   sed 's:utf8proc_normalise:utf8proc_reencode:' -i utils/idna.c
-  # There are several errors. Asking netsurf upstream to look at it.
+  setconf Makefile.defaults NETSURF_UA_FORMAT_STRING '"NetSurf/%d.%d (%s; Arch Linux)"'
+  setconf Makefile.defaults NETSURF_USE_DUKTAPE NO
 }
 
 build() {
-  make -C "$pkgname" \
-    PREFIX=/usr \
-    TARGET=gtk \
-    NETSURF_USE_WEBP=NO \
-    NETSURF_USE_VIDEO=NO \
-    NETSURF_USE_JS=NO \
-    NETSURF_USE_MOZJS=NO # Javascript is disabled, for now. See FS#41582
+  make -C "$pkgname" LIBDIR=lib INCLUDEDIR=include PREFIX=/usr TARGET=gtk \
+    NETSURF_GTK_MAJOR=3
 }
 
 package() {
   cd "$pkgname"
 
-  make install PREFIX=/usr DESTDIR="$pkgdir"
+  make install LIBDIR=lib INCLUDEDIR=include PREFIX=/usr TARGET=gtk \
+    NETSURF_GTK_MAJOR=3 DESTDIR="$pkgdir"
 
   # Script and executable
   mv "$pkgdir/usr/bin/$pkgname" "$pkgdir/usr/bin/$pkgname.elf"