SHA256
1
0
forked from pool/gnuplot
Dr. Werner Fink 2015-07-28 06:55:24 +00:00 committed by Git OBS Bridge
parent 6618e379e9
commit c05407c011
3 changed files with 38 additions and 5 deletions

View File

@ -0,0 +1,24 @@
---
term/lua.trm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- term/lua.trm
+++ term/lua.trm 2015-07-28 06:48:03.890643983 +0000
@@ -251,7 +251,7 @@ LUA_GP_int_error(lua_State *L) {
msg = luaL_checkstring(L, 1);
break;
case 2:
- t_num = luaL_checkint(L, 1);
+ t_num = luaL_checkinteger(L, 1);
msg = luaL_checkstring(L, 2);
break;
default:
@@ -285,7 +285,7 @@ LUA_GP_int_warn(lua_State *L) {
msg = luaL_checkstring(L, 1);
break;
case 2:
- t_num = luaL_checkint(L, 1);
+ t_num = luaL_checkinteger(L, 1);
msg = luaL_checkstring(L, 2);
break;
default:

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jul 28 06:50:41 UTC 2015 - werner@suse.de
- Add patch gnuplot-5.0.0-lua-5.3.1.dif to make it build with
lua-5.3.1
-------------------------------------------------------------------
Fri Jul 24 11:08:33 UTC 2015 - werner@suse.de

View File

@ -17,7 +17,7 @@
%bcond_without h3d_gridbox
%if %{suse_version} > 1310
%if 0%{suse_version} > 1310
%define qtver 5
%else
%define qtver 4
@ -46,7 +46,7 @@ BuildRequires: pkgconfig(Qt5Svg)
%else
BuildRequires: libqt4-devel >= 4.5
%endif
%if %suse_version > 1320
%if 0%{?suse_version} > 1320
BuildRequires: pkgconfig(libcerf)
%endif
BuildRequires: latex2html
@ -54,10 +54,10 @@ BuildRequires: texlive-latex
BuildRequires: texlive-tex4ht
BuildRequires: texlive-ucs
BuildRequires: zziplib
%if %suse_version >= 1220
%if 0%{?suse_version} >= 1220
BuildRequires: makeinfo
%endif
%if %suse_version > 1220
%if 0%{?suse_version} > 1220
BuildRequires: texlive-dvips
BuildRequires: texlive-epstopdf
BuildRequires: texlive-tex
@ -70,7 +70,7 @@ BuildRequires: fdupes
BuildRequires: libpng-devel
BuildRequires: lua-devel
BuildRequires: plotutils-devel
%if 0%{?suse_version} > 0 && %{?suse_version} <= 1310
%if 0%{?suse_version} > 0 && 0%{?suse_version} <= 1310
BuildRequires: wxWidgets-devel
%define _use_internal_dependency_generator 0
%define __find_requires %wx_requires
@ -103,6 +103,8 @@ Patch2: gnuplot-4.6.0-fonts.diff
Patch4: gnuplot-4.6.0-demo.diff
Patch5: gnuplot-wx3.diff
Patch6: gnuplot-QtCore-PIC.dif
# PATCH-FIX-SUSE -- make it build with lua-5.3.1
Patch7: gnuplot-5.0.0-lua-5.3.1.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
%if "%_exec_prefix" == "/usr/X11R6"
@ -153,6 +155,7 @@ cp %{_sourcedir}/picins.sty docs
%patch1 -p0 -b .x11ovf
%patch5 -p1 -b .w3x
%patch6 -p0 -b .pic
%patch7 -p0 -b .l531
%build
autoreconf -fi