Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=cc928e3716875fca7c23bcfc098acf63d089a89e
commit cc928e3716875fca7c23bcfc098acf63d089a89e Author: Devil505 <devil505li...@gmail.com> Date: Fri Jan 14 17:02:17 2011 +0100 k3d-0.8.0.1-1-i686 * version bump * removing useless patches diff --git a/source/xapps-extra/k3d/FrugalBuild b/source/xapps-extra/k3d/FrugalBuild index 95636dc..5475708 100644 --- a/source/xapps-extra/k3d/FrugalBuild +++ b/source/xapps-extra/k3d/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: Mcklaren <mckla...@gmail.com> pkgname=k3d -pkgver=0.7.11.0 -pkgrel=3 +pkgver=0.8.0.1 +pkgrel=1 pkgdesc="A complete free-as-in-freedom 3D modeling, animation and rendering system." depends=('gtkglext' 'imagemagick>=6.4.8_9' 'librsvg' 'gts' 'python>=2.7' 'openexr>=1.6.1' 'libxml2' 'libsigc++2' \ 'freetype2' 'plib' 'graphviz' 'libtiff' 'atk' 'gtkmm>=2.16.0-2' 'pango' 'glibmm' 'libboost-mt>=1.37.0') @@ -17,17 +17,13 @@ _F_sourceforge_ext=".tar.gz" _F_sourceforge_name="$pkgname-source" Finclude sourceforge cmake source=($source \ -$pkgname-$pkgver-libpng14.patch \ -$pkgname-$pkgver-gcc45.patch \ -$pkgname-$pkgver-fix-potfiles.patch) +$pkgname-0.7.11.0-libpng14.patch) url="http://www.k-3d.org/" -sha1sums=('cef63043c7bd8d7a130689e9b53d1023280e2978' \ - '068bb0671d608cdc59f556011491685725a56360' \ - '30a406600c59becb6b7513fc99abda390ae82143' \ - 'c9d50079825db508deb612dd416223c5b98fe705') +sha1sums=('786d800cc54cdf9f93766497bbda1f0e64367229' \ + '068bb0671d608cdc59f556011491685725a56360') build() { - Fcd + Fcd $_F_sourceforge_name-$pkgver rm -f CMakeCache.txt || Fdie Fsed "libpng12" "libpng14" cmake/modules/K3DFindPNG.cmake CMake_build diff --git a/source/xapps-extra/k3d/k3d-0.7.11.0-fix-potfiles.patch b/source/xapps-extra/k3d/k3d-0.7.11.0-fix-potfiles.patch deleted file mode 100644 index fcba656..0000000 --- a/source/xapps-extra/k3d/k3d-0.7.11.0-fix-potfiles.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/po/POTFILES.in 2009-03-20 05:29:03.000000000 +0900 -+++ b/po/POTFILES.in 2009-03-21 16:58:26.811108311 +0900 -@@ -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 -@@ -531,3 +530,7 @@ - uimodules/qtui/user_interface.cpp - k3dsdk/mesh_writer.h - modules/ply_io/mesh_writer.cpp -+modules/lipsync/papagayo_lipsync_reader.cpp -+modules/named_arrays/named_text_array.cpp -+modules/ngui_python_shell/dialog.cpp -+modules/xtrackcad/document_importer.cpp - diff --git a/source/xapps-extra/k3d/k3d-0.7.11.0-gcc45.patch b/source/xapps-extra/k3d/k3d-0.7.11.0-gcc45.patch deleted file mode 100644 index 6917170..0000000 --- a/source/xapps-extra/k3d/k3d-0.7.11.0-gcc45.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 <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 _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git