diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2011-04-05 09:51:26 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2011-04-05 09:51:26 +0000 |
| commit | 2c7dadbe6d10a78169d8d85dd9c318c31cb0f7ba (patch) | |
| tree | bb5bbacde76e64351856e76bb6b5fbc6807848af /games-simulation | |
| parent | add virtual/libiconv to DEPEND - bug #354295 (diff) | |
| download | gentoo-2-2c7dadbe6d10a78169d8d85dd9c318c31cb0f7ba.tar.gz gentoo-2-2c7dadbe6d10a78169d8d85dd9c318c31cb0f7ba.tar.bz2 gentoo-2-2c7dadbe6d10a78169d8d85dd9c318c31cb0f7ba.zip | |
Fix slot change in x11-libs/fltk. Bug #361833
(Portage version: 2.1.9.42/cvs/Linux x86_64)
Diffstat (limited to 'games-simulation')
| -rw-r--r-- | games-simulation/crashtest/ChangeLog | 6 | ||||
| -rw-r--r-- | games-simulation/crashtest/files/crashtest-1.1-gentoo.patch | 26 |
2 files changed, 7 insertions, 25 deletions
diff --git a/games-simulation/crashtest/ChangeLog b/games-simulation/crashtest/ChangeLog index 0897a9151d9b..7e6e60193c01 100644 --- a/games-simulation/crashtest/ChangeLog +++ b/games-simulation/crashtest/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-simulation/crashtest # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-simulation/crashtest/ChangeLog,v 1.9 2011/03/20 20:17:03 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-simulation/crashtest/ChangeLog,v 1.10 2011/04/05 09:51:25 tupone Exp $ + + 05 Apr 2011; Alfredo Tupone <tupone@gentoo.org> + files/crashtest-1.1-gentoo.patch: + Fix slot change in x11-libs/fltk. Bug #361833 by Mr. Anderson 20 Mar 2011; Justin Lecher <jlec@gentoo.org> crashtest-1.1.ebuild: x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly diff --git a/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch b/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch index 2a0bf629c35f..566c97171887 100644 --- a/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch +++ b/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch @@ -1,7 +1,7 @@ diff -ru crashtest-1.1.orig/src-crashtest/Makefile crashtest-1.1/src-crashtest/Makefile --- crashtest-1.1.orig/src-crashtest/Makefile 2009-02-15 17:11:31.000000000 -0500 +++ crashtest-1.1/src-crashtest/Makefile 2009-10-14 01:00:13.900627555 -0400 -@@ -1,34 +1,11 @@ +@@ -1,34 +1,12 @@ -# EDIT THESE SETTINGS - -PLIBPREFIX=/usr @@ -25,6 +25,7 @@ diff -ru crashtest-1.1.orig/src-crashtest/Makefile crashtest-1.1/src-crashtest/M - -L/usr/X11R6/lib - OBJS=staticworldobject.o crashtest.o dynamicobject.o cartobject.o ++CXXFLAGS+=-I `fltk-config --includedir` -LIBS= $(ODEPREFIX)/lib/libode.a -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul -lGLU -lGL `fltk-config --use-gl --use-images --ldflags` - @@ -71,29 +72,6 @@ diff -ru crashtest-1.1.orig/src-crashtest/Makefile crashtest-1.1/src-crashtest/M diff -ru crashtest-1.1.orig/src-crashtest/crashtest.cxx crashtest-1.1/src-crashtest/crashtest.cxx --- crashtest-1.1.orig/src-crashtest/crashtest.cxx 2009-02-15 17:08:24.000000000 -0500 +++ crashtest-1.1/src-crashtest/crashtest.cxx 2009-10-14 01:01:25.822753522 -0400 -@@ -15,14 +15,14 @@ - #include <GL/glu.h> - #endif - --#include <FL/Fl.H> --#include <FL/Fl_Box.H> --#include <FL/Fl_Button.H> --#include <FL/Fl_Check_Button.H> --#include <FL/Fl_Chart.H> --#include <FL/Fl_Value_Slider.H> --#include <FL/Fl_Gl_Window.H> --#include <FL/fl_draw.H> -+#include <fltk-1.1/FL/Fl.H> -+#include <fltk-1.1/FL/Fl_Box.H> -+#include <fltk-1.1/FL/Fl_Button.H> -+#include <fltk-1.1/FL/Fl_Check_Button.H> -+#include <fltk-1.1/FL/Fl_Chart.H> -+#include <fltk-1.1/FL/Fl_Value_Slider.H> -+#include <fltk-1.1/FL/Fl_Gl_Window.H> -+#include <fltk-1.1/FL/fl_draw.H> - - #include <plib/ssg.h> - #include <plib/ul.h> @@ -615,13 +615,7 @@ int main(int argc, char *argv[]) |