[packages/squirrel] - updated to 2.2.5 - updated autotools patch and added mem patch from Fedora

qboosh qboosh at pld-linux.org
Fri Apr 19 21:38:39 CEST 2019


commit 7985bc2b9e2c35c0027f33b1f3328572102c9d89
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Apr 19 21:38:46 2019 +0200

    - updated to 2.2.5
    - updated autotools patch and added mem patch from Fedora

 squirrel-autotools.patch | 332 +++++++++++++++++++++++++----------------------
 squirrel-mem.patch       |  36 +++++
 squirrel.spec            |  52 ++++++--
 3 files changed, 250 insertions(+), 170 deletions(-)
---
diff --git a/squirrel.spec b/squirrel.spec
index a8d53a6..b0e3b3a 100644
--- a/squirrel.spec
+++ b/squirrel.spec
@@ -1,18 +1,23 @@
 #
 # Conditional build:
-%bcond_without	static_libs	# don't build static libraries
+%bcond_without	static_libs	# static libraries
 #
 Summary:	High level imperative/OO programming language
+Summary(pl.UTF-8):	Wysokopoziomowy imperatywny/zorientowany obiektowo język programowania
 Name:		squirrel
-Version:	2.2.4
+Version:	2.2.5
 Release:	1
-License:	zlib
+License:	Zlib
 Group:		Development/Tools
 Source0:	http://downloads.sourceforge.net/squirrel/%{name}_%{version}_stable.tar.gz
-# Source0-md5:	e411dfd1bcc5220aa80de53e4a5f094d
+# Source0-md5:	35f97d933d46e2b5d54e0c0f2eccfa4a
 Patch0:		%{name}-autotools.patch
+Patch1:		%{name}-mem.patch
 URL:		http://squirrel-lang.org/
-BuildRequires:	libtool
+BuildRequires:	autoconf >= 2.59
+BuildRequires:	automake
+BuildRequires:	libstdc++-devel
+BuildRequires:	libtool >= 2:1.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -20,33 +25,52 @@ Squirrel is a high level imperative/OO programming language, designed
 to be a powerful scripting tool that fits in the size, memory
 bandwidth, and real-time requirements of applications like games.
 
+%description -l pl.UTF-8
+Squirrel to wysokopoziomowy, imperatywny, zorientowany obiektowo język
+programowania, zaprojektowany jako potężne narzędzie do skryptów,
+nadający się pod względem rozmiaru, wykorzystania pamięci i wymagań
+czasu rzeczywistego do takich zastosowań, jak gry.
+
 %package devel
 Summary:	Development files needed to use Squirrel libraries
+Summary(pl.UTF-8):	Pliki programistyczne potrzebne do korzystania z bibliotek Squirrela
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description devel
 Development files needed to use Squirrel libraries.
 
+%description devel -l pl.UTF-8
+Pliki programistyczne potrzebne do korzystania z bibliotek Squirrela.
+
 %package static
-Summary:	Static libsquirrel library
+Summary:	Static Squirrel libraries
+Summary(pl.UTF-8):	Statyczne biblioteki Squirrela
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
-Static libsquirrel library.
+Static Squirrel libraries.
+
+%description static -l pl.UTF-8
+Statyczne biblioteki Squirrela.
 
 %prep
 %setup -q -c
+cd SQUIRREL2
 %patch0 -p1
+%patch1 -p1
 
 # fix extension for autotools
-cd SQUIRREL2
-mv sq/sq.c sq/sq.cpp
+%{__mv} sq/sq.c sq/sq.cpp
 
 %build
 cd SQUIRREL2
-sh autogen.sh
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure
 	%{!?with_static_libs:--disable-static}
 %{__make}
@@ -54,8 +78,7 @@ sh autogen.sh
 %install
 rm -rf $RPM_BUILD_ROOT
 
