From b5f4f19e4e518f7f95c4fc383788f21d597e1467 Mon Sep 17 00:00:00 2001 From: Denis Leroy Date: Mar 10 2009 09:27:59 +0000 Subject: - Update to upstream 0.7.10.0 - Build system now based on cmake - All patches upstreamed or obsoleted - Added potfiles file list patch fix - Removed example subpackage - Removed packaged bitstream fonts, use Fedora ones instead --- diff --git a/.cvsignore b/.cvsignore index 814188a..aa39177 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -k3d-0.6.7.0-src.tar.bz2 +k3d-source-0.7.10.0.tar.gz diff --git a/k3d-0.5.15.0-gl64.patch b/k3d-0.5.15.0-gl64.patch deleted file mode 100644 index 552d2ec..0000000 --- a/k3d-0.5.15.0-gl64.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- k3d-0.6.6.0/configure.orig 2007-06-06 16:23:15.000000000 +0200 -+++ k3d-0.6.6.0/configure 2007-06-06 16:24:14.000000000 +0200 -@@ -20382,7 +20382,7 @@ - echo $ECHO_N "checking for OpenGL... $ECHO_C" >&6; } - - k3d_check_opengl_lib_dir="" --k3d_check_opengl_directories="/usr/lib /usr/local/lib /usr/X11R6/lib" -+k3d_check_opengl_directories="/usr/lib /usr/local/lib /usr/X11R6/lib /usr/lib64" - for k3d_check_opengl_directory in $k3d_check_opengl_directories; do - if test -f $k3d_check_opengl_directory/libGL.so || test -f $k3d_check_opengl_directory/libGL.a || test -f $k3d_check_opengl_directory/libGL.dll.a; then - k3d_check_opengl_lib_dir=$k3d_check_opengl_directory -@@ -20416,7 +20416,7 @@ - echo $ECHO_N "checking for OpenGLU... $ECHO_C" >&6; } - - k3d_check_openglu_lib_dir="" --k3d_check_openglu_directories="/usr/lib /usr/local/lib /usr/X11R6/lib" -+k3d_check_openglu_directories="/usr/lib /usr/local/lib /usr/X11R6/lib /usr/lib64" - for k3d_check_openglu_directory in $k3d_check_openglu_directories; do - if test -f $k3d_check_openglu_directory/libGLU.so || test -f $k3d_check_openglu_directory/libGLU.a || test -f $k3d_check_openglu_directory/libGLU.dll.a; then - k3d_check_openglu_lib_dir=$k3d_check_openglu_directory diff --git a/k3d-0.6.6.0-vfs.patch b/k3d-0.6.6.0-vfs.patch deleted file mode 100644 index b654f26..0000000 --- a/k3d-0.6.6.0-vfs.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- k3d-0.6.6.0/configure.orig 2007-06-06 16:23:15.000000000 +0200 -+++ k3d-0.6.6.0/configure 2007-06-06 16:44:10.000000000 +0200 -@@ -21108,8 +21108,8 @@ - if pkg-config --exists libgnome-2.0 >/dev/null 2>/dev/null; then - K3D_GNOME_SUBDIR=gnome - K3D_GNOME_VERSION=`pkg-config --modversion libgnome-2.0` -- K3D_GNOME_CPPFLAGS=`pkg-config --cflags libgnome-2.0` -- K3D_GNOME_LIBS=`pkg-config --libs libgnome-2.0` -+ K3D_GNOME_CPPFLAGS=`pkg-config --cflags libgnome-2.0 gnome-vfs-2.0` -+ K3D_GNOME_LIBS=`pkg-config --libs libgnome-2.0 gnome-vfs-2.0` - { echo "$as_me:$LINENO: result: found version $K3D_GNOME_VERSION" >&5 - echo "${ECHO_T}found version $K3D_GNOME_VERSION" >&6; } - else diff --git a/k3d-0.6.7.0-desktop.patch b/k3d-0.6.7.0-desktop.patch deleted file mode 100644 index 861258d..0000000 --- a/k3d-0.6.7.0-desktop.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- k3d-0.6.7.0/desktop/k3d.desktop.in.orig 2007-07-09 10:07:04.000000000 +0200 -+++ k3d-0.6.7.0/desktop/k3d.desktop.in 2007-07-09 10:07:13.000000000 +0200 -@@ -7,6 +7,5 @@ - Exec=@prefix@/bin/k3d - Icon=@prefix@/share/k3d/icons/k3d2.png - Terminal=false --MultipleArgs=false - Type=Application - Categories=Application;Graphics diff --git a/k3d-0.6.7.0-gcc43.patch b/k3d-0.6.7.0-gcc43.patch deleted file mode 100644 index 3079d56..0000000 --- a/k3d-0.6.7.0-gcc43.patch +++ /dev/null @@ -1,189 +0,0 @@ ---- 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 --git a/k3d-0.6.7.0-sigc2.patch b/k3d-0.6.7.0-sigc2.patch deleted file mode 100644 index be0b8f1..0000000 --- a/k3d-0.6.7.0-sigc2.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- k3d-0.6.7.0/k3dsdk/node.cpp~ 2006-05-31 22:27:27.000000000 +0200 -+++ k3d-0.6.7.0/k3dsdk/node.cpp 2008-04-01 11:32:56.000000000 +0200 -@@ -26,6 +26,7 @@ - #include "iplugin_factory.h" - #include "node.h" - -+#include - #include - #include - ---- k3d-0.6.7.0/k3dsdk/mesh_modifier.h~ 2006-02-19 06:43:39.000000000 +0100 -+++ k3d-0.6.7.0/k3dsdk/mesh_modifier.h 2008-04-01 11:32:52.000000000 +0200 -@@ -27,6 +27,8 @@ - #include "imesh_source.h" - #include "mesh.h" - -+#include -+ - namespace k3d - { - diff --git a/k3d-0.7.10.0-fontpath.patch b/k3d-0.7.10.0-fontpath.patch new file mode 100644 index 0000000..93bd1d3 --- /dev/null +++ b/k3d-0.7.10.0-fontpath.patch @@ -0,0 +1,144 @@ +diff -ur k3d-source-0.7.10.0.orig/modules/annotation/annotation_2d.cpp k3d-source-0.7.10.0/modules/annotation/annotation_2d.cpp +--- k3d-source-0.7.10.0.orig/modules/annotation/annotation_2d.cpp 2008-12-14 22:03:53.000000000 +0100 ++++ k3d-source-0.7.10.0/modules/annotation/annotation_2d.cpp 2009-03-10 09:29:17.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 -ur k3d-source-0.7.10.0.orig/modules/annotation/annotation_3d.cpp k3d-source-0.7.10.0/modules/annotation/annotation_3d.cpp +--- k3d-source-0.7.10.0.orig/modules/annotation/annotation_3d.cpp 2008-12-14 22:03:53.000000000 +0100 ++++ k3d-source-0.7.10.0/modules/annotation/annotation_3d.cpp 2009-03-10 09:29:17.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 -ur k3d-source-0.7.10.0.orig/modules/annotation/annotation.cpp k3d-source-0.7.10.0/modules/annotation/annotation.cpp +--- k3d-source-0.7.10.0.orig/modules/annotation/annotation.cpp 2008-12-14 22:03:53.000000000 +0100 ++++ k3d-source-0.7.10.0/modules/annotation/annotation.cpp 2009-03-10 09:29:17.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 -ur k3d-source-0.7.10.0.orig/modules/core/axes.cpp k3d-source-0.7.10.0/modules/core/axes.cpp +--- k3d-source-0.7.10.0.orig/modules/core/axes.cpp 2008-12-14 22:03:50.000000000 +0100 ++++ k3d-source-0.7.10.0/modules/core/axes.cpp 2009-03-10 09:29:17.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 -ur k3d-source-0.7.10.0.orig/modules/freetype2/poly_text.cpp k3d-source-0.7.10.0/modules/freetype2/poly_text.cpp +--- k3d-source-0.7.10.0.orig/modules/freetype2/poly_text.cpp 2008-12-14 22:03:50.000000000 +0100 ++++ k3d-source-0.7.10.0/modules/freetype2/poly_text.cpp 2009-03-10 09:29:17.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 -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/edge_numbering_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/edge_numbering_painter.cpp +--- k3d-source-0.7.10.0.orig/modules/opengl_painters/edge_numbering_painter.cpp 2008-12-14 22:03:51.000000000 +0100 ++++ k3d-source-0.7.10.0/modules/opengl_painters/edge_numbering_painter.cpp 2009-03-10 09:29:17.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 -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/face_numbering_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/face_numbering_painter.cpp +--- k3d-source-0.7.10.0.orig/modules/opengl_painters/face_numbering_painter.cpp 2008-12-14 22:03:52.000000000 +0100 ++++ k3d-source-0.7.10.0/modules/opengl_painters/face_numbering_painter.cpp 2009-03-10 09:29:17.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 -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/nurbs_curve_numbering_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/nurbs_curve_numbering_painter.cpp +--- k3d-source-0.7.10.0.orig/modules/opengl_painters/nurbs_curve_numbering_painter.cpp 2008-12-14 22:03:52.000000000 +0100 ++++ k3d-source-0.7.10.0/modules/opengl_painters/nurbs_curve_numbering_painter.cpp 2009-03-10 09:29:17.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 -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/nurbs_patch_numbering_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/nurbs_patch_numbering_painter.cpp +--- k3d-source-0.7.10.0.orig/modules/opengl_painters/nurbs_patch_numbering_painter.cpp 2008-12-14 22:03:52.000000000 +0100 ++++ k3d-source-0.7.10.0/modules/opengl_painters/nurbs_patch_numbering_painter.cpp 2009-03-10 09:29:17.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 -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/point_numbering_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/point_numbering_painter.cpp +--- k3d-source-0.7.10.0.orig/modules/opengl_painters/point_numbering_painter.cpp 2008-12-14 22:03:51.000000000 +0100 ++++ k3d-source-0.7.10.0/modules/opengl_painters/point_numbering_painter.cpp 2009-03-10 09:29:17.000000000 +0100 +@@ -57,7 +57,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)), +diff -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/varying_data_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/varying_data_painter.cpp +--- k3d-source-0.7.10.0.orig/modules/opengl_painters/varying_data_painter.cpp 2008-12-14 22:03:51.000000000 +0100 ++++ k3d-source-0.7.10.0/modules/opengl_painters/varying_data_painter.cpp 2009-03-10 09:29:17.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 -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/vertex_data_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/vertex_data_painter.cpp +--- k3d-source-0.7.10.0.orig/modules/opengl_painters/vertex_data_painter.cpp 2008-12-14 22:03:52.000000000 +0100 ++++ k3d-source-0.7.10.0/modules/opengl_painters/vertex_data_painter.cpp 2009-03-10 09:29:17.000000000 +0100 +@@ -80,7 +80,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))), diff --git a/k3d-0.7.10.0-potfiles.patch b/k3d-0.7.10.0-potfiles.patch new file mode 100644 index 0000000..c7cd3b4 --- /dev/null +++ b/k3d-0.7.10.0-potfiles.patch @@ -0,0 +1,24 @@ +--- k3d-source-0.7.10.0/po/POTFILES.in~ 2008-12-14 22:03:53.000000000 +0100 ++++ k3d-source-0.7.10.0/po/POTFILES.in 2009-01-21 10:47:19.000000000 +0100 +@@ -1,6 +1,5 @@ + application/k3d_main.cpp + application/main.cpp +-bug-buddy/main.cpp + k3dsdk/bitmap_modifier.h + k3dsdk/bitmap_sink.h + k3dsdk/bitmap_source.h +@@ -185,10 +184,10 @@ + modules/jpeg_io/bitmap_importer.cpp + modules/jpeg_io/bitmap_reader.cpp + modules/jpeg_io/bitmap_writer.cpp +-modules/k3d_io/k3d_document_exporter.cpp +-modules/k3d_io/k3d_document_importer.cpp +-modules/k3d_io/k3d_mesh_reader.cpp +-modules/k3d_io/k3d_mesh_writer.cpp ++modules/k3d_io/document_exporter.cpp ++modules/k3d_io/document_importer.cpp ++modules/k3d_io/mesh_reader.cpp ++modules/k3d_io/mesh_writer.cpp + modules/k3dscript/engine.cpp + modules/linear_curve/knot_curve.cpp + modules/linear_curve/lissajous_curve.cpp diff --git a/k3d-0.7.10.0-warn.patch b/k3d-0.7.10.0-warn.patch new file mode 100644 index 0000000..d5e81eb --- /dev/null +++ b/k3d-0.7.10.0-warn.patch @@ -0,0 +1,14 @@ +--- 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.desktop b/k3d.desktop new file mode 100644 index 0000000..f32e6c2 --- /dev/null +++ b/k3d.desktop @@ -0,0 +1,13 @@ + +[Desktop Entry] +Encoding=UTF-8 +Name=K-3D +Name[sv_SE.ISO8859-15]=K-3D +Comment=3D modeling and animation +Comment[sv_SE.ISO8859-15]=3D modellering och animation +Exec=/usr/bin/k3d +Icon=/usr/share/k3d/icons/k3d.png +Terminal=false +Type=Application +Categories=Application;Graphics; +X-Desktop-File-Install-Version=0.15 diff --git a/k3d.spec b/k3d.spec index da1ccd7..d4e25f2 100644 --- a/k3d.spec +++ b/k3d.spec @@ -1,22 +1,22 @@ Name: k3d -Version: 0.6.7.0 -Release: 10%{?dist} +Version: 0.7.10.0 +Release: 1%{?dist} Summary: A 3D Modeling, Animation and Rendering System Group: Applications/Multimedia License: GPLv2+ URL: http://www.k-3d.org/ -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 -Patch4: k3d-0.6.7.0-sigc2.patch +Source0: http://dl.sourceforge.net/k3d/k3d-source-%{version}.tar.gz +Source1: k3d.desktop +Patch0: k3d-0.7.10.0-potfiles.patch +Patch1: k3d-0.7.10.0-warn.patch +Patch2: k3d-0.7.10.0-fontpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: aqsis +BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: mesa-libGL-devel BuildRequires: expat-devel @@ -37,12 +37,18 @@ BuildRequires: gts-devel BuildRequires: librsvg2 BuildRequires: bzip2-devel BuildRequires: libtool +BuildRequires: libpng-devel +BuildRequires: cairomm-devel + +Requires: bitstream-vera-fonts Requires(post): /sbin/ldconfig Requires(post): desktop-file-utils Requires(postun): /sbin/ldconfig Requires(postun): desktop-file-utils +Obsoletes: k3d-examples < 0.7.10.0 + %description K-3D is a complete 3D modeling, animation and rendering system. K-3D @@ -63,49 +69,52 @@ This package contains the libraries and header files needed for rendering a model written by K-3D. -%package examples -Summary: Examples for K-3D -Group: Development/Demos - - -%description examples -This package contains examples of K-3D documents. - - %prep -%setup -q -%patch0 -p1 -b .gl64 -%patch1 -p1 -b .vfs -%patch2 -p1 -b .desktop -%patch3 -p1 -b .gcc43 -%patch4 -p1 -b .sigc2 +%setup -q -n k3d-source-%{version} +%patch0 -p 1 -b .potfiles +%patch1 -p 1 -b .warn +%patch2 -p 1 -b .fontpath %build -%configure --disable-static --with-external-boost -make %{?_smp_mflags} +mkdir b +cd b +%cmake .. +# Since our cmake macro disables rpath, we need to set some temp +# library paths as the build invokes some built binaries to generate +# proxy files. +export LD_LIBRARY_PATH=%{_builddir}/k3d-source-%{version}/b/lib:$LD_LIBRARY_PATH +echo LD_LIBRARY_PATH is $LD_LIBRARY_PATH +make VERBOSE=1 %{?_smp_mflags} %install - find -type f -regex '.*\.\(cpp\|h\|svg\)' -perm +111 -exec chmod -x {} ';' +rm -rf $RPM_BUILD_ROOT +cd b make install DESTDIR=$RPM_BUILD_ROOT +# Workaround for install bug +cp lib/libk3dsdk-python-primitives.so $RPM_BUILD_ROOT%{_libdir} +rm -fr $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 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' -desktop-file-install \ - --vendor fedora \ - --mode 644 \ - --delete-original \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - $RPM_BUILD_ROOT%{_datadir}/applications/k3d.desktop +desktop-file-install --vendor "fedora" \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT +%check +ctest + + %post /sbin/ldconfig update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : @@ -118,49 +127,29 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %files %defattr(-, root, root, -) -%doc AUTHORS COPYING NEWS README -%{_bindir}/k3d -%{_bindir}/k3d-[bd-z]* -%{_libdir}/libHapy.so.* -%{_libdir}/libk3dngui.so* -%{_libdir}/libk3dnui.so* -%{_libdir}/libk3dsdk.so.* -%{_libdir}/libsubdivision_surface.so.* -%{_libdir}/libsurface_polygonizer.so.* +%doc AUTHORS COPYING README +%{_bindir}/k3d* +%{_libdir}/*.so* %{_libdir}/k3d -%{_datadir}/applications/fedora-k3d.desktop -%dir %{_datadir}/k3d -%{_datadir}/k3d/*.k3d -%{_datadir}/k3d/fonts -%{_datadir}/k3d/icons -%{_datadir}/k3d/logo -%{_datadir}/k3d/lsystem -%{_datadir}/k3d/ngui -%{_datadir}/k3d/qtui -%{_datadir}/k3d/scripts -%{_datadir}/k3d/shaders -%{_datadir}/k3d/textures -%{_datadir}/k3d/tutorials +%{_datadir}/k3d %{_mandir}/man1/k3d* -%files examples -%defattr(-, root, root, -) -%{_datadir}/k3d/documents - - %files devel %defattr(-, root, root, -) -%doc ChangeLog -%{_bindir}/k3d-config %{_includedir}/k3d -%{_libdir}/libHapy.so -%{_libdir}/libk3dsdk.so -%{_libdir}/libsubdivision_surface.so -%{_libdir}/libsurface_polygonizer.so +%{_libdir}/*.so %changelog +* Wed Mar 4 2009 Denis Leroy - 0.7.10.0-1 +- Update to upstream 0.7.10.0 +- Build system now based on cmake +- All patches upstreamed or obsoleted +- Added potfiles file list patch fix +- Removed example subpackage +- Removed packaged bitstream fonts, use Fedora ones instead + * Wed Feb 25 2009 Fedora Release Engineering - 0.6.7.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index db103ba..eac471f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0031402206dab46b563d149eac2324db k3d-0.6.7.0-src.tar.bz2 +52736c4e2d3df11af741ed356f8bc448 k3d-source-0.7.10.0.tar.gz