Re: [glob2-devel] freetype dependency / SDL_ttf.c

[Leo Wandersleb]

ok. now i aplied the patch from hand again and did

diff -urwbd inArbeit/glob2/libgag/src/Makefile.am y/glob2/libgag/src/Makefile.am 
> SDL_patch.diff
diff -urwbd inArbeit/glob2/configure.in y/glob2/configure.in >> SDL_patch.diff
diff -urwbd inArbeit/glob2/src/Makefile.am y/glob2/src/Makefile.am >> 
SDL_patch.diff

what produced the attached patch.

greetings, Leo

Leo Wandersleb wrote:
> now that i again have this problem and as my brother told me how to aply 
> a patch (patch <sdl_ttf.diff) it doesn't work.
> i will do it manually. can anybody tell me how to make my canges a .diff 
> again?
>
> Greetings, Leo
>
> Stéphane Magnenat wrote:
>
> > Try to apply the patch in annexe that David Schmitt sent some times ago
> >
> > Steph
> >
> >
> >
> > ------------------------------------------------------------------------
> >
> > diff -urwbd glob2-0.8.19.orig/configure.in glob2-0.8.19/configure.in
> > --- glob2-0.8.19.orig/configure.in    2006-03-12 17:24:02.000000000 +0100
> > +++ glob2-0.8.19/configure.in    2006-05-09 12:32:22.000000000 +0200
> > @@ -59,7 +59,7 @@
> >  AC_CHECK_LIB(SDL_net, SDLNet_UDP_Open, SDL_LIBS="$SDL_LIBS 
> > -lSDL_net", AC_MSG_ERROR([*** SDL_net library not found !]), $SDL_LIBS)
> >  
> >  dnl Check for FT2
> > -AC_CHECK_FT2
> > +dnl AC_CHECK_FT2
> >  
> >  dnl Check for libvorbis
> >  XIPH_PATH_VORBIS
> > diff -urwbd glob2-0.8.19.orig/libgag/src/Makefile.am 
> > glob2-0.8.19/libgag/src/Makefile.am
> > --- glob2-0.8.19.orig/libgag/src/Makefile.am    2006-01-31 
> > 21:20:49.000000000 +0100
> > +++ glob2-0.8.19/libgag/src/Makefile.am    2006-05-09 
> > 12:32:41.000000000 +0200
> > @@ -14,8 +14,6 @@
> >      StringTable.cpp\
> >      CursorManager.cpp\
> >      SupportFunctions.cpp\
> > -    SDL_ttf.c\
> > -    SDL_ttf.h\
> >      GUIBase.cpp\
> >      GUIList.cpp\
> >      GUIFileList.cpp\
> > @@ -36,4 +34,4 @@
> >      TextStream.cpp\
> >      $(libgag_a_EXTRA_SRC)
> >  
> > -INCLUDES = @FT2_CFLAGS@ @SDL_CFLAGS@ address@hidden@/../include/
> > +INCLUDES = @SDL_CFLAGS@ address@hidden@/../include/
> > diff -urwbd glob2-0.8.19.orig/src/Makefile.am 
> > glob2-0.8.19/src/Makefile.am
> > --- glob2-0.8.19.orig/src/Makefile.am    2006-01-15 18:53:12.000000000 
> > +0100
> > +++ glob2-0.8.19/src/Makefile.am    2006-05-09 12:31:47.000000000 +0200
> > @@ -192,6 +192,6 @@
> >  glob2_LDADD = ../libgag/src/libgag.a -lGL -lGLU -lpthread 
> > $(glob2_static_lib)
> >  LIBS =  else
> > -glob2_LDADD = ../libgag/src/libgag.a @LIBS@ @FT2_LIBS@ @SDL_LIBS@ 
> > @VORBISFILE_LIBS@ @VORBIS_LIBS@ $(glob2_static_lib)
> > +glob2_LDADD = ../libgag/src/libgag.a @LIBS@ @SDL_LIBS@ 
> > @VORBISFILE_LIBS@ @VORBIS_LIBS@ -lSDL_ttf $(glob2_static_lib)
> >  endif
> > -INCLUDES = @FT2_CFLAGS@ @SDL_CFLAGS@ @VORBIS_CFLAGS@ 
> > address@hidden@/../libgag/include
> > +INCLUDES = @SDL_CFLAGS@ @VORBIS_CFLAGS@ address@hidden@/../libgag/include
> >
> >
> > ------------------------------------------------------------------------
> >
> > _______________________________________________
> > glob2-devel mailing list
> > address@hidden
> > http://lists.nongnu.org/mailman/listinfo/glob2-devel
>
>
>
> _______________________________________________
> glob2-devel mailing list
> address@hidden
> http://lists.nongnu.org/mailman/listinfo/glob2-devel
--- inArbeit/glob2/libgag/src/Makefile.am       2006-05-06 20:46:48.000000000 
+0200
+++ y/glob2/libgag/src/Makefile.am      2006-07-09 17:33:09.000000000 +0200
@@ -14,8 +14,6 @@
        StringTable.cpp\
        CursorManager.cpp\
        SupportFunctions.cpp\
-       SDL_ttf.c\
-       SDL_ttf.h\
        GUIBase.cpp\
        GUIList.cpp\
        GUIFileList.cpp\
--- inArbeit/glob2/configure.in 2006-07-09 17:14:45.000000000 +0200
+++ y/glob2/configure.in        2006-07-09 17:33:08.000000000 +0200
@@ -59,7 +59,7 @@
 AC_CHECK_LIB(SDL_net, SDLNet_UDP_Open, SDL_LIBS="$SDL_LIBS -lSDL_net", 
AC_MSG_ERROR([*** SDL_net library not found !]), $SDL_LIBS)
 
 dnl Check for FT2
-AC_CHECK_FT2
+dnl AC_CHECK_FT2
 
 dnl Check for libvorbis
 XIPH_PATH_VORBIS
--- inArbeit/glob2/src/Makefile.am      2006-07-09 15:55:47.000000000 +0200
+++ y/glob2/src/Makefile.am     2006-07-09 17:33:11.000000000 +0200
@@ -202,6 +202,6 @@
 glob2_LDADD = ../libgag/src/libgag.a -lGL -lGLU -lpthread $(glob2_static_lib)
 LIBS = 
 else
-glob2_LDADD = ../libgag/src/libgag.a @LIBS@ @FT2_LIBS@ @SDL_LIBS@ 
@VORBISFILE_LIBS@ @VORBIS_LIBS@ $(glob2_static_lib)
+glob2_LDADD = ../libgag/src/libgag.a @LIBS@ @SDL_LIBS@ @VORBISFILE_LIBS@ 
@VORBIS_LIBS@ -lSDL_ttf $(glob2_static_lib)
 endif
 INCLUDES = @FT2_CFLAGS@ @SDL_CFLAGS@ @VORBIS_CFLAGS@ 
address@hidden@/../libgag/include