rpms/k3d/devel k3d-0.7.11.0-fontpath.patch, NONE, 1.1 k3d-0.7.11.0-gcc44.patch, NONE, 1.1 k3d-0.7.11.0-potfiles.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 k3d.spec, 1.30, 1.31 sources, 1.11, 1.12 k3d-0.7.10.0-fontpath.patch, 1.1, NONE k3d-0.7.10.0-potfiles.patch, 1.1, NONE
Denis Leroy
denis at fedoraproject.org
Mon Mar 23 07:29:44 UTC 2009
- Previous message (by thread): rpms/kazehakase/devel .cvsignore, 1.27, 1.28 kazehakase.spec, 1.75, 1.76 sources, 1.27, 1.28
- Next message (by thread): rpms/rpm/devel fontconfig.prov,1.2,1.3 rpm.spec,1.338,1.339
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: denis
Update of /cvs/pkgs/rpms/k3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7319
Modified Files:
.cvsignore k3d.spec sources
Added Files:
k3d-0.7.11.0-fontpath.patch k3d-0.7.11.0-gcc44.patch
k3d-0.7.11.0-potfiles.patch
Removed Files:
k3d-0.7.10.0-fontpath.patch k3d-0.7.10.0-potfiles.patch
Log Message:
Update to upstream 0.7.11.0. Patch updated. Added g++ 4.4 compatibility patch
k3d-0.7.11.0-fontpath.patch:
--- NEW FILE k3d-0.7.11.0-fontpath.patch ---
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
k3d-0.7.11.0-gcc44.patch:
--- NEW FILE k3d-0.7.11.0-gcc44.patch ---
--- 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 <stdio.h>
#include <zlib.h>
#include <string.h>
--- 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 <typename ColorBase, int K> struct kth_semantic_element_reference_type {
BOOST_STATIC_CONSTANT(int, semantic_index = (mpl::at_c<typename ColorBase::layout_t::channel_mapping_t,K>::type::value));
typedef typename ColorBase::template kth_element_reference_type<semantic_index>::type type;
- static type get(ColorBase& cb) { return at_c<semantic_index>(cb); }
+ static type get(ColorBase& cb) { return boost::gil::at_c<semantic_index>(cb); }
};
/// \brief Specifies the return type of the constant semantic_at_c<K>(color_base);
@@ -78,7 +78,7 @@
template <typename ColorBase, int K> struct kth_semantic_element_const_reference_type {
BOOST_STATIC_CONSTANT(int, semantic_index = (mpl::at_c<typename ColorBase::layout_t::channel_mapping_t,K>::type::value));
typedef typename ColorBase::template kth_element_const_reference_type<semantic_index>::type type;
- static type get(const ColorBase& cb) { return at_c<semantic_index>(cb); }
+ static type get(const ColorBase& cb) { return boost::gil::at_c<semantic_index>(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 <stdio.h>
#include <glibmm/convert.h>
#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 <stdio.h>
#include <errno.h>
#include <unistd.h>
#include <fcntl.h>
--- 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 <math.h>
+#include <stdio.h>
#ifndef M_PI
#define M_PI 3.14159265f
k3d-0.7.11.0-potfiles.patch:
--- NEW FILE k3d-0.7.11.0-potfiles.patch ---
--- 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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k3d/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 10 Mar 2009 09:27:58 -0000 1.11
+++ .cvsignore 23 Mar 2009 07:29:13 -0000 1.12
@@ -1 +1 @@
-k3d-source-0.7.10.0.tar.gz
+k3d-source-0.7.11.0.tar.gz
Index: k3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3d/devel/k3d.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- k3d.spec 10 Mar 2009 11:20:26 -0000 1.30
+++ k3d.spec 23 Mar 2009 07:29:14 -0000 1.31
@@ -1,6 +1,6 @@
Name: k3d
-Version: 0.7.10.0
+Version: 0.7.11.0
Release: 1%{?dist}
Summary: A 3D Modeling, Animation and Rendering System
@@ -9,9 +9,10 @@
URL: http://www.k-3d.org/
Source0: http://dl.sourceforge.net/k3d/k3d-source-%{version}.tar.gz
Source1: k3d.desktop
-Patch0: k3d-0.7.10.0-potfiles.patch
+Patch0: k3d-0.7.11.0-potfiles.patch
Patch1: k3d-0.7.10.0-warn.patch
-Patch2: k3d-0.7.10.0-fontpath.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)
Requires: aqsis
@@ -40,7 +41,9 @@
BuildRequires: libtool doxygen gettext
BuildRequires: libpng-devel
BuildRequires: cairomm-devel
+BuildRequires: uuid-c++-devel
+# Text widget uses bitstream font by default
Requires: bitstream-vera-fonts
Requires(post): /sbin/ldconfig
@@ -75,6 +78,8 @@
%patch0 -p 1 -b .potfiles
%patch1 -p 1 -b .warn
%patch2 -p 1 -b .fontpath
+%patch3 -p 1 -b .gcc44
+rm -f CMakeCache.txt
%build
@@ -143,6 +148,9 @@
%changelog
+* Sun Mar 22 2009 Denis Leroy <denis at poolshark.org> - 0.7.11.0-1
+- Update to upstream 0.7.11.0
+
* Wed Mar 4 2009 Denis Leroy <denis at poolshark.org> - 0.7.10.0-1
- Update to upstream 0.7.10.0
- Build system now based on cmake
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k3d/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 10 Mar 2009 09:27:59 -0000 1.11
+++ sources 23 Mar 2009 07:29:14 -0000 1.12
@@ -1 +1 @@
-52736c4e2d3df11af741ed356f8bc448 k3d-source-0.7.10.0.tar.gz
+f01b6b0f32845dcd56cd74bfa7c70465 k3d-source-0.7.11.0.tar.gz
--- k3d-0.7.10.0-fontpath.patch DELETED ---
--- k3d-0.7.10.0-potfiles.patch DELETED ---
- Previous message (by thread): rpms/kazehakase/devel .cvsignore, 1.27, 1.28 kazehakase.spec, 1.75, 1.76 sources, 1.27, 1.28
- Next message (by thread): rpms/rpm/devel fontconfig.prov,1.2,1.3 rpm.spec,1.338,1.339
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list