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

[Alexander Rødseth]

    Date: Saturday, November 26, 2016 @ 23:12:42
  Author: arodseth
Revision: 196979

upgpkg: netsurf 3.6-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-26 21:58:10 UTC (rev 196978)
+++ PKGBUILD	2016-11-26 23:12:42 UTC (rev 196979)
@@ -16,18 +16,17 @@
          'libdom>=0.3.1' 'libnsutils>=0.0.3' 'libutf8proc>=1.3.1'
          'gtk3' 'duktape')
 makedepends=('re2c' 'netsurf-buildsystem' 'perl-html-parser' 'nsgenbind>=0.3'
-             'inetutils' 'libutf8proc>1.3.1-2' 'git' 'setconf' 'check' 'gtk3'
+             'inetutils' 'libutf8proc>1.3.1' 'git' 'setconf' 'check' 'gtk3'
              'duktape')
 source=("git://git.netsurf-browser.org/netsurf.git#tag=release/$pkgver"
         netsurf.sh)
 sha256sums=('SKIP'
-            '70310682d1612457d7bb3096549110b6ec127f50e97853259fada6be0c52924b')
+            'f2e2f61f1864da57cafa74ffdbefac2f9e1d55d9627e82ef923d4931684c5c49')
 
 prepare() {
   cd "$pkgname"
 
-  sed 's:_BSD_SOURCE:_DEFAULT_SOURCE:' -i gtk/Makefile.target
-  sed 's:netsurf-gtk:netsurf:' -i gtk/res/netsurf-gtk.desktop
+  sed 's:netsurf-gtk:netsurf:' -i frontends/gtk/res/netsurf-gtk.desktop
   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
@@ -51,14 +50,13 @@
   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"
+  # Script
   install -Dm755 "../$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
 
   # Desktop shortcut
-  install -Dm644 "gtk/res/$pkgname.xpm" \
+  install -Dm644 "frontends/gtk/res/$pkgname.xpm" \
     "$pkgdir/usr/share/pixmaps/$pkgname.xpm"
-  install -Dm644 "gtk/res/$pkgname-gtk.desktop" \
+  install -Dm644 "frontends/gtk/res/$pkgname-gtk.desktop" \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
 
   # License
@@ -66,8 +64,8 @@
     "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 
   # Fix path
-  mv "$pkgdir/usr/share/netsurf/:./gtk/res/"* "$pkgdir/usr/share/netsurf/"
-  rmdir "$pkgdir/usr/share/netsurf/"{:./gtk/res,:./gtk,:.}
+  #mv "$pkgdir/usr/share/netsurf/:./gtk/res/"* "$pkgdir/usr/share/netsurf/"
+  #rmdir "$pkgdir/usr/share/netsurf/"{:./gtk/res,:./gtk,:.}
 }
 
 # vim:set ts=2 sw=2 et:

Modified: netsurf.sh
===================================================================
--- netsurf.sh	2016-11-26 21:58:10 UTC (rev 196978)
+++ netsurf.sh	2016-11-26 23:12:42 UTC (rev 196979)
@@ -1,7 +1,7 @@
 #!/bin/sh
 shortname=`echo $LANG | cut -b1-2`
 if [[ -d /usr/share/netsurf/$shortname ]]; then
-  /usr/bin/netsurf.elf "$@"
+  /usr/bin/netsurf-gtk3 "$@"
 else
-  LANG=en /usr/bin/netsurf.elf "$@"
+  LANG=en /usr/bin/netsurf-gtk3 "$@"
 fi