[Frugalware-git] boost149: k3d-0.8.0.2-2-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=boost149.git;a=commitdiff;h=d23f74076b010a1403501185e32dfbc2ea046e55
commit d23f74076b010a1403501185e32dfbc2ea046e55
Author: Elentir
Date: Tue May 1 12:27:38 2012 +0200
k3d-0.8.0.2-2-x86_64
* rebuild with boost>=1.49.0
diff --git a/source/xapps-extra/k3d/FrugalBuild
b/source/xapps-extra/k3d/FrugalBuild
index 55ed7ec..d0fcbb7 100644
--- a/source/xapps-extra/k3d/FrugalBuild
+++ b/source/xapps-extra/k3d/FrugalBuild
@@ -4,10 +4,10 @@
pkgname=k3d
pkgver=0.8.0.2
-pkgrel=1
+pkgrel=2
pkgdesc="A complete free-as-in-freedom 3D modeling, animation and rendering
system."
depends=('gtkglext' 'imagemagick>=6.6.8_5-3' 'librsvg' 'gts' 'python>=2.7'
'openexr>=1.7.0' 'libxml2' 'libsigc++2' \
- 'freetype2' 'plib' 'graphviz' 'libtiff' 'atk' 'gtkmm2' 'pango' 'glibmm'
'libboost>=1.46.1')
+ 'freetype2' 'plib' 'graphviz' 'libtiff' 'atk' 'gtkmm2' 'pango' 'glibmm'
'libboost>=1.49.0' 'libglu')
makedepends=('boost')
groups=('xapps-extra')
archs=('i686' 'x86_64')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] boost149: k3d-0.8.0.2-2-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=boost149.git;a=commitdiff;h=6dd78e3bb0bdef93b2a84c020c440bba40fa703a
commit 6dd78e3bb0bdef93b2a84c020c440bba40fa703a
Author: Elentir
Date: Thu May 3 22:05:58 2012 +0200
k3d-0.8.0.2-2-x86_64
* add patch to fix build
diff --git a/source/xapps-extra/k3d/FrugalBuild
b/source/xapps-extra/k3d/FrugalBuild
index d0fcbb7..91c685d 100644
--- a/source/xapps-extra/k3d/FrugalBuild
+++ b/source/xapps-extra/k3d/FrugalBuild
@@ -19,12 +19,14 @@ Finclude sourceforge cmake
source=($source \
$pkgname-0.7.11.0-libpng14.patch \
$pkgname-gcc-4.6.patch \
- $pkgname-gtkmm2.24.patch)
+ $pkgname-gtkmm2.24.patch \
+ $pkgname-gcc-4.7.patch)
url="http://www.k-3d.org/";
sha1sums=('5d677aef76053b01281476ae25f0bd4e998d319c' \
'068bb0671d608cdc59f556011491685725a56360' \
'3f20ebb16cf8849ecc5caded583b11b2f25e6e16' \
- 'd6857963451ff201320ffa5b9dd3212f057f7374')
+ 'd6857963451ff201320ffa5b9dd3212f057f7374' \
+ '80259691317a35479ddde9e6743e6d2caae3e61b')
build() {
Fcd $_F_sourceforge_name-$pkgver
diff --git a/source/xapps-extra/k3d/k3d-gcc-4.7.patch
b/source/xapps-extra/k3d/k3d-gcc-4.7.patch
new file mode 100644
index 000..abb10bc
--- /dev/null
+++ b/source/xapps-extra/k3d/k3d-gcc-4.7.patch
@@ -0,0 +1,60 @@
+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.0 +0200
k3d-source-0.8.0.2new/k3dsdk/data.h2012-05-01 13:37:40.489058108
+0200
+@@ -580,7 +580,7 @@
+
+ try
+ {
+- set_value(boost::lexical_cast(*new_value),
Hint);
++
this->set_value(boost::lexical_cast(*new_value), Hint);
+ return true;
+ }
+ catch(...)
+@@ -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;
+ }
+
+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.h2010-07-03
04:28:58.0 +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:
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] boost149: k3d-0.8.0.2-2-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=boost149.git;a=commitdiff;h=db389980da7e3686843078c0a191f1b97e395c15
commit db389980da7e3686843078c0a191f1b97e395c15
Author: Elentir
Date: Thu May 3 23:12:07 2012 +0200
k3d-0.8.0.2-2-x86_64
* fix patch
diff --git a/source/xapps-extra/k3d/FrugalBuild
b/source/xapps-extra/k3d/FrugalBuild
index 91c685d..268b967 100644
--- a/source/xapps-extra/k3d/FrugalBuild
+++ b/source/xapps-extra/k3d/FrugalBuild
@@ -26,7 +26,7 @@ sha1sums=('5d677aef76053b01281476ae25f0bd4e998d319c' \
'068bb0671d608cdc59f556011491685725a56360' \
'3f20ebb16cf8849ecc5caded583b11b2f25e6e16' \
'd6857963451ff201320ffa5b9dd3212f057f7374' \
- '80259691317a35479ddde9e6743e6d2caae3e61b')
+ '26d73cea542221eed414b21b04d83232093d3cf1')
build() {
Fcd $_F_sourceforge_name-$pkgver
diff --git a/source/xapps-extra/k3d/k3d-gcc-4.7.patch
b/source/xapps-extra/k3d/k3d-gcc-4.7.patch
index abb10bc..0584744 100644
--- a/source/xapps-extra/k3d/k3d-gcc-4.7.patch
+++ b/source/xapps-extra/k3d/k3d-gcc-4.7.patch
@@ -1,6 +1,6 @@
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.h2010-07-03 04:28:57.0 +0200
-+++ k3d-source-0.8.0.2new/k3dsdk/data.h2012-05-01 13:37:40.489058108
+0200
k3d-source-0.8.0.2new/k3dsdk/data.h2012-05-03 22:44:22.894766966
+0200
@@ -580,7 +580,7 @@
try
@@ -37,6 +37,15 @@ diff -Naur k3d-source-0.8.0.2/k3dsdk/data.h
k3d-source-0.8.0.2new/k3dsdk/data.h
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.0 +0200
+++ k3d-source-0.8.0.2new/modules/animation/interpolator.h 2012-05-01
13:38:21.353060659 +0200
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
