From 3fc21bb37f357e33117757725db746d926be9490 Mon Sep 17 00:00:00 2001 From: corsepiu Date: May 14 2010 14:03:02 +0000 Subject: - Upstream update. --- diff --git a/.cvsignore b/.cvsignore index c11d6f8..9014b3f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -k3d-source-0.7.11.0.tar.gz +k3d-source-0.8.0.1.tar.bz2 diff --git a/k3d-0.7.10.0-warn.patch b/k3d-0.7.10.0-warn.patch deleted file mode 100644 index d5e81eb..0000000 --- a/k3d-0.7.10.0-warn.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- k3d-source-0.7.10.0/share/shaders/k3d_functions.h~ 2008-12-14 22:03:49.000000000 +0100 -+++ k3d-source-0.7.10.0/share/shaders/k3d_functions.h 2009-03-10 09:00:30.000000000 +0100 -@@ -24,10 +24,3 @@ - - /* separate fuzzes */ - #define smoothPulse2Fuzz(a, b, afuzz, bfuzz, loc) (smoothstep (a-afuzz, a, loc) - smoothstep (b, b+bfuzz, loc)) -- -- -- -- -- -- -- -\ No newline at end of file diff --git a/k3d-0.7.11.0-fontpath.patch b/k3d-0.7.11.0-fontpath.patch deleted file mode 100644 index 97ff3fb..0000000 --- a/k3d-0.7.11.0-fontpath.patch +++ /dev/null @@ -1,146 +0,0 @@ -diff -ru k3d-source-0.7.11.0.orig/modules/annotation/annotation_2d.cpp k3d-source-0.7.11.0/modules/annotation/annotation_2d.cpp ---- k3d-source-0.7.11.0.orig/modules/annotation/annotation_2d.cpp 2009-03-22 21:57:00.000000000 +0100 -+++ k3d-source-0.7.11.0/modules/annotation/annotation_2d.cpp 2009-03-22 21:59:58.000000000 +0100 -@@ -57,7 +57,7 @@ - public: - annotation_2d(k3d::iplugin_factory& Factory, k3d::idocument& Document) : - base(Factory, Document), -- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), -+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), - m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)), - m_line_width(init_owner(*this) + init_name("line_width") + init_label(_("Line Width")) + init_description(_("Maximum width of a single line of text..")) + init_value(200.0)), - m_line_spacing(init_owner(*this) + init_name("line_spacing") + init_label(_("Line Spacing")) + init_description(_("Controls the spacing between lines of text.")) + init_value(1.0)), -diff -ru k3d-source-0.7.11.0.orig/modules/annotation/annotation_3d.cpp k3d-source-0.7.11.0/modules/annotation/annotation_3d.cpp ---- k3d-source-0.7.11.0.orig/modules/annotation/annotation_3d.cpp 2009-03-22 21:57:00.000000000 +0100 -+++ k3d-source-0.7.11.0/modules/annotation/annotation_3d.cpp 2009-03-22 21:59:58.000000000 +0100 -@@ -57,7 +57,7 @@ - public: - annotation_3d(k3d::iplugin_factory& Factory, k3d::idocument& Document) : - base(Factory, Document), -- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), -+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), - m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)), - m_line_width(init_owner(*this) + init_name("line_width") + init_label(_("Line Width")) + init_description(_("Maximum width of a single line of text..")) + init_value(200.0)), - m_line_spacing(init_owner(*this) + init_name("line_spacing") + init_label(_("Line Spacing")) + init_description(_("Controls the spacing between lines of text.")) + init_value(1.0)), -diff -ru k3d-source-0.7.11.0.orig/modules/annotation/annotation.cpp k3d-source-0.7.11.0/modules/annotation/annotation.cpp ---- k3d-source-0.7.11.0.orig/modules/annotation/annotation.cpp 2009-03-22 21:57:00.000000000 +0100 -+++ k3d-source-0.7.11.0/modules/annotation/annotation.cpp 2009-03-22 21:59:58.000000000 +0100 -@@ -55,7 +55,7 @@ - public: - annotation(k3d::iplugin_factory& Factory, k3d::idocument& Document) : - base(Factory, Document), -- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), -+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), - m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)), - m_line_width(init_owner(*this) + init_name("line_width") + init_label(_("Line Width")) + init_description(_("Maximum width of a single line of text..")) + init_value(200.0)), - m_line_spacing(init_owner(*this) + init_name("line_spacing") + init_label(_("Line Spacing")) + init_description(_("Controls the spacing between lines of text.")) + init_value(1.0)), -diff -ru k3d-source-0.7.11.0.orig/modules/core/axes.cpp k3d-source-0.7.11.0/modules/core/axes.cpp ---- k3d-source-0.7.11.0.orig/modules/core/axes.cpp 2009-03-22 21:57:00.000000000 +0100 -+++ k3d-source-0.7.11.0/modules/core/axes.cpp 2009-03-22 21:59:58.000000000 +0100 -@@ -67,7 +67,7 @@ - m_y_color(init_owner(*this) + init_name("ycolor") + init_label(_("Y Color")) + init_description(_("Y axis color")) + init_value(k3d::color(0, 0.7, 0))), - m_z_color(init_owner(*this) + init_name("zcolor") + init_label(_("Z Color")) + init_description(_("Z axis color")) + init_value(k3d::color(0, 0, 0.7))), - m_grid_color(init_owner(*this) + init_name("gridcolor") + init_label(_("Grid Color")) + init_description(_("Grid color")) + init_value(k3d::color(0.4, 0.4, 0.4))), -- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/Vera.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), -+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/Vera.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), - m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(12.0)) - { - m_axes.changed_signal().connect(make_async_redraw_slot()); -diff -ru k3d-source-0.7.11.0.orig/modules/freetype2/poly_text.cpp k3d-source-0.7.11.0/modules/freetype2/poly_text.cpp ---- k3d-source-0.7.11.0.orig/modules/freetype2/poly_text.cpp 2009-03-22 21:57:00.000000000 +0100 -+++ k3d-source-0.7.11.0/modules/freetype2/poly_text.cpp 2009-03-22 21:59:58.000000000 +0100 -@@ -51,7 +51,7 @@ - - const k3d::filesystem::path default_font() - { -- return k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf"); -+ return k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf"); - } - - /// Defines a closed contour -diff -ru k3d-source-0.7.11.0.orig/modules/opengl_painters/edge_numbering_painter.cpp k3d-source-0.7.11.0/modules/opengl_painters/edge_numbering_painter.cpp ---- k3d-source-0.7.11.0.orig/modules/opengl_painters/edge_numbering_painter.cpp 2009-03-22 21:57:00.000000000 +0100 -+++ k3d-source-0.7.11.0/modules/opengl_painters/edge_numbering_painter.cpp 2009-03-22 21:59:58.000000000 +0100 -@@ -57,7 +57,7 @@ - public: - edge_numbering_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) : - base(Factory, Document), -- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), -+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), - m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)), - m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)), - m_draw_selected(init_owner(*this) + init_name("draw_selected") + init_label(_("Draw Selected")) + init_description(_("Draw normals for selected polygons.")) + init_value(true)), -diff -ru k3d-source-0.7.11.0.orig/modules/opengl_painters/face_numbering_painter.cpp k3d-source-0.7.11.0/modules/opengl_painters/face_numbering_painter.cpp ---- k3d-source-0.7.11.0.orig/modules/opengl_painters/face_numbering_painter.cpp 2009-03-22 21:57:00.000000000 +0100 -+++ k3d-source-0.7.11.0/modules/opengl_painters/face_numbering_painter.cpp 2009-03-22 21:59:58.000000000 +0100 -@@ -57,7 +57,7 @@ - public: - face_numbering_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) : - base(Factory, Document), -- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), -+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), - m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)), - m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)), - m_draw_selected(init_owner(*this) + init_name("draw_selected") + init_label(_("Draw Selected")) + init_description(_("Draw normals for selected polygons")) + init_value(true)), -diff -ru k3d-source-0.7.11.0.orig/modules/opengl_painters/nurbs_curve_numbering_painter.cpp k3d-source-0.7.11.0/modules/opengl_painters/nurbs_curve_numbering_painter.cpp ---- k3d-source-0.7.11.0.orig/modules/opengl_painters/nurbs_curve_numbering_painter.cpp 2009-03-22 21:57:00.000000000 +0100 -+++ k3d-source-0.7.11.0/modules/opengl_painters/nurbs_curve_numbering_painter.cpp 2009-03-22 21:59:58.000000000 +0100 -@@ -57,7 +57,7 @@ - public: - nurbs_curve_numbering_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) : - base(Factory, Document), -- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), -+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), - m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)), - m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)), - m_draw_selected(init_owner(*this) + init_name("draw_selected") + init_label(_("Draw Selected")) + init_description(_("Draw normals for selected curves.")) + init_value(true)), -diff -ru k3d-source-0.7.11.0.orig/modules/opengl_painters/nurbs_patch_numbering_painter.cpp k3d-source-0.7.11.0/modules/opengl_painters/nurbs_patch_numbering_painter.cpp ---- k3d-source-0.7.11.0.orig/modules/opengl_painters/nurbs_patch_numbering_painter.cpp 2009-03-22 21:57:00.000000000 +0100 -+++ k3d-source-0.7.11.0/modules/opengl_painters/nurbs_patch_numbering_painter.cpp 2009-03-22 21:59:58.000000000 +0100 -@@ -57,7 +57,7 @@ - public: - nurbs_patch_numbering_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) : - base(Factory, Document), -- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), -+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), - m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)), - m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)), - m_draw_selected(init_owner(*this) + init_name("draw_selected") + init_label(_("Draw Selected")) + init_description(_("Draw normals for selected patches.")) + init_value(true)), -diff -ru k3d-source-0.7.11.0.orig/modules/opengl_painters/point_numbering_painter.cpp k3d-source-0.7.11.0/modules/opengl_painters/point_numbering_painter.cpp ---- k3d-source-0.7.11.0.orig/modules/opengl_painters/point_numbering_painter.cpp 2009-03-22 21:57:00.000000000 +0100 -+++ k3d-source-0.7.11.0/modules/opengl_painters/point_numbering_painter.cpp 2009-03-22 21:59:58.000000000 +0100 -@@ -56,7 +56,7 @@ - public: - point_numbering_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) : - base(Factory, Document), -- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), -+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), - m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)), - m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)), - m_draw_selected(init_owner(*this) + init_name("draw_selected") + init_label(_("Draw Selected")) + init_description(_("Draw normals for selected polygons")) + init_value(true)), -Only in k3d-source-0.7.11.0/modules/opengl_painters: point_numbering_painter.cpp.orig -diff -ru k3d-source-0.7.11.0.orig/modules/opengl_painters/varying_data_painter.cpp k3d-source-0.7.11.0/modules/opengl_painters/varying_data_painter.cpp ---- k3d-source-0.7.11.0.orig/modules/opengl_painters/varying_data_painter.cpp 2009-03-22 21:57:00.000000000 +0100 -+++ k3d-source-0.7.11.0/modules/opengl_painters/varying_data_painter.cpp 2009-03-22 21:59:58.000000000 +0100 -@@ -82,7 +82,7 @@ - public: - varying_data_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) : - base(Factory, Document), -- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), -+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), - m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)), - m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)), - m_color(init_owner(*this) + init_name("color") + init_label(_("Color")) + init_description(_("Color of the text")) + init_value(k3d::color(0, 1, 0))), -diff -ru k3d-source-0.7.11.0.orig/modules/opengl_painters/vertex_data_painter.cpp k3d-source-0.7.11.0/modules/opengl_painters/vertex_data_painter.cpp ---- k3d-source-0.7.11.0.orig/modules/opengl_painters/vertex_data_painter.cpp 2009-03-22 21:57:00.000000000 +0100 -+++ k3d-source-0.7.11.0/modules/opengl_painters/vertex_data_painter.cpp 2009-03-22 21:59:58.000000000 +0100 -@@ -79,7 +79,7 @@ - public: - vertex_data_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) : - base(Factory, Document), -- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), -+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), - m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)), - m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)), - m_color(init_owner(*this) + init_name("color") + init_label(_("Color")) + init_description(_("Color of the numbers")) + init_value(k3d::color(0.5, 0, 0))), -Only in k3d-source-0.7.11.0/modules/opengl_painters: vertex_data_painter.cpp.orig diff --git a/k3d-0.7.11.0-gcc44.patch b/k3d-0.7.11.0-gcc44.patch deleted file mode 100644 index 6917170..0000000 --- a/k3d-0.7.11.0-gcc44.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- k3d-source-0.7.11.0/k3dsdk/gzstream.cpp~ 2009-03-19 21:28:50.000000000 +0100 -+++ k3d-source-0.7.11.0/k3dsdk/gzstream.cpp 2009-03-22 22:19:03.000000000 +0100 -@@ -29,6 +29,7 @@ - #include "gzstream.h" - #include "path.h" - -+#include - #include - #include - ---- k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/color_base_algorithm.hpp~ 2009-03-19 21:28:53.000000000 +0100 -+++ k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/color_base_algorithm.hpp 2009-03-22 22:33:45.000000000 +0100 -@@ -70,7 +70,7 @@ - template struct kth_semantic_element_reference_type { - BOOST_STATIC_CONSTANT(int, semantic_index = (mpl::at_c::type::value)); - typedef typename ColorBase::template kth_element_reference_type::type type; -- static type get(ColorBase& cb) { return at_c(cb); } -+ static type get(ColorBase& cb) { return boost::gil::at_c(cb); } - }; - - /// \brief Specifies the return type of the constant semantic_at_c(color_base); -@@ -78,7 +78,7 @@ - template struct kth_semantic_element_const_reference_type { - BOOST_STATIC_CONSTANT(int, semantic_index = (mpl::at_c::type::value)); - typedef typename ColorBase::template kth_element_const_reference_type::type type; -- static type get(const ColorBase& cb) { return at_c(cb); } -+ static type get(const ColorBase& cb) { return boost::gil::at_c(cb); } - }; - - /// \brief A mutable accessor to the K-th semantic element of a color base ---- k3d-source-0.7.11.0/k3dsdk/path.cpp~ 2009-03-19 21:28:55.000000000 +0100 -+++ k3d-source-0.7.11.0/k3dsdk/path.cpp 2009-03-22 22:48:31.000000000 +0100 -@@ -24,6 +24,7 @@ - #include "result.h" - #include "system.h" - -+#include - #include - - #ifdef K3D_API_WIN32 ---- k3d-source-0.7.11.0/modules/inotify/inotify-cxx.cpp~ 2009-03-19 21:29:01.000000000 +0100 -+++ k3d-source-0.7.11.0/modules/inotify/inotify-cxx.cpp 2009-03-22 23:16:31.000000000 +0100 -@@ -20,6 +20,7 @@ - */ - - -+#include - #include - #include - #include ---- k3d-source-0.7.11.0/modules/pdiff/Metric.cpp~ 2009-03-19 21:29:02.000000000 +0100 -+++ k3d-source-0.7.11.0/modules/pdiff/Metric.cpp 2009-03-22 23:34:09.000000000 +0100 -@@ -19,6 +19,7 @@ - #include "RGBAImage.h" - #include "LPyramid.h" - #include -+#include - - #ifndef M_PI - #define M_PI 3.14159265f diff --git a/k3d-0.7.11.0-potfiles.patch b/k3d-0.7.11.0-potfiles.patch deleted file mode 100644 index da26594..0000000 --- a/k3d-0.7.11.0-potfiles.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- k3d-source-0.7.11.0.orig/po/POTFILES.in 2009-03-22 21:57:00.000000000 +0100 -+++ k3d-source-0.7.11.0/po/POTFILES.in 2009-03-22 22:11:21.000000000 +0100 -@@ -217,7 +217,6 @@ - modules/mesh/merge_collinear_edges.cpp - modules/mesh/merge_coplanar_faces.cpp - modules/mesh/merge_mesh.cpp --modules/mesh/mesh_stats.cpp - modules/mesh/move_first_edge.cpp - modules/mesh/sds_corner.cpp - modules/mesh/sds_crease.cpp diff --git a/k3d.spec b/k3d.spec index 1c81cca..73c2e99 100644 --- a/k3d.spec +++ b/k3d.spec @@ -1,17 +1,13 @@ Name: k3d -Version: 0.7.11.0 -Release: 7%{?dist} +Version: 0.8.0.1 +Release: 1%{?dist} Summary: A 3D Modeling, Animation and Rendering System Group: Applications/Multimedia License: GPLv2+ URL: http://www.k-3d.org/ -Source0: http://downloads.sourceforge.net/k3d/k3d-source-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/k3d/k3d-source-%{version}.tar.bz2 Source1: k3d.desktop -Patch0: k3d-0.7.11.0-potfiles.patch -Patch1: k3d-0.7.10.0-warn.patch -Patch2: k3d-0.7.11.0-fontpath.patch -Patch3: k3d-0.7.11.0-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # This list is alpha sorted. @@ -35,10 +31,31 @@ BuildRequires: pkgconfig(uuid) BuildRequires: plib-devel BuildRequires: python-devel +# Text widget uses bitstream font by default +BuildRequires: /usr/share/fonts/bitstream-vera/Vera.ttf +BuildRequires: /usr/share/fonts/bitstream-vera/VeraBI.ttf +BuildRequires: /usr/share/fonts/bitstream-vera/VeraBd.ttf +BuildRequires: /usr/share/fonts/bitstream-vera/VeraIt.ttf +BuildRequires: /usr/share/fonts/bitstream-vera/VeraMoBI.ttf +BuildRequires: /usr/share/fonts/bitstream-vera/VeraMoBd.ttf +BuildRequires: /usr/share/fonts/bitstream-vera/VeraMoIt.ttf +BuildRequires: /usr/share/fonts/bitstream-vera/VeraMono.ttf +BuildRequires: /usr/share/fonts/bitstream-vera/VeraSe.ttf +BuildRequires: /usr/share/fonts/bitstream-vera/VeraSeBd.ttf + Requires: aqsis # Text widget uses bitstream font by default -Requires: bitstream-vera-sans-fonts +Requires: /usr/share/fonts/bitstream-vera/Vera.ttf +Requires: /usr/share/fonts/bitstream-vera/VeraBI.ttf +Requires: /usr/share/fonts/bitstream-vera/VeraBd.ttf +Requires: /usr/share/fonts/bitstream-vera/VeraIt.ttf +Requires: /usr/share/fonts/bitstream-vera/VeraMoBI.ttf +Requires: /usr/share/fonts/bitstream-vera/VeraMoBd.ttf +Requires: /usr/share/fonts/bitstream-vera/VeraMoIt.ttf +Requires: /usr/share/fonts/bitstream-vera/VeraMono.ttf +Requires: /usr/share/fonts/bitstream-vera/VeraSe.ttf +Requires: /usr/share/fonts/bitstream-vera/VeraSeBd.ttf Requires(post): /sbin/ldconfig Requires(post): desktop-file-utils @@ -69,10 +86,8 @@ rendering a model written by K-3D. %prep %setup -q -n k3d-source-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%{?fc12:%patch0 -p1} + rm -f CMakeCache.txt find . \( -type f -a -executable \) -exec chmod -x "{}" \; @@ -94,10 +109,12 @@ rm -rf $RPM_BUILD_ROOT cd BUILD make install DESTDIR=$RPM_BUILD_ROOT cd .. -# Workaround for install bug -rm -f $RPM_BUILD_ROOT%{_datadir}/k3d/locale/chef/LC_MESSAGES/k3d.mo -# Remove fonts, we use Fedora-shipped fonts instead -rm -fr $RPM_BUILD_ROOT%{_datadir}/k3d/fonts + +# FIXEM: Use Fedora-shipped fonts +for f in $RPM_BUILD_ROOT%{_datadir}/k3d/fonts/Vera*.ttf; do +b=$(basename "$f"); rm -f "$f" +ln -s /usr/share/fonts/bitstream-vera/$b "$f"; +done find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' @@ -124,38 +141,35 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : /sbin/ldconfig update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : - %files %defattr(-, root, root, -) %doc AUTHORS COPYING README %{_bindir}/k3d* %dir %{_libdir}/k3d %{_libdir}/k3d/plugins -%{_libdir}/k3d/uiplugins %{_libdir}/*.so %dir %{_datadir}/k3d %{_datadir}/k3d/*.k3d %{_datadir}/k3d/documents +%{_datadir}/k3d/geometry +%{_datadir}/k3d/fonts %{_datadir}/k3d/icons %{_datadir}/k3d/locale %{_datadir}/k3d/logo %{_datadir}/k3d/lsystem %{_datadir}/k3d/ngui -%{_datadir}/k3d/qtui %{_datadir}/k3d/scripts %dir %{_datadir}/k3d/shaders -%{_datadir}/k3d/shaders/displacemnt +%{_datadir}/k3d/shaders/displacement %{_datadir}/k3d/shaders/glsl %{_datadir}/k3d/shaders/imager %{_datadir}/k3d/shaders/light %{_datadir}/k3d/shaders/surface %{_datadir}/k3d/shaders/volume %{_datadir}/k3d/textures -%{_datadir}/k3d/tutorials %{_mandir}/man1/k3d* %{_datadir}/applications/*.desktop - %files devel %defattr(-, root, root, -) %{_includedir}/k3d @@ -164,6 +178,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Fri May 14 2010 Ralf Corsépius - 0.8.0.1-1 +- Upstream update. + * Mon Mar 08 2010 Ralf Corsépius - 0.7.11.0-7 - Rebuild for ImageMagick SONAME change. diff --git a/sources b/sources index d27338b..44046d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f01b6b0f32845dcd56cd74bfa7c70465 k3d-source-0.7.11.0.tar.gz +88027c4d43583df2496c25576d0f31b6 k3d-source-0.8.0.1.tar.bz2