Accepting request 391673 from home:sleep_walker:branches:network

- disable JS support until someone fix it
- refresh patches
- fix indentation

OBS-URL: https://build.opensuse.org/request/show/391673
OBS-URL: https://build.opensuse.org/package/show/network/elinks?expand=0&rev=5

elinks-0.12_pre5-compilation-fix.patch

@@ -1,7 +1,8 @@
-diff -Naurp elinks-0.12pre5-orig//src/intl/charsets.c elinks-0.12pre5/src/intl/charsets.c
---- elinks-0.12pre5-orig//src/intl/charsets.c	2010-04-04 12:19:02.000000000 +0200
-+++ elinks-0.12pre5/src/intl/charsets.c	2010-04-04 12:19:20.000000000 +0200
-@@ -821,7 +821,7 @@ free_utf_table(void)
+Index: elinks-0.12pre6/src/intl/charsets.c
+===================================================================
+--- elinks-0.12pre6.orig/src/intl/charsets.c	2012-10-28 13:57:15.000000000 +0100
++++ elinks-0.12pre6/src/intl/charsets.c	2016-04-26 10:16:15.984070911 +0200
+@@ -819,7 +819,7 @@
  
  	/* Cast away const.  */
  	for (i = 128; i < 256; i++)

elinks.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr 26 09:51:59 UTC 2016 - sleep_walker@opensuse.org
+
+- disable JS support until someone fix it
+- refresh patches
+- fix indentation
+
 -------------------------------------------------------------------
 Mon Dec 24 22:07:46 UTC 2012 - tchvatal@suse.com
 

elinks.spec

@@ -17,6 +17,8 @@
 
 %define pkg_version 0.12pre6
 
+%bcond_with js
+
 Name:           elinks
 Version:        0.11.996
 Release:        0
@@ -26,17 +28,18 @@ Url:            http://elinks.or.cz/
 Group:          Productivity/Networking/Web/Browsers
 Source0:        http://elinks.or.cz/download/%{name}-%{pkg_version}.tar.bz2
 # PATCH-FIX-UPSTREAM elinks-0.12_pre5-compilation-fix.patch asterios.dramis@gmail.com -- Fix compilation with gc (patch taken from Gentoo)
-Patch0: elinks-0.12_pre5-compilation-fix.patch
+Patch0:         elinks-0.12_pre5-compilation-fix.patch
 # PATCH-FIX-UPSTREAM use_lua-5.1.patch asterios.dramis@gmail.com -- Support for lua-5.1 (based on patch from Debian)
-Patch1: use_lua-5.1.patch
+Patch1:         use_lua-5.1.patch
 # PATCH-FIX-UPSTREAM build-with-ruby-1.9.patch dabbot@gentoo.org -- Support for ruby-1.9 (patch taken from Gentoo)
-Patch2: build-with-ruby-1.9.patch
+Patch2:         build-with-ruby-1.9.patch
 %if 0%{?suse_version} > 1140
 BuildRequires:  gc-devel
 %endif
 BuildRequires:  gpm-devel
-%if 0%{?suse_version} > 1140
-BuildRequires:  js-devel
+%if %{with js}
+BuildRequires:  mozjs24-devel
+BuildRequires:  gcc-c++
 %endif
 BuildRequires:  krb5-devel
 BuildRequires:  libbz2-devel
@@ -99,6 +102,11 @@ export CFLAGS="%{optflags} -fstack-protector"
     --with-gc \
 %else
     --without-gc \
+%endif
+%if %{without js}
+    --without-spidermonkey \
+%else
+    --with-spidermonkey=%{_includedir}/mozjs-24 \
 %endif
     --without-lzma \
     --with-gssapi \

use_lua-5.1.patch

@@ -1,6 +1,8 @@
---- configure.in.orig	2009-07-07 15:23:17.000000000 +0300
-+++ configure.in	2012-06-10 15:47:58.962180590 +0300
-@@ -884,11 +884,11 @@
+Index: configure.in
+===================================================================
+--- configure.in.orig	2012-10-28 13:57:15.000000000 +0100
++++ configure.in	2016-04-26 10:16:22.984001853 +0200
+@@ -834,11 +834,11 @@
  		withval="";
  	fi
  	for luadir in "$withval" "" /usr /usr/local; do
@@ -15,8 +17,10 @@
  
  				LIBS="$LUA_LIBS $LIBS_X"
  				CFLAGS="$CFLAGS_X $LUA_CFLAGS"
---- src/scripting/lua/core.c.orig	2009-07-07 15:23:17.000000000 +0300
-+++ src/scripting/lua/core.c	2012-06-10 14:20:57.215111234 +0300
+Index: src/scripting/lua/core.c
+===================================================================
+--- src/scripting/lua/core.c.orig	2012-10-28 13:57:15.000000000 +0100
++++ src/scripting/lua/core.c	2016-04-26 10:16:22.984001853 +0200
 @@ -658,7 +658,7 @@
  	if (file_can_read(file)) {
  		int oldtop = lua_gettop(S);
@@ -48,8 +52,10 @@
  			lua_settop(L, oldtop);
  			finish_lua();
  		}
---- src/scripting/lua/hooks.c.orig	2009-07-07 15:23:17.000000000 +0300
-+++ src/scripting/lua/hooks.c	2012-06-10 14:21:26.216351680 +0300
+Index: src/scripting/lua/hooks.c
+===================================================================
+--- src/scripting/lua/hooks.c.orig	2012-10-28 13:57:15.000000000 +0100
++++ src/scripting/lua/hooks.c	2016-04-26 10:16:22.984001853 +0200
 @@ -200,7 +200,7 @@
  script_hook_quit(va_list ap, void *data)
  {