From 84e70a77043334578f31ed1a9a92ac097a2a5246 Mon Sep 17 00:00:00 2001
From: Ruben Schuller <ruben@orgizm.net>
Date: Sun, 27 Oct 2013 00:27:57 -0500
Subject: network/netsurf: Updated for version 3.0.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 network/netsurf/netsurf.SlackBuild | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'network/netsurf/netsurf.SlackBuild')

diff --git a/network/netsurf/netsurf.SlackBuild b/network/netsurf/netsurf.SlackBuild
index 4123d4df24..363f8cdba5 100644
--- a/network/netsurf/netsurf.SlackBuild
+++ b/network/netsurf/netsurf.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for netsurf
 
-# Copyright 2012 Ruben Schuller
+# Copyright 2012, 2013 Ruben Schuller
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,14 +23,16 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=netsurf
-VERSION=${VERSION:-2.9}
+VERSION=${VERSION:-3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -54,14 +56,14 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e
+set -e # Exit on most errors
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION-full-src.tar.gz
-cd $PRGNAM-$VERSION
+cd $PRGNAM-full-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -69,22 +71,21 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Apply the configuration
-cat $CWD/ns-config > $PRGNAM-$VERSION/Makefile.config
+# apply patches from git to compile with bison 2.7.1
+# http://git.netsurf-browser.org/nsgenbind.git/patch/?id=51bd18034c510a6d4711823e08b69af2f7aa063e
+patch -d src/nsgenbind-0.0.1/src < $CWD/nsgenbind-lexer.l.patch
+patch -d src/nsgenbind-0.0.1/src < $CWD/webidl-lexer.l.patch
 
-make TARGET=gtk
-make install DESTDIR=$PKG PREFIX=/usr TARGET=gtk
-
-cp -v -R -L $PRGNAM-$VERSION/gtk/res/* $PKG/usr/share/netsurf
+make install DESTDIR=$PKG PREFIX=/usr
 
 mkdir $PKG/usr/share/pixmaps
-cp $PRGNAM-$VERSION/gtk/res/netsurf.xpm $PKG/usr/share/pixmaps
+cp src/netsurf-3.0/gtk/res/netsurf.png $PKG/usr/share/pixmaps
+cp src/netsurf-3.0/gtk/res/netsurf.xpm $PKG/usr/share/pixmaps
 
-mkdir $PKG/usr/share/applications
+mkdir -p $PKG/usr/share/applications
 cp $CWD/netsurf.desktop $PKG/usr/share/applications
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/ns-config > $PKG/usr/doc/$PRGNAM-$VERSION/ns-config
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-- 
cgit v1.2.3