Attachment 876049 Details for Bug 1077865 – Build with system gl2ps instead of bundled one

[patch] Build with system gl2ps instead of bundled one

Build-with-system-gl2ps-instead-of-bundled-one.patch (text/plain), 3.29 KB, created by Ville Skyttä on 2014-03-18 18:05:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-03-18 18:05:19 UTC

Size: 3.29 KB

patch

obsolete

>From 3d33dedfc73e52933cb306f35fdf93bba913a2cf Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Tue, 18 Mar 2014 20:04:43 +0200
>Subject: [PATCH] Build with system gl2ps instead of bundled one
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1077865
>---
> qwtplot3d-0.2.7-syslibs.patch | 37 +++++++++++++++++++++++++++++++++++++
> qwtplot3d.spec                | 10 ++++++++--
> 2 files changed, 45 insertions(+), 2 deletions(-)
> create mode 100644 qwtplot3d-0.2.7-syslibs.patch
>
>diff --git a/qwtplot3d-0.2.7-syslibs.patch b/qwtplot3d-0.2.7-syslibs.patch
>new file mode 100644
>index 0000000..a9065e7
>--- /dev/null
>+++ b/qwtplot3d-0.2.7-syslibs.patch
>@@ -0,0 +1,37 @@
>+diff -up qwtplot3d/qwtplot3d.pro~ qwtplot3d/qwtplot3d.pro
>+--- qwtplot3d/qwtplot3d.pro~	2014-03-18 19:56:30.129999508 +0200
>++++ qwtplot3d/qwtplot3d.pro	2014-03-18 19:59:59.537370837 +0200
>+@@ -81,15 +81,15 @@ HEADERS += include/qwt3d_surfaceplot.h \
>+            include/qwt3d_multiplot.h
>+ 
>+ # gl2ps support
>+-HEADERS+=3rdparty/gl2ps/gl2ps.h \
>+-         include/qwt3d_io_gl2ps.h
>++HEADERS+=include/qwt3d_io_gl2ps.h
>+          
>+-SOURCES+=src/qwt3d_io_gl2ps.cpp \
>+-         3rdparty/gl2ps/gl2ps.c
>++SOURCES+=src/qwt3d_io_gl2ps.cpp
>++
>++LIBS+=-lgl2ps
>+ 
>+ # zlib support for gl2ps
>+ zlib {
>+   DEFINES += GL2PS_HAVE_ZLIB
>+   win32:LIBS += zlib.lib
>+ 	unix:LIBS  += -lz
>+-}
>+\ No newline at end of file
>++}
>+diff -up qwtplot3d/src/qwt3d_io_gl2ps.cpp~ qwtplot3d/src/qwt3d_io_gl2ps.cpp
>+--- qwtplot3d/src/qwt3d_io_gl2ps.cpp~	2007-06-25 16:41:14.000000000 +0300
>++++ qwtplot3d/src/qwt3d_io_gl2ps.cpp	2014-03-18 19:59:15.313446910 +0200
>+@@ -4,7 +4,7 @@
>+ 
>+ #include <time.h>
>+ #include "qwt3d_openglhelper.h"
>+-#include "../3rdparty/gl2ps/gl2ps.h"
>++#include <gl2ps.h>
>+ #include "qwt3d_io_gl2ps.h"
>+ #include "qwt3d_plot.h"
>+ 
>diff --git a/qwtplot3d.spec b/qwtplot3d.spec
>index fb6028a..cc36546 100644
>--- a/qwtplot3d.spec
>+++ b/qwtplot3d.spec
>@@ -3,7 +3,7 @@
> 
> Name:           qwtplot3d
> Version:        0.2.7
>-Release:        15%{?dist}
>+Release:        16%{?dist}
> Summary:        Qt/OpenGL-based C++ library providing a bunch of 3D-widgets
> 
> Group:          System Environment/Libraries
>@@ -11,6 +11,7 @@ Group:          System Environment/Libraries
> License:        zlib
> URL:            http://qwtplot3d.sourceforge.net/
> Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tgz
>+Patch0:         %{name}-0.2.7-syslibs.patch
> 
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
>@@ -19,6 +20,7 @@ Patch50:  qwtplot3d-glu.patch
> 
> BuildRequires:  qt3-devel
> BuildRequires:  libXmu-devel
>+BuildRequires:  gl2ps-devel
> 
> %description
> QwtPlot3D is not a program, but a feature-rich Qt/OpenGL-based C++
>@@ -62,7 +64,8 @@ developing applications that use %{name}.
> 
> %prep
> %setup -q -n %{name}
>-
>+%patch0 -p1 -b .syslibs
>+rm -r 3rdparty
> %patch50 -p1 -b .glu
> 
> #fix line endings
>@@ -165,6 +168,9 @@ ln -s libqwtplot3d-qt4.so.%{version} %{buildroot}%{_qt4_libdir}/libqwtplot3d-qt4
> 
> 
> %changelog
>+* Tue Mar 18 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 0.2.7-16
>+- Build with system gl2ps instead of bundled one
>+
> * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.7-15
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
> 
>-- 
>1.8.3.1

Actions: View | Diff

Attachments on bug 1077865: 876049