From a887a0853d9dac32db1b928af5e7c812ee646104 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 22 May 2009 12:54:50 +0000 Subject: [PATCH] - Rebuild for new ftgl (#501323) --- sdljava-0.9.1-ftgl213.patch | 35 +++++++++++++++++++++++++++++++++++ sdljava.spec | 2 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 sdljava-0.9.1-ftgl213.patch diff --git a/sdljava-0.9.1-ftgl213.patch b/sdljava-0.9.1-ftgl213.patch new file mode 100644 index 0000000..c08c021 --- /dev/null +++ b/sdljava-0.9.1-ftgl213.patch @@ -0,0 +1,35 @@ +diff -up sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTFont.i~ sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTFont.i +--- sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTFont.i~ 2005-02-20 23:19:13.000000000 +0100 ++++ sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTFont.i 2009-05-22 12:52:37.000000000 +0200 +@@ -1,5 +1,3 @@ +-%feature("notabstract") FTFont; +- + class FTFont + { + public: +diff -up sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTGL.i~ sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTGL.i +--- sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTGL.i~ 2005-02-20 23:19:13.000000000 +0100 ++++ sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTGL.i 2009-05-22 12:55:12.000000000 +0200 +@@ -1,13 +1,6 @@ + %module SWIG_FTGL + %{ +- #include "FTFont.h" +- #include "FTFace.h" +- #include "FTGLBitmapFont.h" +- #include "FTGLExtrdFont.h" +- #include "FTGLOutlineFont.h" +- #include "FTGLPixmapFont.h" +- #include "FTGLPolygonFont.h" +- #include "FTGLTextureFont.h" ++ #include + + void SWIG_BBox(const char* string, FTFont* font, float* llx, float* lly, float* llz, float* urx, float* ury, float* urz) { + font->BBox(string, *llx, *lly, *llz, *urx, *ury, *urz); +@@ -35,7 +28,6 @@ + typedef int FT_Error; + + %include "FTFont.i" +-%include "FTFace.i" + %include "FTGLBitmapFont.i" + %include "FTGLExtrdFont.i" + %include "FTGLOutlineFont.i" diff --git a/sdljava.spec b/sdljava.spec index bcd64c7..6d982f1 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -21,7 +21,7 @@ Patch1: sdljava-0.9.1-ftgl213.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ftgl-devel glew-devel SDL-devel SDL_gfx-devel SDL_image-devel BuildRequires: SDL_mixer-devel SDL_ttf-devel java-gcj-compat-devel -BuildRequires: java-javadoc ant xml-commons-apis swig bsh jdom +BuildRequires: java-javadoc ant xml-commons-apis swig bsh jdom ruby Requires: bsh jdom %description