-cd SQUIRREL2
-%{__make} install \
+%{__make} -C SQUIRREL2 install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -74,11 +97,12 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %doc SQUIRREL2/doc/*.pdf
-%{_libdir}/libsqstdlib.so
-%{_libdir}/libsquirrel.so
+%attr(755,root,root) %{_libdir}/libsqstdlib.so
+%attr(755,root,root) %{_libdir}/libsquirrel.so
 %{_libdir}/libsqstdlib.la
 %{_libdir}/libsquirrel.la
 %{_includedir}/squirrel
+%{_pkgconfigdir}/squirrel.pc
 
 %if %{with static_libs}
 %files static
diff --git a/squirrel-autotools.patch b/squirrel-autotools.patch
index aa1aafc..6711029 100644
--- a/squirrel-autotools.patch
+++ b/squirrel-autotools.patch
@@ -1,6 +1,6 @@
-diff -Nru squirrel-2.2.4/SQUIRREL2.orig/autogen.sh SQUIRREL2/autogen.sh
---- squirrel-2.2.4/SQUIRREL2.orig/autogen.sh	1970-01-01 01:00:00.000000000 +0100
-+++ squirrel-2.2.4/SQUIRREL2/autogen.sh	2007-07-07 19:06:16.000000000 +0200
+diff -Nru SQUIRREL2.orig/autogen.sh SQUIRREL2/autogen.sh
+--- SQUIRREL2.orig/autogen.sh	1970-01-01 01:00:00.000000000 +0100
++++ SQUIRREL2/autogen.sh	2007-07-07 19:06:16.000000000 +0200
 @@ -0,0 +1,12 @@
 +#! /bin/sh
 +
@@ -14,13 +14,13 @@ diff -Nru squirrel-2.2.4/SQUIRREL2.orig/autogen.sh SQUIRREL2/autogen.sh
 +autoheader
 +automake --add-missing --copy --foreign
 +autoconf
-diff -Nru squirrel-2.2.4/SQUIRREL2.orig/configure.ac SQUIRREL2/configure.ac
---- squirrel-2.2.4/SQUIRREL2.orig/configure.ac	1970-01-01 01:00:00.000000000 +0100
-+++ squirrel-2.2.4/SQUIRREL2/configure.ac	2007-07-07 20:06:22.000000000 +0200
-@@ -0,0 +1,26 @@
+diff -Nru SQUIRREL2.orig/configure.ac SQUIRREL2/configure.ac
+--- SQUIRREL2.orig/configure.ac	1970-01-01 01:00:00.000000000 +0100
++++ SQUIRREL2/configure.ac	2007-07-07 20:06:22.000000000 +0200
+@@ -0,0 +1,27 @@
 +## Bootstrap autoconf/automake
 +AC_PREREQ(2.59)
-+AC_INIT([squirrel], [2.2.4], [])
++AC_INIT([squirrel], [2.2.5], [])
 +AC_CANONICAL_TARGET
 +AC_CONFIG_SRCDIR([configure.ac])
 +AM_INIT_AUTOMAKE
@@ -36,6 +36,7 @@ diff -Nru squirrel-2.2.4/SQUIRREL2.orig/configure.ac SQUIRREL2/configure.ac
 +
 +# Produce output
 +AC_CONFIG_FILES([Makefile
++		squirrel.pc
 +		squirrel/Makefile
 +		sqstdlib/Makefile
 +		sq/Makefile
@@ -44,9 +45,9 @@ diff -Nru squirrel-2.2.4/SQUIRREL2.orig/configure.ac SQUIRREL2/configure.ac
 +AC_OUTPUT
 +
 +echo "Type 'make' to compile"
-diff -Nru squirrel-2.2.4/SQUIRREL2.orig/include/Makefile.am SQUIRREL2/include/Makefile.am
---- squirrel-2.2.4/SQUIRREL2.orig/include/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ squirrel-2.2.4/SQUIRREL2/include/Makefile.am	2007-07-07 20:08:47.000000000 +0200
+diff -Nru SQUIRREL2.orig/include/Makefile.am SQUIRREL2/include/Makefile.am
+--- SQUIRREL2.orig/include/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ SQUIRREL2/include/Makefile.am	2007-07-07 20:08:47.000000000 +0200
 @@ -0,0 +1,11 @@
 +MAINTAINERCLEANFILES = Makefile.in
 +
@@ -59,32 +60,35 @@ diff -Nru squirrel-2.2.4/SQUIRREL2.orig/include/Makefile.am SQUIRREL2/include/Ma
 +		sqstdstring.h \
 +		sqstdsystem.h \
 +		squirrel.h
-diff -Nru squirrel-2.2.4/SQUIRREL2.orig/Makefile SQUIRREL2/Makefile
---- squirrel-2.2.4/SQUIRREL2.orig/Makefile	2006-03-05 17:03:53.000000000 +0100
-+++ squirrel-2.2.4/SQUIRREL2/Makefile	1970-01-01 01:00:00.000000000 +0100
+diff -Nru SQUIRREL2.orig/Makefile SQUIRREL2/Makefile
+--- SQUIRREL2.orig/Makefile	2006-03-05 17:03:53.000000000 +0100
++++ SQUIRREL2/Makefile	1970-01-01 01:00:00.000000000 +0100
 @@ -1,18 +0,0 @@
--
--SQUIRREL=.
--MAKE=make
--
--sq32:
--	cd squirrel; $(MAKE) 
--	cd sqstdlib; $(MAKE) 
--	cd sq; $(MAKE) 
--
--sqprof:
--	cd squirrel; $(MAKE) sqprof
--	cd sqstdlib; $(MAKE) sqprof
--	cd sq; $(MAKE) sqprof
--
--sq64:
--	cd squirrel; $(MAKE) sq64
--	cd sqstdlib; $(MAKE) sq64
--	cd sq; $(MAKE) sq64
-diff -Nru squirrel-2.2.4/SQUIRREL2.orig/Makefile.am SQUIRREL2/Makefile.am
---- squirrel-2.2.4/SQUIRREL2.orig/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ squirrel-2.2.4/SQUIRREL2/Makefile.am	2007-07-07 20:05:54.000000000 +0200
-@@ -0,0 +1,18 @@
+-
+-SQUIRREL=.
+-MAKE=make
+-
+-sq32:
+-	cd squirrel; $(MAKE) 
+-	cd sqstdlib; $(MAKE) 
+-	cd sq; $(MAKE) 
+-
+-sqprof:
+-	cd squirrel; $(MAKE) sqprof
+-	cd sqstdlib; $(MAKE) sqprof
+-	cd sq; $(MAKE) sqprof
+-
+-sq64:
+-	cd squirrel; $(MAKE) sq64
+-	cd sqstdlib; $(MAKE) sq64
+-	cd sq; $(MAKE) sq64
+diff -Nru SQUIRREL2.orig/Makefile.am SQUIRREL2/Makefile.am
+--- SQUIRREL2.orig/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ SQUIRREL2/Makefile.am	2007-07-07 20:05:54.000000000 +0200
+@@ -0,0 +1,21 @@
++pkgconfigdir =          $(libdir)/pkgconfig
++pkgconfig_DATA =        squirrel.pc
++
 +SUBDIRS = squirrel sqstdlib sq include
 +
 +MAINTAINERCLEANFILES =	INSTALL \
@@ -103,35 +107,35 @@ diff -Nru squirrel-2.2.4/SQUIRREL2.orig/Makefile.am SQUIRREL2/Makefile.am
 +			ltconfig \
 +			compile \
 +			depcomp
-diff -Nru squirrel-2.2.4/SQUIRREL2.orig/sq/Makefile SQUIRREL2/sq/Makefile
---- squirrel-2.2.4/SQUIRREL2.orig/sq/Makefile	2006-03-06 18:01:41.000000000 +0100
-+++ squirrel-2.2.4/SQUIRREL2/sq/Makefile	1970-01-01 01:00:00.000000000 +0100
+diff -Nru SQUIRREL2.orig/sq/Makefile SQUIRREL2/sq/Makefile
+--- SQUIRREL2.orig/sq/Makefile	2006-03-06 18:01:41.000000000 +0100
++++ SQUIRREL2/sq/Makefile	1970-01-01 01:00:00.000000000 +0100
 @@ -1,21 +0,0 @@
--SQUIRREL= ..
--
--
--OUT= $(SQUIRREL)/bin/sq
--INCZ= -I$(SQUIRREL)/include -I. -I$(SQUIRREL)/sqlibs
--LIBZ= -L$(SQUIRREL)/lib 
--LIB= -lsquirrel -lsqstdlib
--
--OBJS= sq.o
--	
--SRCS= sq.c
--	
--	
--sq32:
--	g++ -O2 -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
--
--sqprof:
--	g++ -O2 -pg -fno-rtti -pie -gstabs -g3 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
--	
--sq64:
+-SQUIRREL= ..
+-
+-
+-OUT= $(SQUIRREL)/bin/sq
+-INCZ= -I$(SQUIRREL)/include -I. -I$(SQUIRREL)/sqlibs
+-LIBZ= -L$(SQUIRREL)/lib 
+-LIB= -lsquirrel -lsqstdlib
+-
+-OBJS= sq.o
+-	
+-SRCS= sq.c
+-	
+-	
+-sq32:
+-	g++ -O2 -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
+-
+-sqprof:
+-	g++ -O2 -pg -fno-rtti -pie -gstabs -g3 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
+-	
+-sq64:
 -	g++ -O2 -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
 \ Chybí znak konce řádku na konci souboru
-diff -Nru squirrel-2.2.4/SQUIRREL2.orig/sq/Makefile.am SQUIRREL2/sq/Makefile.am
---- squirrel-2.2.4/SQUIRREL2.orig/sq/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ squirrel-2.2.4/SQUIRREL2/sq/Makefile.am	2007-07-07 19:24:54.000000000 +0200
+diff -Nru SQUIRREL2.orig/sq/Makefile.am SQUIRREL2/sq/Makefile.am
+--- SQUIRREL2.orig/sq/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ SQUIRREL2/sq/Makefile.am	2007-07-07 19:24:54.000000000 +0200
 @@ -0,0 +1,11 @@
 +MAINTAINERCLEANFILES = Makefile.in
 +
@@ -144,43 +148,43 @@ diff -Nru squirrel-2.2.4/SQUIRREL2.orig/sq/Makefile.am SQUIRREL2/sq/Makefile.am
 +sq_SOURCES = sq.cpp
 +
 +INCLUDES = -I../include
-diff -Nru squirrel-2.2.4/SQUIRREL2.orig/sqstdlib/Makefile SQUIRREL2/sqstdlib/Makefile
---- squirrel-2.2.4/SQUIRREL2.orig/sqstdlib/Makefile	2006-03-06 18:01:50.000000000 +0100
-+++ squirrel-2.2.4/SQUIRREL2/sqstdlib/Makefile	1970-01-01 01:00:00.000000000 +0100
+diff -Nru SQUIRREL2.orig/sqstdlib/Makefile SQUIRREL2/sqstdlib/Makefile
+--- SQUIRREL2.orig/sqstdlib/Makefile	2006-03-06 18:01:50.000000000 +0100
++++ SQUIRREL2/sqstdlib/Makefile	1970-01-01 01:00:00.000000000 +0100
 @@ -1,30 +0,0 @@
--SQUIRREL= ..
--
--
--OUT= $(SQUIRREL)/lib/libsqstdlib.a
--INCZ= -I$(SQUIRREL)/include -I. -Iinclude
--
--SRCS= \
--	sqstdblob.cpp \
--	sqstdio.cpp \
--	sqstdstream.cpp \
--	sqstdmath.cpp \
--	sqstdsystem.cpp \
--	sqstdstring.cpp \
--	sqstdaux.cpp \
--	sqstdrex.cpp
--	
--	
--sq32:
--	gcc -O2  -fno-rtti -Wall -c $(SRCS) $(INCZ)
--	ar rc $(OUT) *.o
--	rm *.o
--
--sqprof:
--	gcc -O2 -pg -fno-rtti -pie -gstabs -g3 -Wall -c $(SRCS) $(INCZ)
--	ar rc $(OUT) *.o
--	rm *.o
--sq64:
--	gcc -O2 -D_SQ64 -fno-rtti -Wall -c $(SRCS) $(INCZ)
--	ar rc $(OUT) *.o
--	rm *.o
-diff -Nru squirrel-2.2.4/SQUIRREL2.orig/sqstdlib/Makefile.am SQUIRREL2/sqstdlib/Makefile.am
---- squirrel-2.2.4/SQUIRREL2.orig/sqstdlib/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ squirrel-2.2.4/SQUIRREL2/sqstdlib/Makefile.am	2007-07-07 19:24:48.000000000 +0200
+-SQUIRREL= ..
+-
+-
+-OUT= $(SQUIRREL)/lib/libsqstdlib.a
+-INCZ= -I$(SQUIRREL)/include -I. -Iinclude
+-
+-SRCS= \
+-	sqstdblob.cpp \
+-	sqstdio.cpp \
+-	sqstdstream.cpp \
+-	sqstdmath.cpp \
+-	sqstdsystem.cpp \
+-	sqstdstring.cpp \
+-	sqstdaux.cpp \
+-	sqstdrex.cpp
+-	
+-	
+-sq32:
+-	gcc -O2  -fno-rtti -Wall -c $(SRCS) $(INCZ)
+-	ar rc $(OUT) *.o
+-	rm *.o
+-
+-sqprof:
+-	gcc -O2 -pg -fno-rtti -pie -gstabs -g3 -Wall -c $(SRCS) $(INCZ)
+-	ar rc $(OUT) *.o
+-	rm *.o
+-sq64:
+-	gcc -O2 -D_SQ64 -fno-rtti -Wall -c $(SRCS) $(INCZ)
+-	ar rc $(OUT) *.o
+-	rm *.o
+diff -Nru SQUIRREL2.orig/sqstdlib/Makefile.am SQUIRREL2/sqstdlib/Makefile.am
+--- SQUIRREL2.orig/sqstdlib/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ SQUIRREL2/sqstdlib/Makefile.am	2007-07-07 19:24:48.000000000 +0200
 @@ -0,0 +1,20 @@
 +MAINTAINERCLEANFILES = Makefile.in
 +AM_CXXFLAGS = -fno-rtti
@@ -202,65 +206,65 @@ diff -Nru squirrel-2.2.4/SQUIRREL2.orig/sqstdlib/Makefile.am SQUIRREL2/sqstdlib/
 +			sqstdsystem.cpp
 +
 +INCLUDES = -I$(top_srcdir)/include -I.
-diff -Nru squirrel-2.2.4/SQUIRREL2.orig/squirrel/Makefile SQUIRREL2/squirrel/Makefile
---- squirrel-2.2.4/SQUIRREL2.orig/squirrel/Makefile	2006-03-06 18:01:31.000000000 +0100
-+++ squirrel-2.2.4/SQUIRREL2/squirrel/Makefile	1970-01-01 01:00:00.000000000 +0100
+diff -Nru SQUIRREL2.orig/squirrel/Makefile SQUIRREL2/squirrel/Makefile
+--- SQUIRREL2.orig/squirrel/Makefile	2006-03-06 18:01:31.000000000 +0100
++++ SQUIRREL2/squirrel/Makefile	1970-01-01 01:00:00.000000000 +0100
 @@ -1,52 +0,0 @@
--SQUIRREL= ..
--
--
--OUT= $(SQUIRREL)/lib/libsquirrel.a
--INCZ= -I$(SQUIRREL)/include -I. -Iinclude
--DEFS= 
--LIB=	
--
--OBJS= \
--	sqapi.o \
--	sqbaselib.o \
--	sqcompiler.o \
--	sqdebug.o \
--	sqlexer.o \
--	sqobject.o \
--	sqparser.o \
--	sqstate.o \
--	sqtable.o \
--	sqvm.o \
--	sqmem.o \
--	sqclass.o
--	
--SRCS= \
--	sqapi.cpp \
--	sqbaselib.cpp \
--	sqfuncstate.cpp \
--	sqdebug.cpp \
--	sqlexer.cpp \
--	sqobject.cpp \
--	sqcompiler.cpp \
--	sqstate.cpp \
--	sqtable.cpp \
--	sqmem.cpp \
--	sqvm.cpp \
--	sqclass.cpp
--
--	
--	
--sq32:
--	gcc -O2  -fno-rtti -Wall -c $(SRCS) $(INCZ) $(DEFS)
--	ar rc $(OUT) *.o
--	rm *.o
--
--sqprof:
--	gcc -O2 -pg -fno-rtti -pie -gstabs -g3 -Wall -c $(SRCS) $(INCZ) $(DEFS)
--	ar rc $(OUT) *.o
--	rm *.o
--
--sq64:
--	gcc -O2  -D_SQ64 -fno-rtti -Wall -c $(SRCS) $(INCZ) $(DEFS)
--	ar rc $(OUT) *.o
--	rm *.o
-diff -Nru squirrel-2.2.4/SQUIRREL2.orig/squirrel/Makefile.am SQUIRREL2/squirrel/Makefile.am
---- squirrel-2.2.4/SQUIRREL2.orig/squirrel/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ squirrel-2.2.4/SQUIRREL2/squirrel/Makefile.am	2007-07-07 19:03:05.000000000 +0200
+-SQUIRREL= ..
+-
+-
+-OUT= $(SQUIRREL)/lib/libsquirrel.a
+-INCZ= -I$(SQUIRREL)/include -I. -Iinclude
+-DEFS= 
+-LIB=	
+-
+-OBJS= \
+-	sqapi.o \
+-	sqbaselib.o \
+-	sqcompiler.o \
+-	sqdebug.o \
+-	sqlexer.o \
+-	sqobject.o \
+-	sqparser.o \
+-	sqstate.o \
+-	sqtable.o \
+-	sqvm.o \
+-	sqmem.o \
+-	sqclass.o
+-	
+-SRCS= \
+-	sqapi.cpp \
+-	sqbaselib.cpp \
+-	sqfuncstate.cpp \
+-	sqdebug.cpp \
+-	sqlexer.cpp \
+-	sqobject.cpp \
+-	sqcompiler.cpp \
+-	sqstate.cpp \
+-	sqtable.cpp \
+-	sqmem.cpp \
+-	sqvm.cpp \
+-	sqclass.cpp
+-
+-	
+-	
+-sq32:
+-	gcc -O2  -fno-rtti -Wall -c $(SRCS) $(INCZ) $(DEFS)
+-	ar rc $(OUT) *.o
+-	rm *.o
+-
+-sqprof:
+-	gcc -O2 -pg -fno-rtti -pie -gstabs -g3 -Wall -c $(SRCS) $(INCZ) $(DEFS)
+-	ar rc $(OUT) *.o
+-	rm *.o
+-
+-sq64:
+-	gcc -O2  -D_SQ64 -fno-rtti -Wall -c $(SRCS) $(INCZ) $(DEFS)
+-	ar rc $(OUT) *.o
+-	rm *.o
+diff -Nru SQUIRREL2.orig/squirrel/Makefile.am SQUIRREL2/squirrel/Makefile.am
+--- SQUIRREL2.orig/squirrel/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ SQUIRREL2/squirrel/Makefile.am	2007-07-07 19:03:05.000000000 +0200
 @@ -0,0 +1,38 @@
 +MAINTAINERCLEANFILES = Makefile.in
 +AM_CXXFLAGS = -fno-rtti -Wall
@@ -300,3 +304,19 @@ diff -Nru squirrel-2.2.4/SQUIRREL2.orig/squirrel/Makefile.am SQUIRREL2/squirrel/
 +		sqvm.h
 +
 +INCLUDES = -I$(top_srcdir)/include -I.
+diff -up SQUIRREL2/squirrel.pc.in.autotools SQUIRREL2/squirrel.pc.in
+--- SQUIRREL2/squirrel.pc.in.autotools	2012-01-13 18:50:03.000000000 +0100
++++ SQUIRREL2/squirrel.pc.in	2012-01-13 18:50:11.000000000 +0100
+@@ -0,0 +1,12 @@
++refix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@/squirrel
++
++Name: squirrel
++Description: squirrel library
++Version: @VERSION@
++
++Requires:
++Libs: -L${libdir} -lsquirrel -lsqstdlib
++Cflags: -I${includedir}
diff --git a/squirrel-mem.patch b/squirrel-mem.patch
new file mode 100644
index 0000000..9cdd400
--- /dev/null
+++ b/squirrel-mem.patch
@@ -0,0 +1,36 @@
+diff -up SQUIRREL2/squirrel/sqmem.h.mem SQUIRREL2/squirrel/sqmem.h
+--- SQUIRREL2/squirrel/sqmem.h.mem	2012-01-13 16:59:34.000000000 +0100
++++ SQUIRREL2/squirrel/sqmem.h	2012-01-13 17:00:19.000000000 +0100
+@@ -0,0 +1,8 @@
++/*	see copyright notice in squirrel.h */
++#ifndef _SQMEM_H_
++#define _SQMEM_H_
++
++void *sq_vm_malloc(SQUnsignedInteger size);
++void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
++void sq_vm_free(void *p,SQUnsignedInteger size);
++#endif //_SQMEM_H_
+diff -up SQUIRREL2/squirrel/sqstate.h.mem SQUIRREL2/squirrel/sqstate.h
+--- SQUIRREL2/squirrel/sqstate.h.mem	2012-01-13 16:59:28.000000000 +0100
++++ SQUIRREL2/squirrel/sqstate.h	2012-01-13 16:59:51.000000000 +0100
+@@ -136,8 +136,4 @@ extern SQObjectPtr _one_;
+ extern SQObjectPtr _minusone_;
+ 
+ bool CompileTypemask(SQIntVec &res,const SQChar *typemask);
+-
+-void *sq_vm_malloc(SQUnsignedInteger size);
+-void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
+-void sq_vm_free(void *p,SQUnsignedInteger size);
+ #endif //_SQSTATE_H_
+diff -up SQUIRREL2/squirrel/squtils.h.mem SQUIRREL2/squirrel/squtils.h
+--- SQUIRREL2/squirrel/squtils.h.mem	2012-01-13 16:59:41.000000000 +0100
++++ SQUIRREL2/squirrel/squtils.h	2012-01-13 17:00:01.000000000 +0100
+@@ -2,6 +2,8 @@
+ #ifndef _SQUTILS_H_
+ #define _SQUTILS_H_
+ 
++#include "sqmem.h"
++
+ #define sq_new(__ptr,__type) {__ptr=(__type *)sq_vm_malloc(sizeof(__type));new (__ptr) __type;}
+ #define sq_delete(__ptr,__type) {__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));}
+ #define SQ_MALLOC(__size) sq_vm_malloc((__size));
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/squirrel.git/commitdiff/7985bc2b9e2c35c0027f33b1f3328572102c9d89



More information about the pld-cvs-commit mailing list