diff --git a/k3d-0.8.0.2-boost157.patch b/k3d-0.8.0.2-boost157.patch deleted file mode 100644 index eacfb5f..0000000 --- a/k3d-0.8.0.2-boost157.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ./k3dsdk/difference.h~ ./k3dsdk/difference.h ---- ./k3dsdk/difference.h~ 2010-07-03 04:27:47.000000000 +0200 -+++ ./k3dsdk/difference.h 2015-01-29 01:29:25.799061127 +0100 -@@ -31,7 +31,6 @@ - #include - #include - #include --#include - #include - - namespace k3d -diff -up ./k3dsdk/.difference.h.~undo-tree~ ./k3dsdk/.difference.h.~undo-tree diff --git a/k3d-0.8.0.2-cmake.diff b/k3d-0.8.0.2-cmake.diff deleted file mode 100644 index 3e1665c..0000000 --- a/k3d-0.8.0.2-cmake.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- k3d-source-0.8.0.2.orig/CMakeLists.txt 2010-07-03 04:27:53.000000000 +0200 -+++ k3d-source-0.8.0.2/CMakeLists.txt 2011-02-10 10:28:23.236698104 +0100 -@@ -326,7 +326,8 @@ - # Setup output directories ... - SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${k3d_BINARY_DIR}/bin) - --SET(K3D_LIBDIR lib) # Allows us to handle 64-bit libs if/when it becomes necessary. -+# SET(K3D_LIBDIR lib) # Allows us to handle 64-bit libs if/when it becomes necessary. -+SET(K3D_LIBDIR lib${LIB_SUFFIX}) - IF(WIN32) - SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${k3d_BINARY_DIR}/bin) - ELSE(WIN32) diff --git a/k3d-0.8.0.2-gcc-4.6.diff b/k3d-0.8.0.2-gcc-4.6.diff deleted file mode 100644 index a82efd4..0000000 --- a/k3d-0.8.0.2-gcc-4.6.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur k3d-source-0.8.0.2.orig/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp k3d-source-0.8.0.2/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp ---- k3d-source-0.8.0.2.orig/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp 2010-07-03 04:27:47.000000000 +0200 -+++ k3d-source-0.8.0.2/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp 2011-02-10 07:42:05.369909078 +0100 -@@ -114,7 +114,7 @@ - template - struct reduce_bind1 { - const T2& _t2; -- mutable Op& _op; -+ Op& _op; - - typedef typename Op::result_type result_type; - -@@ -127,7 +127,7 @@ - struct reduce_bind2 { - const Bits1& _bits1; - std::size_t _index1; -- mutable Op& _op; -+ Op& _op; - - typedef typename Op::result_type result_type; - diff --git a/k3d-0.8.0.2-gcc-4.7.patch b/k3d-0.8.0.2-gcc-4.7.patch deleted file mode 100644 index 9605187..0000000 --- a/k3d-0.8.0.2-gcc-4.7.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -Naur k3d-source-0.8.0.2.orig/k3dsdk/data.h k3d-source-0.8.0.2/k3dsdk/data.h ---- k3d-source-0.8.0.2.orig/k3dsdk/data.h 2010-07-03 04:27:46.000000000 +0200 -+++ k3d-source-0.8.0.2/k3dsdk/data.h 2012-01-05 06:34:18.127223587 +0100 -@@ -865,7 +865,7 @@ - - try - { -- set_value(boost::lexical_cast(*new_value), Hint); -+ this->set_value(boost::lexical_cast(*new_value), Hint); - return true; - } - catch(...) -@@ -1011,7 +1011,7 @@ - - try - { -- set_value(boost::lexical_cast(*new_value), Hint); -+ this->set_value(boost::lexical_cast(*new_value), Hint); - return true; - } - catch(...) -@@ -1146,7 +1146,7 @@ - if(!new_value) - return false; - -- set_value(*new_value, Hint); -+ this->set_value(*new_value, Hint); - return true; - } - -@@ -1671,7 +1671,7 @@ - /// This little bit of magic makes it possible for base classes (such as node_storage) to update their own values while observing the correct undo policy - void internal_set_value(const value_t& Value, ihint* const Hint) - { -- set_value(Value, Hint); -+ this->set_value(Value, Hint); - } - }; - -diff -Naur k3d-source-0.8.0.2.orig/modules/animation/interpolator.h k3d-source-0.8.0.2/modules/animation/interpolator.h ---- k3d-source-0.8.0.2.orig/modules/animation/interpolator.h 2010-07-03 04:27:55.000000000 +0200 -+++ k3d-source-0.8.0.2/modules/animation/interpolator.h 2012-01-05 06:05:38.400985430 +0100 -@@ -92,7 +92,7 @@ - { - time_t t_lower, t_upper; - value_t v_lower, v_upper; -- get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); -+ this->get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); - return lerp(t_lower, t_upper, v_lower, v_upper, Time); - } - protected: -@@ -116,7 +116,7 @@ - { - time_t t_lower, t_upper; - value_t v_lower, v_upper; -- get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); -+ this->get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); - return lerp(t_lower, t_upper, v_lower, v_upper, Time); - } - protected: diff --git a/k3d-0.8.0.2-gtkmm2.24.diff b/k3d-0.8.0.2-gtkmm2.24.diff deleted file mode 100644 index 5c39f1b..0000000 --- a/k3d-0.8.0.2-gtkmm2.24.diff +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur k3d-source-0.8.0.2.orig/k3dsdk/ngui/main_document_window.cpp k3d-source-0.8.0.2/k3dsdk/ngui/main_document_window.cpp ---- k3d-source-0.8.0.2.orig/k3dsdk/ngui/main_document_window.cpp 2010-07-03 04:27:46.000000000 +0200 -+++ k3d-source-0.8.0.2/k3dsdk/ngui/main_document_window.cpp 2011-05-10 17:37:45.749942401 +0200 -@@ -1371,7 +1371,7 @@ - Gtk::HBox import_box(false, 5); - Gtk::Label import_label(_("Choose import plugin:")); - -- Gtk::ComboBox import_combo(model); -+ Gtk::ComboBox import_combo((Glib::RefPtr &) model); - import_combo.pack_start(columns.icon, false); - import_combo.pack_start(columns.label); - import_combo.set_active(0); -@@ -1461,7 +1461,7 @@ - Gtk::HBox export_box(false, 5); - Gtk::Label export_label(_("Choose export plugin:")); - -- Gtk::ComboBox export_combo(model); -+ Gtk::ComboBox export_combo((Glib::RefPtr &) model); - export_combo.pack_start(columns.icon, false); - export_combo.pack_start(columns.label); - export_combo.set_active(0); -diff -Naur k3d-source-0.8.0.2.orig/k3dsdk/ngui/render.cpp k3d-source-0.8.0.2/k3dsdk/ngui/render.cpp ---- k3d-source-0.8.0.2.orig/k3dsdk/ngui/render.cpp 2010-07-03 04:27:46.000000000 +0200 -+++ k3d-source-0.8.0.2/k3dsdk/ngui/render.cpp 2011-05-10 17:37:45.750942414 +0200 -@@ -169,7 +169,7 @@ - row[columns.separator] = false; - } - -- Gtk::ComboBox combo(model); -+ Gtk::ComboBox combo((Glib::RefPtr &) model); - - combo.pack_start(columns.icon, false); - -@@ -295,7 +295,7 @@ - row[columns.separator] = false; - } - -- Gtk::ComboBox combo(model); -+ Gtk::ComboBox combo((Glib::RefPtr &) model); - - combo.pack_start(columns.icon, false); - diff --git a/k3d-0.8.0.2-inotify.patch b/k3d-0.8.0.2-inotify.patch deleted file mode 100644 index fa4766c..0000000 --- a/k3d-0.8.0.2-inotify.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur k3d-source-0.8.0.2/modules/inotify/inotify-cxx.h k3d-0.8.0.3/modules/inotify/inotify-cxx.h ---- k3d-source-0.8.0.2/modules/inotify/inotify-cxx.h 2010-07-03 04:27:55.000000000 +0200 -+++ k3d-0.8.0.3/modules/inotify/inotify-cxx.h 2013-07-22 00:29:39.000000000 +0200 -@@ -27,15 +27,8 @@ - #include - #include - --// Please ensure that the following headers take the right place --#include - #include - --// Use this if syscalls not defined --#ifndef __NR_inotify_init --#include --#endif // __NR_inotify_init -- - /// Event struct size - #define INOTIFY_EVENT_SIZE (sizeof(struct inotify_event)) - diff --git a/k3d-0.8.0.2-libpng1.4.patch b/k3d-0.8.0.2-libpng1.4.patch deleted file mode 100644 index 0e17b25..0000000 --- a/k3d-0.8.0.2-libpng1.4.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -Naur k3d-source-0.8.0.2.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp k3d-source-0.8.0.2/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp ---- k3d-source-0.8.0.2.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2010-07-03 04:27:47.000000000 +0200 -+++ k3d-source-0.8.0.2/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2011-11-28 14:52:49.270620085 +0100 -@@ -148,12 +148,12 @@ - // allocate/initialize the image information data - _info_ptr = png_create_info_struct(_png_ptr); - if (_info_ptr == NULL) { -- png_destroy_read_struct(&_png_ptr,png_infopp_NULL,png_infopp_NULL); -+ png_destroy_read_struct(&_png_ptr,0,0); - io_error("png_get_file_size: fail to call png_create_info_struct()"); - } - if (setjmp(png_jmpbuf(_png_ptr))) { - //free all of the memory associated with the png_ptr and info_ptr -- png_destroy_read_struct(&_png_ptr, &_info_ptr, png_infopp_NULL); -+ png_destroy_read_struct(&_png_ptr, &_info_ptr,0); - io_error("png_get_file_size: fail to call setjmp()"); - } - png_init_io(_png_ptr, get()); -@@ -165,7 +165,7 @@ - png_reader(const char* filename) : file_mgr(filename, "rb") { init(); } - - ~png_reader() { -- png_destroy_read_struct(&_png_ptr,&_info_ptr,png_infopp_NULL); -+ png_destroy_read_struct(&_png_ptr,&_info_ptr,0); - } - point2 get_dimensions() { - return point2(png_get_image_width(_png_ptr,_info_ptr), -@@ -177,7 +177,7 @@ - int bit_depth, color_type, interlace_type; - png_get_IHDR(_png_ptr, _info_ptr, - &width, &height,&bit_depth,&color_type,&interlace_type, -- int_p_NULL, int_p_NULL); -+ 0, 0); - io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height), - "png_read_view: input view size does not match PNG file size"); - -@@ -219,7 +219,7 @@ - int bit_depth, color_type, interlace_type; - png_get_IHDR(_png_ptr, _info_ptr, - &width, &height,&bit_depth,&color_type,&interlace_type, -- int_p_NULL, int_p_NULL); -+ 0, 0); - io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height), - "png_reader_color_convert::apply(): input view size does not match PNG file size"); - switch (color_type) { -@@ -308,7 +308,7 @@ - io_error_if(!_png_ptr,"png_write_initialize: fail to call png_create_write_struct()"); - _info_ptr = png_create_info_struct(_png_ptr); - if (!_info_ptr) { -- png_destroy_write_struct(&_png_ptr,png_infopp_NULL); -+ png_destroy_write_struct(&_png_ptr,0); - io_error("png_write_initialize: fail to call png_create_info_struct()"); - } - if (setjmp(png_jmpbuf(_png_ptr))) {