rpms/Io-language/devel Io-2007-10-10-gcc43.patch, NONE, 1.1 Io-language.spec, 1.3, 1.4

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/Io-language/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9753

Modified Files:
	Io-language.spec 
Added Files:
	Io-2007-10-10-gcc43.patch 
Log Message:
* Sat Jan 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 20071010-2
- Fix compilation with gcc 4.3
- Enable Cairo addon


Io-2007-10-10-gcc43.patch:

--- NEW FILE Io-2007-10-10-gcc43.patch ---
--- Io-2007-10-10/libs/iovm/source/IoState_inline.h	2007-09-23 04:09:53.000000000 +0200
+++ Io-2007-10-10.new/libs/iovm/source/IoState_inline.h	2008-01-12 11:57:52.000000000 +0100
@@ -3,6 +3,9 @@
 docLicense("BSD revised")
 */
 
+#ifndef __IOSTATE_INLINE_H
+#define __IOSTATE_INLINE_H
+
 #ifdef IOSTATE_C
 #define IO_IN_C_FILE
 #endif
@@ -33,8 +36,6 @@
 #define IOFAILURE(self) IOFALSE(self)
 #define ISFAILURE(self) ISFALSE(self)
 
-inline IoObject *IOBOOL(IoObject *self, int b);
-
 #if !defined(IoObjectDataDefined)
 typedef struct IoObjectData IoObjectData;
 #endif
@@ -59,7 +60,7 @@
 	return self == IOSTATE->ioNil || self == IOSTATE->ioFalse;
 }
 
-IOINLINE IoObject *IOBOOL(IoObject *self, int b)
+static inline IoObject *IOBOOL(IoObject *self, int b)
 {
 	return b ? IOTRUE(self) : IOFALSE(self);
 }
@@ -322,6 +323,8 @@
 }
 
 
+#endif /* IO_DECLARE_INLINES */
+
 #undef IO_IN_C_FILE
-#endif
 
+#endif


Index: Io-language.spec
===================================================================
RCS file: /cvs/extras/rpms/Io-language/devel/Io-language.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Io-language.spec	12 Nov 2007 09:29:54 -0000	1.3
+++ Io-language.spec	12 Jan 2008 11:10:15 -0000	1.4
@@ -9,20 +9,21 @@
  
 Name:           Io-language
 Version:        20071010
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Io is a small, prototype-based programming language
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.iolanguage.com/
 Source0:        http://io.urbanape.com/release/Io-%{_version}.tar.gz
 Patch0:         AddonBuilder_io_libdir.patch
+Patch1:         Io-2007-10-10-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  e2fsprogs-devel freetype-devel freeglut-devel gmp-devel
 BuildRequires:  libedit-devel libevent-devel libjpeg-devel libpng-devel
 BuildRequires:  libsamplerate-devel libsndfile-devel libtiff-devel
 BuildRequires:  libxml2-devel mysql-devel ode-devel opensp-devel pcre-devel
 BuildRequires:  portaudio-devel postgresql-devel python-devel soundtouch-devel
-BuildRequires:  sqlite-devel taglib-devel ncurses-devel
+BuildRequires:  sqlite-devel taglib-devel ncurses-devel cairo-devel
 
 %description
 Io is a small, prototype-based programming language. The ideas in
@@ -84,6 +85,7 @@
 %prep
 %setup -q -n Io-%{_version}
 %patch0 -p1
+%patch1 -p1
 sed -i 's|/lib/io/addons|/%{_lib}/io/addons|g' libs/iovm/io/AddonLoader.io
 # building Io while Io-language-devel is installed results in binaries getting
 # linked against the installed version, instead of the just build one <sigh>
@@ -93,6 +95,8 @@
 fi
 # libstdc++.so is searched and not found ...
 sed -i -e 's|dependsOnLib("stdc++")||g' addons/SoundTouch/build.io
+# remove add-ons which we do not which to build ever
+rm -fr addons/AVCodec
 # for %doc
 rm docs/guide_files/.htmle
 mv addons/OpenGL/docs OpenGL
@@ -151,6 +155,7 @@
 %{_libdir}/io/addons/BigNum
 %{_libdir}/io/addons/Blowfish
 %{_libdir}/io/addons/Box
+%{_libdir}/io/addons/Cairo 
 %{_libdir}/io/addons/CGI
 %{_libdir}/io/addons/ContinuedFraction
 %{_libdir}/io/addons/Curses
@@ -208,6 +213,10 @@
 
 
 %changelog
+* Sat Jan 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 20071010-2
+- Fix compilation with gcc 4.3
+- Enable Cairo addon
+
 * Sun Nov 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 20071010-1
 - New (official!) upstream release 2007-10-10
 - API changed, soname bumped to libiovmall.so.1