Attachment 571980 Details for Bug 805684 – Patch to the GIT repo

[patch] Patch to the GIT repo

0001-Allow-support-for-Qt-4.8.0.patch (text/plain), 2.76 KB, created by Gareth Coco on 2012-03-22 12:31:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gareth Coco

Created: 2012-03-22 12:31:10 UTC

Size: 2.76 KB

patch

obsolete

>From 5f93b28b77f963a0752660e1242a7783aaf8a370 Mon Sep 17 00:00:00 2001
>From: G Coco <garethcoco@gmail.com>
>Date: Wed, 21 Mar 2012 15:47:42 -0400
>Subject: [PATCH] Allow support for Qt 4.8.0
>
>Based on:
> http://qwtplot3d.svn.sourceforge.net/viewvc/qwtplot3d?view=revision&revision=254
>---
> qwtplot3d-qt4.8.0.patch |   40 ++++++++++++++++++++++++++++++++++++++++
> qwtplot3d.spec          |    8 ++++++++
> 2 files changed, 48 insertions(+), 0 deletions(-)
> create mode 100644 qwtplot3d-qt4.8.0.patch
>
>diff --git a/qwtplot3d-qt4.8.0.patch b/qwtplot3d-qt4.8.0.patch
>new file mode 100644
>index 0000000..1824102
>--- /dev/null
>+++ b/qwtplot3d-qt4.8.0.patch
>@@ -0,0 +1,39 @@
>+From 2c4fdc64b8408111da53e0f06992c25a3eaa9dc8 Mon Sep 17 00:00:00 2001
>+From: G Coco <garethcoco@gmail.com>
>+Date: Wed, 21 Mar 2012 12:39:52 -0400
>+Subject: [PATCH] Qt 4.8.0 support
>+
>+---
>+ include/qwt3d_io_gl2ps.h     |    2 +-
>+ include/qwt3d_openglhelper.h |    3 ++-
>+ 2 files changed, 3 insertions(+), 2 deletions(-)
>+
>+diff --git a/include/qwt3d_io_gl2ps.h b/include/qwt3d_io_gl2ps.h
>+index 2bbeb43..e0cbf80 100644
>+--- a/include/qwt3d_io_gl2ps.h
>++++ b/include/qwt3d_io_gl2ps.h
>+@@ -6,7 +6,7 @@
>+ #if QT_VERSION < 0x040000
>+ #include <qgl.h>
>+ #else
>+-#include <QtOpenGL/qgl.h>
>++#include <QtOpenGL>
>+ #endif
>+
>+ #include "qwt3d_types.h"
>+diff --git a/include/qwt3d_openglhelper.h b/include/qwt3d_openglhelper.h
>+index e5499c2..4778181 100644
>+--- a/include/qwt3d_openglhelper.h
>++++ b/include/qwt3d_openglhelper.h
>+@@ -5,7 +5,8 @@
>+ #if QT_VERSION < 0x040000
>+ #include <qgl.h>
>+ #else
>+-#include <QtOpenGL/qgl.h>
>++#include <QtOpenGL>
>++#include <GL/glu.h>
>+ #endif
>+
>+ namespace Qwt3D
>+--
>+1.7.4.4
>diff --git a/qwtplot3d.spec b/qwtplot3d.spec
>index 949a306..0fcbc8d 100644
>--- a/qwtplot3d.spec
>+++ b/qwtplot3d.spec
>@@ -12,6 +12,10 @@ License:        zlib
> URL:            http://qwtplot3d.sourceforge.net/
> Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tgz
> 
>+# Make things work with Qt4.8.0
>+# From: http://qwtplot3d.svn.sourceforge.net/viewvc/qwtplot3d?view=revision&revision=254
>+Patch1:         qwtplot3d-qt4.8.0.patch
>+
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildRequires:  qt3-devel
>@@ -59,6 +63,7 @@ developing applications that use %{name}.
> 
> %prep
> %setup -q -n %{name}
>+%patch1 -p1 -b .qt4.8.0
> 
> #fix line endings
> %{__sed} -i 's/\r//' COPYING
>@@ -160,6 +165,9 @@ ln -s libqwtplot3d-qt4.so.%{version} %{buildroot}%{_qt4_libdir}/libqwtplot3d-qt4
> 
> 
> %changelog
>+* Wed Mar 03 2012 Gareth Coco <garethcoco@gmail.com> - 0.2.7-12
>+- Fixes issue with building with Qt 4.8.0
>+
> * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.7-11
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
> 
>-- 
>1.7.4.4
>

Actions: View | Diff

Attachments on bug 805684: 571980