commit dc03de4da610997b4089f73275a313488f8f8f2c
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Thu Feb 2 19:44:22 2023 +0100
- added includes patch to fix main program build
- switched spidermonkey engine to js185
natus-includes.patch | 12 ++++++++++++
natus.spec | 19 ++++++++++++++-----
2 files changed, 26 insertions(+), 5 deletions(-)
---
diff --git a/natus.spec b/natus.spec
index 11687b7..8016bf5 100644
--- a/natus.spec
+++ b/natus.spec
@@ -12,17 +12,23 @@ Version: 0.2.1
Release: 1
License: MIT
Group: Libraries
+#Source0Download: https://github.com/Natus/natus/tags
Source0:
http://github.com/Natus/natus/tarball/%{version}/%{name}-%{version}.tar.gz
# Source0-md5: c707dadb76dc7cf6e4f8c95c0cc45ca5
+Patch0: %{name}-includes.patch
+URL: https://github.com/Natus/natus
BuildRequires: autoconf >= 2.59
BuildRequires: automake
%{?with_webkit:BuildRequires: gtk-webkit3-devel}
%if %{with spidermonkey}
-#BuildRequires: js-devel >= 1.8 not released yet, use xulrunner for now
-BuildRequires: xulrunner-devel >= 2.0
+# libjs >= 1.8 / xulrunner >= 2
+# builds with js185 with no modification
+# js187 fails with two errors, each later is worse
+BuildRequires: js185-devel
%endif
BuildRequires: libstdc++-devel
BuildRequires: libtool >= 2:2.0
+BuildRequires: sed >= 4.0
%{?with_v8:BuildRequires: v8-devel}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -54,7 +60,7 @@ Requires: %{name} = %{version}-%{release}
%description engine-JavaScriptCore
JavaScriptCore JavaScript engine (used in WebKit/Safari) for Natus.
-%description engine-JavaScriptCore
+%description engine-JavaScriptCore -l pl.UTF-8
Silnik JavaScriptu JavaScriptCore (używany w WebKicie/Safari) dla
Natusa.
@@ -68,7 +74,7 @@ Requires: %{name} = %{version}-%{release}
SpiderMonkey JavaScript engine (used in Mozilla-derived browsers like
Firefox or Seamonkey) for Natus.
-%description engine-SpiderMonkey
+%description engine-SpiderMonkey -l pl.UTF-8
Silnik JavaScriptu SpiderMonkey (używany w przeglądarkach wywodzących
się z Mozilli, np. Firefox czy Seamonkey) dla Natusa.
@@ -81,12 +87,15 @@ Requires: %{name} = %{version}-%{release}
%description engine-v8
V8 JavaScript engine (used in Google Chrome/Chromium) for Natus.
-%description engine-v8
+%description engine-v8 -l pl.UTF-8
Silnik JavaScriptu V8 (używany w przeglądarkach Google
Chrome/Chromium) dla Natusa.
%prep
%setup -q -n Natus-%{name}-%{gitver}
+%patch0 -p1
+
+%{__sed} -i -e 's/libjs >= 1\.8/mozjs185/' configure.ac
%build
%{__libtoolize}
diff --git a/natus-includes.patch b/natus-includes.patch
new file mode 100644
index 0000000..fa246cb
--- /dev/null
+++ b/natus-includes.patch
@@ -0,0 +1,12 @@
+--- Natus-natus-fcb732e/natus/main.cc.orig 2011-05-10 18:55:02.000000000
+0200
++++ Natus-natus-fcb732e/natus/main.cc 2023-02-02 19:11:13.247968576 +0100
+@@ -34,7 +34,9 @@ using namespace std;
+ #include <cassert>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <getopt.h>
+ #include <regex.h>
++#include <unistd.h>
+
+ #include <readline/readline.h>
+ #include <readline/history.h>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/natus.git/commitdiff/dc03de4da610997b4089f73275a313488f8f8f2c
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
