summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2011-04-05 09:51:26 +0000
committerAlfredo Tupone <tupone@gentoo.org>2011-04-05 09:51:26 +0000
commit4093da2fa9e273892f6ba7418c46ba7a65b1894d (patch)
tree214c038a3f1ae9bbbf046d8d5a63685161fd8376 /games-simulation
parentadd virtual/libiconv to DEPEND - bug #354295 (diff)
downloadhistorical-4093da2fa9e273892f6ba7418c46ba7a65b1894d.tar.gz
historical-4093da2fa9e273892f6ba7418c46ba7a65b1894d.tar.bz2
historical-4093da2fa9e273892f6ba7418c46ba7a65b1894d.zip
Fix slot change in x11-libs/fltk. Bug #361833
Package-Manager: portage-2.1.9.42/cvs/Linux x86_64
Diffstat (limited to 'games-simulation')
-rw-r--r--games-simulation/crashtest/ChangeLog6
-rw-r--r--games-simulation/crashtest/Manifest10
-rw-r--r--games-simulation/crashtest/files/crashtest-1.1-gentoo.patch26
3 files changed, 12 insertions, 30 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/Manifest b/games-simulation/crashtest/Manifest
index c61ba16e9d45..23cce7a3ae21 100644
--- a/games-simulation/crashtest/Manifest
+++ b/games-simulation/crashtest/Manifest
@@ -1,15 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX crashtest-1.1-gentoo.patch 3678 RMD160 636c92221039e177ad87930813bbd9d67da7e1e0 SHA1 d7a1fd872587275c78d8e02dcce28adeb2b449f9 SHA256 4944ae160b3f256c1f064cc1f4bac30abe9e85566f4efc486cd3de09f9f9733e
+AUX crashtest-1.1-gentoo.patch 3113 RMD160 4f9ea99e445fe182a1994af43bcfc72664d78196 SHA1 c361cb9d7e90ebaed199f1468e728c723af9f648 SHA256 b12d90274cd0e3bab1e349cec60e58b41fcad8b7a8e179414ceda2233d20c4e4
DIST crashtest-1.1.tar.gz 134769 RMD160 5144a130e78eeb3de7171abd25c180af3800af04 SHA1 fb6bcbfd5eaf86b2dc92dafb4ff191013a19be67 SHA256 55c5ce29857263ceebc1c3f42c153f275dfc47711e9248395fd4398d6ef52ab9
EBUILD crashtest-1.1.ebuild 1062 RMD160 94943014eb486ad0c435d9e50c7a6d0433801a4e SHA1 eeaf24cea4a29b2ee56388abadd0e6929036cff8 SHA256 b518a08cf284c5615795afef2fbd2fedf8c2ed6ba0642f5f23a2cca06cce09e1
-MISC ChangeLog 1423 RMD160 e420120642ca4d406b17b568f9a0b1af163c3347 SHA1 6f06ec74b68b50866957d7d99a9bf5a587451041 SHA256 f0e93472b69e7cd787806ddd18fe4370b2a8b20d39062bcc8ae69860f2268f38
+MISC ChangeLog 1577 RMD160 f6cd2b09665e0e8dba0b3cb069adae6d9c262d8a SHA1 6aab32504cd49b8b152d50c7c60c4799277fb877 SHA256 6fcde820f1e7c39d553e6b934a33e73da67239086bef9838147d38d4be42f9a2
MISC metadata.xml 471 RMD160 5ba1a7080b163839fdde2dd0de2bdd3ca9c23976 SHA1 ce199d60ce53ba9e2dde890ed56ee14bbbcd678a SHA256 b19704a1460e3b85a2725fcb2172b87c8c5a452fd6d1d5c509077deb7b62504e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2GYMQACgkQgAnW8HDreRZvNACfXg7WqAZmyXGGjUA5s3XNECB+
-xLcAniX6FHMBuYjVAcdfO22LVxZr99Kh
-=yLeN
+iEYEARECAAYFAk2a5lsACgkQIY77eQFFFC1g4ACguvBMoK1KWmQDCwukOchEPGnc
+8PUAmwd7hJUJFC6fA3tprI9jkVHdRUSI
+=AZA/
-----END PGP SIGNATURE-----
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[])