network/netsurf: Updated for version 3.3.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

7 files changed, 32 insertions, 80 deletions

diff --git a/network/netsurf/README b/network/netsurf/README
index d200454389..09e668d4d9 100644
--- a/network/netsurf/README
+++ b/network/netsurf/README
@@ -3,4 +3,8 @@ under the GNU Public Licence version 2. NetSurf has its own layout and
 rendering engine entirely written from scratch. It is small and capable of 
 handling many of the web standards in use today.
 
-Scroll patch suggested by João Carvalho.
+NETSURF_USE_MOZJS=NO	to build without Mozilla js
+NETSURF_USE_VIDEO=YES	to build with gstreamer-0.10
+NETSURF_USE_WEBP=YES	to build with libwebp
+
+Build-time requires: perl-html-parser
diff --git a/network/netsurf/enable-deprecated.diff b/network/netsurf/enable-deprecated.diff
new file mode 100644
index 0000000000..3378406e85
--- /dev/null
+++ b/network/netsurf/enable-deprecated.diff
@@ -0,0 +1,10 @@
+--- a/netsurf/gtk/Makefile.target	2015-03-21 20:50:22.018730471 +0300
++++ b/netsurf/gtk/Makefile.target	2015-03-22 11:38:07.809544850 +0300
+@@ -34,7 +34,6 @@
+ 
+ # GTK and GLIB flags to disable depricated usage
+ GTKDEPFLAGS := -DG_DISABLE_SINGLE_INCLUDES \
+-		-DG_DISABLE_DEPRECATED \
+ 	       	-DGTK_DISABLE_SINGLE_INCLUDES \
+ 	       	-DGTK_DISABLE_DEPRECATED \
+ 		-DGTK_MULTIHEAD_SAFE \
diff --git a/network/netsurf/netsurf.SlackBuild b/network/netsurf/netsurf.SlackBuild
index d1c87b73b6..738a5511bf 100644
--- a/network/netsurf/netsurf.SlackBuild
+++ b/network/netsurf/netsurf.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for netsurf
 
