diff --git a/k3d-0.6.7-gcc43.patch b/k3d-0.6.7-gcc43.patch new file mode 100644 index 0000000..4004658 --- /dev/null +++ b/k3d-0.6.7-gcc43.patch @@ -0,0 +1,206 @@ +--- k3d-0.6.7.0/renderjob/main.cpp~ 2007-01-23 05:06:33.000000000 +0100 ++++ k3d-0.6.7.0/renderjob/main.cpp 2008-02-16 15:07:18.000000000 +0100 +@@ -31,6 +31,7 @@ + + #include + #include ++#include + + namespace + { +--- k3d-0.6.7.0/hapy/src/Assert.cc~ 2004-01-12 15:21:41.000000000 +0100 ++++ k3d-0.6.7.0/hapy/src/Assert.cc 2008-02-16 14:10:50.000000000 +0100 +@@ -5,6 +5,7 @@ + #include + + #include ++#include + #include + + +--- k3d-0.6.7.0/hapy/src/RuleId.cc~ 2004-02-12 11:04:59.000000000 +0100 ++++ k3d-0.6.7.0/hapy/src/RuleId.cc 2008-02-16 14:11:57.000000000 +0100 +@@ -1,5 +1,7 @@ + /* Hapy is a public domain software. See Hapy README file for the details. */ + ++#include ++ + #include + #include + #include +--- k3d-0.6.7.0/surface_polygonizer/jules_bloomenthal.cpp~ 2005-11-24 21:19:23.000000000 +0100 ++++ k3d-0.6.7.0/surface_polygonizer/jules_bloomenthal.cpp 2008-02-16 15:10:39.000000000 +0100 +@@ -25,6 +25,7 @@ + #include "jules_bloomenthal.h" + + #include ++#include + + // Number of iterations (convergence) + const int RES = 10; +--- k3d-0.6.7.0/ngui/entry.h~ 2006-06-17 21:05:48.000000000 +0200 ++++ k3d-0.6.7.0/ngui/entry.h 2008-02-16 14:46:05.000000000 +0100 +@@ -31,6 +31,8 @@ + #include + #include + ++#include ++ + namespace k3d { class istate_recorder; } + + namespace libk3dngui +--- k3d-0.6.7.0/ngui/angle_axis_control.h~ 2006-06-17 21:05:47.000000000 +0200 ++++ k3d-0.6.7.0/ngui/angle_axis_control.h 2008-02-16 14:44:56.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + ++#include + #include + + namespace Gtk { class Button; } +--- k3d-0.6.7.0/ngui/ui_component.h~ 2006-06-17 21:05:51.000000000 +0200 ++++ k3d-0.6.7.0/ngui/ui_component.h 2008-02-16 14:49:23.000000000 +0100 +@@ -22,6 +22,8 @@ + + #include + ++#include ++ + namespace Glib { class ustring; } + namespace Gtk { class Tooltips; } + +--- k3d-0.6.7.0/ngui/bitmap_preview.h~ 2006-07-05 06:49:43.000000000 +0200 ++++ k3d-0.6.7.0/ngui/bitmap_preview.h 2008-02-16 14:47:25.000000000 +0100 +@@ -31,6 +31,8 @@ + + #include + ++#include ++ + namespace Gtk { class Image; } + namespace k3d { class idag; } + namespace k3d { class iproperty; } +--- k3d-0.6.7.0/ngui/bounding_box.h~ 2006-06-17 21:05:47.000000000 +0200 ++++ k3d-0.6.7.0/ngui/bounding_box.h 2008-02-16 14:48:10.000000000 +0100 +@@ -31,6 +31,8 @@ + + #include + ++#include ++ + // Forward declarations + namespace Gtk { class Button; } + namespace k3d { class iproperty; } +--- k3d-0.6.7.0/modules/bitmap/bitmap_element.h~ 2006-08-05 06:25:11.000000000 +0200 ++++ k3d-0.6.7.0/modules/bitmap/bitmap_element.h 2008-02-16 15:16:05.000000000 +0100 +@@ -27,6 +27,8 @@ + #include + #include + ++#include ++ + namespace libk3dbitmap + { + +--- k3d-0.6.7.0/k3dsdk/log_control.h~ 2007-01-06 20:58:14.000000000 +0100 ++++ k3d-0.6.7.0/k3dsdk/log_control.h 2008-02-16 14:28:27.000000000 +0100 +@@ -22,6 +22,8 @@ + + #include "signal_system.h" + ++#include ++ + namespace k3d + { + +--- k3d-0.6.7.0/k3dsdk/log.cpp~ 2007-01-12 07:10:05.000000000 +0100 ++++ k3d-0.6.7.0/k3dsdk/log.cpp 2008-02-16 14:23:23.000000000 +0100 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #ifdef K3D_PLATFORM_WIN32 + +--- k3d-0.6.7.0/k3dsdk/algebra.h~ 2006-03-16 16:23:14.000000000 +0100 ++++ k3d-0.6.7.0/k3dsdk/algebra.h 2008-02-16 14:14:05.000000000 +0100 +@@ -30,6 +30,7 @@ + #include "vectors.h" + + #include ++#include + + /**************************************************************** + * +--- k3d-0.6.7.0/k3dsdk/socket.cpp~ 2006-10-06 06:24:56.000000000 +0200 ++++ k3d-0.6.7.0/k3dsdk/socket.cpp 2008-02-16 14:34:30.000000000 +0100 +@@ -24,6 +24,7 @@ + #include "result.h" + #include "socket.h" + #include "string_cast.h" ++#include + + #ifdef K3D_PLATFORM_WIN32 + +--- k3d-0.6.7.0/k3dsdk/gl_info.cpp~ 2004-12-19 01:39:24.000000000 +0100 ++++ k3d-0.6.7.0/k3dsdk/gl_info.cpp 2008-02-16 14:19:37.000000000 +0100 +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + namespace k3d + { +--- k3d-0.6.7.0/k3dsdk/explicit_snap_target.cpp~ 2006-02-15 03:31:06.000000000 +0100 ++++ k3d-0.6.7.0/k3dsdk/explicit_snap_target.cpp 2008-02-16 14:16:47.000000000 +0100 +@@ -25,6 +25,8 @@ + #include "result.h" + #include "vectors.h" + ++#include ++ + namespace k3d + { + +--- k3d-0.6.7.0/k3dsdk/explicit_snap_source.cpp~ 2006-02-15 03:31:06.000000000 +0100 ++++ k3d-0.6.7.0/k3dsdk/explicit_snap_source.cpp 2008-02-16 14:16:13.000000000 +0100 +@@ -25,6 +25,8 @@ + #include "result.h" + #include "vectors.h" + ++#include ++ + namespace k3d + { + +--- k3d-0.6.7.0/k3dsdk/bitmap.h~ 2006-08-05 06:22:03.000000000 +0200 ++++ k3d-0.6.7.0/k3dsdk/bitmap.h 2008-02-16 15:19:38.000000000 +0100 +@@ -31,7 +31,7 @@ + #include + #include + #include +-#include ++#include + + namespace k3d + { +--- diff.pl~ 2008-02-16 15:00:26.000000000 +0100 ++++ diff.pl 2008-02-16 15:01:58.000000000 +0100 +@@ -9,11 +9,12 @@ + chomp; + + my $str = $_; ++ if ($str =~ /\.\/(.*)/) { $str = $1; } + +- my $str2 = $_; ++ my $str2 = $str; + if ( $str2 =~ /(.*)\~/) { $str2 = $1; } + +- print "diff -u $str $str2\n"; ++ print `diff -u $str $str2`; + } + + close(FOO); diff --git a/k3d.spec b/k3d.spec index 35d842e..a639461 100644 --- a/k3d.spec +++ b/k3d.spec @@ -1,7 +1,7 @@ Name: k3d Version: 0.6.7.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A 3D Modeling, Animation and Rendering System Group: Applications/Multimedia @@ -11,6 +11,7 @@ Source0: http://dl.sourceforge.net/k3d/k3d-%{version}-src.tar.bz2 Patch0: k3d-0.5.15.0-gl64.patch Patch1: k3d-0.6.6.0-vfs.patch Patch2: k3d-0.6.7.0-desktop.patch +Patch3: k3d-0.6.7.0-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: aqsis @@ -75,6 +76,7 @@ This package contains examples of K-3D documents. %patch0 -p1 -b .gl64 %patch1 -p1 -b .vfs %patch2 -p1 -b .desktop +%patch3 -p1 -b .gcc43 %build @@ -157,6 +159,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Sat Feb 16 2008 Denis Leroy - 0.6.7.0-5 +- Added patch for gcc 4.3 rebuild + * Mon Oct 15 2007 Denis Leroy - 0.6.7.0-4 - Rebuild for OpenEXR 1.6