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

[Alexander Rødseth]

    Date: Tuesday, October 31, 2017 @ 11:41:42
  Author: arodseth
Revision: 264893

upgpkg: netsurf 3.7-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-31 11:36:24 UTC (rev 264892)
+++ PKGBUILD	2017-10-31 11:41:42 UTC (rev 264893)
@@ -20,17 +20,18 @@
 source=("http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-$pkgver.tar.gz"
         'netsurf.sh')
 sha256sums=('0b3e78f04728238e4867f2d6505522e777ebafcd0ed02e1e50860885e00a5879'
-            '989668adcdd87025edd8e16c52800a1932847131cc9aadbb78a4cd7a527aa116')
+            '7ec148aa113d6b3f0ac8051c476db8a1d8201b701b19caa5f87e1a91d8a9543f')
 
 prepare() {
   cd "$pkgname-all-$pkgver/$pkgname"
 
+  # Fix compilation issues
+  sed -i 's:libutf8proc/::;s:UTF8PROC_CCC_VIRAMA:UTF8PROC_BIDI_CLASS_EN:' \
+    utils/idna.c
+
   # Use "netsurf" as the name of the executable in /usr/bin
   setconf frontends/gtk/res/netsurf-gtk.desktop 'Exec=netsurf %u'
 
-  # Fix compilation issues
-  sed -i 's:libutf8proc/::;s:UTF8PROC_CCC_VIRAMA:UTF8PROC_BIDI_CLASS_EN:' utils/idna.c
-
   # Set build configuration in Makefile.defaults
   for opt in \
     NETSURF_UA_FORMAT_STRING='"NetSurf/%d.%d (%s; Arch Linux)"' \
@@ -41,7 +42,7 @@
 }
 
 build() {
-  make -C "$pkgname-all-$pkgver/$pkgname" \
+  CFLAGS="$CFLAGS -w" make -C "$pkgname-all-$pkgver/$pkgname" \
     NETSURF_GTK_MAJOR=3 \
     TARGET=gtk \
     LIBDIR=lib \

Modified: netsurf.sh
===================================================================
--- netsurf.sh	2017-10-31 11:36:24 UTC (rev 264892)
+++ netsurf.sh	2017-10-31 11:41:42 UTC (rev 264893)
@@ -1,6 +1,7 @@
 #!/bin/sh
-shortname=`echo $LANG | cut -b1-2`
-if [ ! -d "/usr/share/netsurf/$shortname" ]; then
-  export LANG=en
+local 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
 /usr/bin/netsurf-gtk3 "$@"