[GLC_lib] Fix with gcc46
Nicolas Chauvet
kwizart at fedoraproject.org
Sun Aug 21 18:58:22 UTC 2011
commit 8a860a3386ddec560beba60a68b85cdfb65966bc
Author: Nicolas Chauvet <kwizart at gmail.com>
Date: Sun Aug 21 20:58:00 2011 +0200
Fix with gcc46
GLC_lib.spec | 7 ++++++-
GLC_lib_src_2.2.0-gcc46.patch | 33 +++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/GLC_lib.spec b/GLC_lib.spec
index 5e2d79e..e61ed03 100644
--- a/GLC_lib.spec
+++ b/GLC_lib.spec
@@ -1,6 +1,6 @@
Name: GLC_lib
Version: 2.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: C++ class library for OpenGL application based on Qt 4
Group: System Environment/Libraries
@@ -8,6 +8,7 @@ License: LGPLv3+
URL: http://www.glc-lib.net/
Source0: http://downloads.sourceforge.net/glc-lib/GLC_lib_src_%{version}.zip
Patch0: GLC_lib_src_2.2.0-nointernal.patch
+Patch1: GLC_lib_src_2.2.0-gcc46.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt4-devel
@@ -36,6 +37,7 @@ developing applications that use %{name}.
%setup -q -c
cd glc_lib
%patch0 -p2 -b .nointernal
+%patch1 -p2 -b .gcc46
#Fix library Path on lib64
sed -i -e 's|LIB_DIR = /usr/local/lib|LIB_DIR = %{_libdir}|' GLC_lib.pro
@@ -79,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Aug 21 2011 Nicolas Chauvet <kwizart at gmail.com> - 2.2.0-2
+- Fix with gcc46
+
* Mon Jul 25 2011 Nicolas Chauvet <kwizart at gmail.com> - 2.2.0-1
- Update to 2.2.0
diff --git a/GLC_lib_src_2.2.0-gcc46.patch b/GLC_lib_src_2.2.0-gcc46.patch
new file mode 100644
index 0000000..09bb1f3
--- /dev/null
+++ b/GLC_lib_src_2.2.0-gcc46.patch
@@ -0,0 +1,33 @@
+diff -up GLC_lib-2.2.0/glc_lib/shading/glc_material.cpp.gcc46 GLC_lib-2.2.0/glc_lib/shading/glc_material.cpp
+--- GLC_lib-2.2.0/glc_lib/shading/glc_material.cpp.gcc46 2011-06-19 17:16:32.000000000 +0200
++++ GLC_lib-2.2.0/glc_lib/shading/glc_material.cpp 2011-08-21 20:53:07.376302723 +0200
+@@ -27,6 +27,7 @@
+ #include "../glc_factory.h"
+
+ #include <QtDebug>
++#include <GL/glu.h>
+
+ // Class chunk id
+ quint32 GLC_Material::m_ChunkId= 0xA703;
+diff -up GLC_lib-2.2.0/glc_lib/viewport/glc_camera.cpp.gcc46 GLC_lib-2.2.0/glc_lib/viewport/glc_camera.cpp
+--- GLC_lib-2.2.0/glc_lib/viewport/glc_camera.cpp.gcc46 2011-06-19 17:16:32.000000000 +0200
++++ GLC_lib-2.2.0/glc_lib/viewport/glc_camera.cpp 2011-08-21 20:54:56.663588066 +0200
+@@ -26,6 +26,7 @@
+ #include "glc_camera.h"
+
+ #include <QtDebug>
++#include <GL/glu.h>
+
+ using namespace glc;
+ //////////////////////////////////////////////////////////////////////
+diff -up GLC_lib-2.2.0/glc_lib/viewport/glc_viewport.cpp.gcc46 GLC_lib-2.2.0/glc_lib/viewport/glc_viewport.cpp
+--- GLC_lib-2.2.0/glc_lib/viewport/glc_viewport.cpp.gcc46 2011-06-19 17:16:32.000000000 +0200
++++ GLC_lib-2.2.0/glc_lib/viewport/glc_viewport.cpp 2011-08-21 20:55:31.104035246 +0200
+@@ -31,6 +31,7 @@
+ #include "../sceneGraph/glc_3dviewinstance.h"
+
+ #include <QtDebug>
++#include <GL/glu.h>
+
+ using namespace glc;
+ //////////////////////////////////////////////////////////////////////
More information about the scm-commits
mailing list