update to 1.3.0 and fix builds for newer erlang versions

OBS-URL: https://build.opensuse.org/package/show/devel:languages:erlang/erlang-erlang_js?expand=0&rev=2
This commit is contained in:
Nico Kruber
2016-02-26 11:06:13 +00:00
committed by Git OBS Bridge
parent 806e925cf0
commit 429cbc7720
8 changed files with 72 additions and 18 deletions

View File

@@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Feb 26 10:41:01 UTC 2016 - kruber@zib.de
- update to 1.3.0 (no changelog provided)
- replace erlang_js-1.2.2-debuginfo.patch with
erlang_js-1.3.0-debuginfo.patch
- add erlang_js-1.3.0-fix-version.patch setting the version without
the need for git
- add erlang_js-1.3.0-fix-newer-builds.patch to fix builds for
newer erlang versions
-------------------------------------------------------------------
Wed Oct 2 10:22:44 UTC 2013 - kruber@zib.de

View File

@@ -16,7 +16,7 @@
#
Name: erlang-erlang_js
Version: 1.2.2
Version: 1.3.0
Release: 1
Summary: Linked-in driver for Erlang to Mozilla's Spidermonkey Javascript runtime
License: Apache-2.0
@@ -24,7 +24,9 @@ Group: Development/Libraries/Other
URL: https://github.com/basho/erlang_js
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: erlang_js-%{version}.tar.gz
Patch1: erlang_js-1.2.2-debuginfo.patch
Patch1: erlang_js-1.3.0-debuginfo.patch
Patch2: erlang_js-1.3.0-fix-version.patch
Patch3: erlang_js-1.3.0-fix-newer-builds.patch
Requires: erlang >= R13B04
BuildRequires: erlang-rebar
BuildRequires: gcc-c++
@@ -56,6 +58,8 @@ erlang_js builds and executes only on Unix-based platforms, including Linux, Mac
%prep
%setup -q -n erlang_js-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
%__make all docs

View File

@@ -1,13 +0,0 @@
diff -U 3 -H -d -r -N -- erlang_js-1.2.2/rebar.config erlang_js-1.2.2.debuginfo/rebar.config
--- erlang_js-1.2.2/rebar.config 2013-01-29 21:13:01.000000000 +0100
+++ erlang_js-1.2.2.debuginfo/rebar.config 2013-10-03 00:37:32.030018116 +0200
@@ -5,7 +5,8 @@
%%
{cover_enabled, true}.
-{erl_opts, [warnings_as_errors]}.
+{erl_opts, [warnings_as_errors,
+ debug_info]}.
{port_env, [
{"DRV_CFLAGS", "$DRV_CFLAGS -I c_src/system/include/js -DXP_UNIX -Wall"},

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7a158832fe48b666d1beca06fd68063a8b44916decd00cd3f0da009468524ebc
size 2654907

View File

@@ -0,0 +1,13 @@
diff -U 3 -H -d -r -N -x .git -x .svn -- erlang_js-1.3.0/rebar.config erlang_js-1.3.0.debuginfo/rebar.config
--- erlang_js-1.3.0/rebar.config 2014-04-11 22:39:20.000000000 +0200
+++ erlang_js-1.3.0.debuginfo/rebar.config 2016-02-26 12:00:18.983402423 +0100
@@ -5,7 +5,8 @@
%%
{cover_enabled, true}.
-{erl_opts, [warnings_as_errors]}.
+{erl_opts, [warnings_as_errors,
+ debug_info]}.
{port_specs, [{"priv/erlang_js_drv.so", ["c_src/*.c"]}]}.

View File

@@ -0,0 +1,27 @@
diff -U 3 -H -d -r -N -x .git -x .svn -- erlang_js-1.3.0/src/js_benchmark.erl erlang_js-1.3.0.fix-newer-builds/src/js_benchmark.erl
--- erlang_js-1.3.0/src/js_benchmark.erl 2014-04-11 22:39:20.000000000 +0200
+++ erlang_js-1.3.0.fix-newer-builds/src/js_benchmark.erl 2016-02-26 11:59:10.641309005 +0100
@@ -38,9 +38,9 @@
%% @private
time_calls(Ctx, Count) ->
io:format("Starting: ~p~n", [Count]),
- Start = erlang:now(),
+ Start = os:timestamp(),
do_calls(Ctx, Count),
- timer:now_diff(erlang:now(), Start) / Count.
+ timer:now_diff(os:timestamp(), Start) / Count.
%% @private
do_calls(_Ctx, 0) ->
diff -U 3 -H -d -r -N -x .git -x .svn -- erlang_js-1.3.0/src/js_mochijson2.erl erlang_js-1.3.0.fix-newer-builds/src/js_mochijson2.erl
--- erlang_js-1.3.0/src/js_mochijson2.erl 2014-04-11 22:39:20.000000000 +0200
+++ erlang_js-1.3.0.fix-newer-builds/src/js_mochijson2.erl 2016-02-26 11:55:45.178093494 +0100
@@ -32,8 +32,6 @@
-define(IS_WHITESPACE(C),
(C =:= $\s orelse C =:= $\t orelse C =:= $\r orelse C =:= $\n)).
-%% @type iolist() = [char() | binary() | iolist()]
-%% @type iodata() = iolist() | binary()
%% @type json_string() = atom | binary()
%% @type json_number() = integer() | float()
%% @type json_array() = [json_term()]

View File

@@ -0,0 +1,12 @@
diff -U 3 -H -d -r -N -x .git -x .svn -- erlang_js-1.3.0/src/erlang_js.app.src erlang_js-1.3.0.fix-version/src/erlang_js.app.src
--- erlang_js-1.3.0/src/erlang_js.app.src 2014-04-11 22:39:20.000000000 +0200
+++ erlang_js-1.3.0.fix-version/src/erlang_js.app.src 2016-02-26 11:46:34.688427016 +0100
@@ -1,7 +1,7 @@
% -*- mode: erlang -*-
{application, erlang_js,
[{description, "Interface between BEAM and JS"},
- {vsn, git},
+ {vsn, "1.3.0"},
{modules, [erlang_js, erlang_js_sup, js, js_benchmark, js_cache, js_driver, js_drv_comm, js_memory, js_mochijson2, js_mochinum]},
{registered, [erlang_js_sup, js_cache]},
{applications, [kernel, stdlib, sasl]},

3
erlang_js-1.3.0.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:79b61bff2c686be3c7e481dfa9c67e14058875281e063e14555d5ac6b208678b
size 2675982