-# Copyright 2012, 2013 Ruben Schuller
+# Copyright 2012 - 2015 Ruben Schuller
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=netsurf
-VERSION=${VERSION:-3.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-JAVASCRIPT=${JAVASCRIPT:-YES}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -61,8 +60,8 @@ 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-full-$VERSION
+tar xvf $CWD/$PRGNAM-all-$VERSION.tar.gz
+cd $PRGNAM-all-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -70,25 +69,18 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# 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
-
-# Scroll patch so it changes 30 lines a time instead of one
-# thanks to Sabotage-Linux@git
-# https://github.com/sabotage-linux/sabotage/blob/master/KEEP/netsurf-3.0-scrollspeed.patch
-patch -d src/netsurf-3.0/gtk/res/ < $CWD/scroll.patch
-
-if  [ "$JAVASCRIPT" == "YES" ]; then
-	PATH="$(pwd)/src/nsgenbind-0.0.1/build-Linux-gtk-release-binary":$PATH make install DESTDIR=$PKG PREFIX=/usr NETSURF_USE_MOZJS=YES
-else
-	make install DESTDIR=$PKG PREFIX=/usr
+if [ "${NETSURF_USE_VIDEO:-NO}"=="YES" ]; then
+    patch --verbose -p1 < $CWD/enable-deprecated.diff
 fi
 
+make install DESTDIR=$PKG PREFIX=/usr \
+    NETSURF_USE_MOZJS=${NETSURF_USE_MOZJS:-YES} \
+    NETSURF_USE_WEBP=${NETSURF_USE_WEBP:-NO} \
+    NETSURF_USE_VIDEO=${NETSURF_USE_VIDEO:-NO}
+
 mkdir $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
+cp netsurf/gtk/res/netsurf.png $PKG/usr/share/pixmaps
+cp netsurf/gtk/res/netsurf.xpm $PKG/usr/share/pixmaps
 
 mkdir -p $PKG/usr/share/applications
 cp $CWD/netsurf.desktop $PKG/usr/share/applications
diff --git a/network/netsurf/netsurf.info b/network/netsurf/netsurf.info
index c1c735b641..292b000dcd 100644
--- a/network/netsurf/netsurf.info
+++ b/network/netsurf/netsurf.info
@@ -1,8 +1,8 @@
 PRGNAM="netsurf"
-VERSION="3.0"
+VERSION="3.3"
 HOMEPAGE="http://www.netsurf-browser.org"
-DOWNLOAD="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-3.0-full-src.tar.gz"
-MD5SUM="51b13676d5f012409e0aefc6404938f6"
+DOWNLOAD="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-3.3.tar.gz"
+MD5SUM="699b3653056c02fd989189853d07da55"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/netsurf/nsgenbind-lexer.l.patch b/network/netsurf/nsgenbind-lexer.l.patch
deleted file mode 100644
index 17165fb3ac..0000000000
--- a/network/netsurf/nsgenbind-lexer.l.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-index b257c83..8189a72 100644
---- a/src/nsgenbind-lexer.l
-+++ b/src/nsgenbind-lexer.l
-@@ -19,6 +19,16 @@
-     yylloc->first_column = yylloc->last_column + 1; \
-     yylloc->last_column += yyleng;
- 
-+
-+/* Ensure compatability with bison 2.6 and later */
-+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED && defined NSGENBIND_STYPE_IS_DECLARED
-+#define YYSTYPE NSGENBIND_STYPE
-+#endif
-+
-+#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED && defined NSGENBIND_LTYPE_IS_DECLARED
-+#define YYLTYPE NSGENBIND_LTYPE
-+#endif
-+
- %}
diff --git a/network/netsurf/scroll.patch b/network/netsurf/scroll.patch
deleted file mode 100644
index 1d5f6aaabe..0000000000
--- a/network/netsurf/scroll.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -rupN a/src/netsurf-3.0/gtk/res/tabcontents.gtk2.ui b/src/netsurf-3.0/gtk/res/tabcontents.gtk2.ui
---- a/src/netsurf-3.0/gtk/res/tabcontents.gtk2.ui	2013-04-19 21:27:45.000000000 +0100
-+++ b/src/netsurf-3.0/gtk/res/tabcontents.gtk2.ui	2014-01-17 11:47:53.000000000 +0000
-@@ -79,13 +79,13 @@
-       </object>
-   <object class="GtkAdjustment" id="layouthadjustment">
-     <property name="upper">100</property>
--    <property name="step_increment">1</property>
-+    <property name="step_increment">30</property>
-     <property name="page_increment">10</property>
-     <property name="page_size">10</property>
-   </object>
-   <object class="GtkAdjustment" id="layoutvadjustment">
-     <property name="upper">100</property>
--    <property name="step_increment">1</property>
-+    <property name="step_increment">30</property>
-     <property name="page_increment">10</property>
-     <property name="page_size">10</property>
-   </object>
diff --git a/network/netsurf/webidl-lexer.l.patch b/network/netsurf/webidl-lexer.l.patch
deleted file mode 100644
index 183664593e..0000000000
--- a/network/netsurf/webidl-lexer.l.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-index 5369d99..74b9bb8 100644
---- a/src/webidl-lexer.l
-+++ b/src/webidl-lexer.l
-@@ -27,6 +27,15 @@
-     yylloc->first_column = yylloc->last_column + 1; \
-     yylloc->last_column += yyleng;
- 
-+/* Ensure compatability with bison 2.6 and later */
-+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED && defined WEBIDL_STYPE_IS_DECLARED
-+#define YYSTYPE WEBIDL_STYPE
-+#endif
-+
-+#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED && defined WEBIDL_LTYPE_IS_DECLARED
-+#define YYLTYPE WEBIDL_LTYPE
-+#endif
-+
- %}