Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a898cc26c5a787556053446483589bbba9ae8aff
commit a898cc26c5a787556053446483589bbba9ae8aff Author: crazy <[email protected]> Date: Wed Oct 28 18:30:35 2015 +0100 k3d-0.8.0.2-7-x86_64 - removed diff --git a/source/xapps-extra/k3d/FrugalBuild b/source/xapps-extra/k3d/FrugalBuild deleted file mode 100644 index a750c79..0000000 --- a/source/xapps-extra/k3d/FrugalBuild +++ /dev/null @@ -1,40 +0,0 @@ -# Compiling Time: 24.48 SBU -# Maintainer: DeX77 <[email protected]> -# Contributor: crazy <[email protected]> -# Contributor: Mcklaren <[email protected]> - -options+=('asneeded') - -pkgname=k3d -pkgver=0.8.0.2 -pkgrel=7 -pkgdesc="A complete free-as-in-freedom 3D modeling, animation and rendering system." -depends=('gtkglext' 'imagemagick>=6.7.9_2-1' 'librsvg' 'gts' 'python>=2.7' 'openexr>=2.2.0' 'libxml2' 'libsigc++2' \ - 'freetype2' 'plib' 'graphviz' 'libtiff' 'atk' 'gtkmm2' 'pango' 'glibmm' 'libboost>=1.58.0' 'libglu') -makedepends=('boost>=1.58.0') -groups=('xapps-extra') -archs=('i686' 'x86_64') -options=('scriptlet' 'force') -_F_sourceforge_ext=".tar.gz" -_F_archive_name="$pkgname-source" -Finclude sourceforge cmake -source=($source \ - $pkgname-0.7.11.0-libpng14.patch \ - $pkgname-gcc-4.6.patch \ - $pkgname-gtkmm2.24.patch \ - $pkgname-gcc-4.7.patch) -url="http://www.k-3d.org/"; -sha1sums=('5d677aef76053b01281476ae25f0bd4e998d319c' \ - '068bb0671d608cdc59f556011491685725a56360' \ - '3f20ebb16cf8849ecc5caded583b11b2f25e6e16' \ - 'd6857963451ff201320ffa5b9dd3212f057f7374' \ - '26d73cea542221eed414b21b04d83232093d3cf1') - -build() { - Fcd - rm -f CMakeCache.txt || Fdie - Fsed "libpng12" "libpng14" cmake/modules/K3DFindPNG.cmake - CMake_build -} - -# optimization OK diff --git a/source/xapps-extra/k3d/k3d-0.7.11.0-libpng14.patch b/source/xapps-extra/k3d/k3d-0.7.11.0-libpng14.patch deleted file mode 100644 index 6396ffc..0000000 --- a/source/xapps-extra/k3d/k3d-0.7.11.0-libpng14.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -ur k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp ---- k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2009-03-19 22:28:53.000000000 +0200 -+++ k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2010-05-12 12:21:50.000000000 +0300 -@@ -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,NULL,NULL); - 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, NULL); - 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,NULL); - } - point2<std::ptrdiff_t> get_dimensions() { - return point2<std::ptrdiff_t>(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); -+ (int *) NULL, (int *) NULL); - 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); -+ (int *) NULL, (int *) NULL); - 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,NULL); - io_error("png_write_initialize: fail to call png_create_info_struct()"); - } - if (setjmp(png_jmpbuf(_png_ptr))) { diff --git a/source/xapps-extra/k3d/k3d-gcc-4.6.patch b/source/xapps-extra/k3d/k3d-gcc-4.6.patch deleted file mode 100644 index a82efd4..0000000 --- a/source/xapps-extra/k3d/k3d-gcc-4.6.patch +++ /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 <typename T2, typename Op> - 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/source/xapps-extra/k3d/k3d-gcc-4.7.patch b/source/xapps-extra/k3d/k3d-gcc-4.7.patch deleted file mode 100644 index 0584744..0000000 --- a/source/xapps-extra/k3d/k3d-gcc-4.7.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -Naur k3d-source-0.8.0.2/k3dsdk/data.h k3d-source-0.8.0.2new/k3dsdk/data.h ---- k3d-source-0.8.0.2/k3dsdk/data.h 2010-07-03 04:28:57.000000000 +0200 -+++ k3d-source-0.8.0.2new/k3dsdk/data.h 2012-05-03 22:44:22.894766966 +0200 -@@ -580,7 +580,7 @@ - - try - { -- set_value(boost::lexical_cast<value_t>(*new_value), Hint); -+ this->set_value(boost::lexical_cast<value_t>(*new_value), Hint); - return true; - } - catch(...) -@@ -865,7 +865,7 @@ - - try - { -- set_value(boost::lexical_cast<value_t>(*new_value), Hint); -+ this->set_value(boost::lexical_cast<value_t>(*new_value), Hint); - return true; - } - catch(...) -@@ -1011,7 +1011,7 @@ - - try - { -- set_value(boost::lexical_cast<value_t>(*new_value), Hint); -+ this->set_value(boost::lexical_cast<value_t>(*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/modules/animation/interpolator.h k3d-source-0.8.0.2new/modules/animation/interpolator.h ---- k3d-source-0.8.0.2/modules/animation/interpolator.h 2010-07-03 04:28:58.000000000 +0200 -+++ k3d-source-0.8.0.2new/modules/animation/interpolator.h 2012-05-01 13:38:21.353060659 +0200 -@@ -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/source/xapps-extra/k3d/k3d-gtkmm-224.patch b/source/xapps-extra/k3d/k3d-gtkmm-224.patch deleted file mode 100644 index e62ef08..0000000 --- a/source/xapps-extra/k3d/k3d-gtkmm-224.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- k3d-source-0.8.0.2/k3dsdk/ngui/main_document_window.cpp 2010-07-02 23:27:46.000000000 -0300 -+++ k3d-source-0.8.0.2_patched/k3dsdk/ngui/main_document_window.cpp 2011-05-01 22:24:14.000000000 -0300 -@@ -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<Gtk::TreeModel> &) 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<Gtk::TreeModel> &) model); - export_combo.pack_start(columns.icon, false); - export_combo.pack_start(columns.label); - export_combo.set_active(0); ---- k3d-source-0.8.0.2/k3dsdk/ngui/render.cpp 2010-07-02 23:27:46.000000000 -0300 -+++ k3d-source-0.8.0.2_patched/k3dsdk/ngui/render.cpp 2011-05-01 22:41:08.000000000 -0300 -@@ -169,7 +169,7 @@ - row[columns.separator] = false; - } - -- Gtk::ComboBox combo(model); -+ Gtk::ComboBox combo((Glib::RefPtr<Gtk::TreeModel> &) model); - - combo.pack_start(columns.icon, false); - -@@ -295,7 +295,7 @@ - row[columns.separator] = false; - } - -- Gtk::ComboBox combo(model); -+ Gtk::ComboBox combo((Glib::RefPtr<Gtk::TreeModel> &) model); - - combo.pack_start(columns.icon, false); - diff --git a/source/xapps-extra/k3d/k3d-gtkmm2.24.patch b/source/xapps-extra/k3d/k3d-gtkmm2.24.patch deleted file mode 100644 index 5c39f1b..0000000 --- a/source/xapps-extra/k3d/k3d-gtkmm2.24.patch +++ /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<Gtk::TreeModel> &) 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<Gtk::TreeModel> &) 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<Gtk::TreeModel> &) model); - - combo.pack_start(columns.icon, false); - -@@ -295,7 +295,7 @@ - row[columns.separator] = false; - } - -- Gtk::ComboBox combo(model); -+ Gtk::ComboBox combo((Glib::RefPtr<Gtk::TreeModel> &) model); - - combo.pack_start(columns.icon, false); - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
