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

[Alexander Rødseth]

    Date: Monday, July 29, 2019 @ 11:12:30
  Author: arodseth
Revision: 494627

upgpkg: netsurf 3.9-2

better launch script

Modified:
  netsurf/trunk/PKGBUILD
  netsurf/trunk/netsurf.sh

------------+
 PKGBUILD   |   10 ++++++----
 netsurf.sh |    9 +++------
 2 files changed, 9 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-29 11:12:22 UTC (rev 494626)
+++ PKGBUILD	2019-07-29 11:12:30 UTC (rev 494627)
@@ -5,19 +5,20 @@
 
 pkgname=netsurf
 pkgver=3.9
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight and fast web browser'
-arch=('x86_64')
+arch=(x86_64)
 url='https://www.netsurf-browser.org/'
 license=(MIT GPL2)
 depends=(curl gtk3 'libhubbub=0.3.6' libjpeg-turbo 'libnsutils=0.0.5-4'
          'libutf8proc>=2.4.0' 'libwapcaplet>=0.4.2' 'libdom>=0.4.0')
+# vim is needed only for xxd when building
 makedepends=(check inetutils 'libcss>=0.9.0' 'libnsbmp>=0.1.5'
              'libnsgif>=0.2.1' 'nsgenbind>=0.7' perl-html-parser setconf vim)
 source=("https://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-$pkgver.tar.gz"
         netsurf.sh)
 sha256sums=('11e384eaf47e65c186da5001f1055a02f2d72ff17b50f403b8392546a2cf65ff'
-            '1f1b495af685e611fe4d121c6d48ed63d6dfe0c69bd5637c41cd71b42429fa85')
+            '34c1f41c02ff3791a1b734197d99ec7f58c403dee05f0f9b7b9b3509d32b51ac')
 
 prepare() {
   cd "$pkgname-all-$pkgver/$pkgname"
@@ -39,7 +40,8 @@
 }
 
 build() {
-  CFLAGS="$CFLAGS -w -Os -funroll-loops" make -C "$pkgname-all-$pkgver/$pkgname" \
+  CFLAGS="$CFLAGS -w -Os -funroll-loops" make \
+    -C "$pkgname-all-$pkgver/$pkgname" \
     NETSURF_GTK_MAJOR=3 \
     TARGET=gtk \
     LIBDIR=lib \

Modified: netsurf.sh
===================================================================
--- netsurf.sh	2019-07-29 11:12:22 UTC (rev 494626)
+++ netsurf.sh	2019-07-29 11:12:30 UTC (rev 494627)
@@ -1,7 +1,4 @@
-#!/bin/sh
-shortlang=`echo $LANG | cut -b1-2`
-if [ ! -d "/usr/share/netsurf/$shortlang" ]; then
-  # Use /usr/share/netsurf/en
-  export LANG=en_US.UTF-8
-fi
+#!/bin/bash
+# Use English if a directory for the current language does not exist
+test -d "/usr/share/netsurf/${LANG:0:2}" || export LANG=en_US.UTF-8
 /usr/bin/netsurf-gtk3 "$@"