Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (011322fe91d8d61905a6bbfb2ee67902ab22cd35)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (011322fe91d8d61905a6bbfb2ee67902ab22cd35)
  • Date: Sat, 19 May 2012 16:25:01 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

devel/qwtplot3d/HISTORY | 4 ++++
devel/qwtplot3d/PRE_BUILD | 5 +++--
devel/qwtplot3d/qwtplot3d-qt48.patch | 19 +++++++++++++++++++
3 files changed, 26 insertions(+), 2 deletions(-)

New commits:
commit 011322fe91d8d61905a6bbfb2ee67902ab22cd35
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/qwtplot3d: fix compile error with qt 4.8

diff --git a/devel/qwtplot3d/HISTORY b/devel/qwtplot3d/HISTORY
index c93ee5a..ceca561 100644
--- a/devel/qwtplot3d/HISTORY
+++ b/devel/qwtplot3d/HISTORY
@@ -1,3 +1,7 @@
+2012-05-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, qwtplot3d-qt48.patch: added patch from gentoo to fix
compile
+ error
+
2011-06-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, gcc-4.5.patch: fixed build with gcc 4.5

diff --git a/devel/qwtplot3d/PRE_BUILD b/devel/qwtplot3d/PRE_BUILD
index 6809647..2f27e08 100755
--- a/devel/qwtplot3d/PRE_BUILD
+++ b/devel/qwtplot3d/PRE_BUILD
@@ -1,3 +1,4 @@
-default_pre_build &&
+default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p0 < ${SCRIPT_DIRECTORY}/gcc-4.5.patch
+patch -p0 < ${SCRIPT_DIRECTORY}/gcc-4.5.patch &&
+patch -p1 < ${SCRIPT_DIRECTORY}/qwtplot3d-qt48.patch
diff --git a/devel/qwtplot3d/qwtplot3d-qt48.patch
b/devel/qwtplot3d/qwtplot3d-qt48.patch
new file mode 100644
index 0000000..4e558ed
--- /dev/null
+++ b/devel/qwtplot3d/qwtplot3d-qt48.patch
@@ -0,0 +1,19 @@
+ include/qwt3d_openglhelper.h | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/include/qwt3d_openglhelper.h b/include/qwt3d_openglhelper.h
+index e5499c2..a7ecddc 100644
+--- a/include/qwt3d_openglhelper.h
++++ b/include/qwt3d_openglhelper.h
+@@ -8,6 +8,11 @@
+ #include <QtOpenGL/qgl.h>
+ #endif
+
++#if QT_VERSION < 0x047999
++#include <GL/glu.h>
++#endif
++
++
+ namespace Qwt3D
+ {
+



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (011322fe91d8d61905a6bbfb2ee67902ab22cd35), Florian Franzmann, 05/19/2012

Archive powered by MHonArc 2.6.24.

Top of Page