[IQmol] Patch for support for newer QGLViewer.

Susi Lehtola jussilehtola at fedoraproject.org
Tue Mar 4 20:37:00 UTC 2014


commit 534d23681673410e3cf8a3a8c2cad2270c984af1
Author: Susi Lehtola <jussilehtola at fedoraproject.org>
Date:   Tue Mar 4 22:36:48 2014 +0200

    Patch for support for newer QGLViewer.

 IQmol-2.2.0-qglviewer.patch |   13 +++++++++++++
 IQmol.spec                  |    8 +++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/IQmol-2.2.0-qglviewer.patch b/IQmol-2.2.0-qglviewer.patch
new file mode 100644
index 0000000..5c17112
--- /dev/null
+++ b/IQmol-2.2.0-qglviewer.patch
@@ -0,0 +1,13 @@
+diff -up IQmol-0d68f59c52a94734160ef644110bc918d6c132ed/src/Viewer.h.orig IQmol-0d68f59c52a94734160ef644110bc918d6c132ed/src/Viewer.h
+--- IQmol-0d68f59c52a94734160ef644110bc918d6c132ed/src/Viewer.h.orig	2013-07-16 03:46:33.000000000 +0300
++++ IQmol-0d68f59c52a94734160ef644110bc918d6c132ed/src/Viewer.h	2014-03-04 22:17:51.514837582 +0200
+@@ -35,7 +35,8 @@
+ #include "Animator.h"
+ #include "Snapshot.h"
+ #include "IQmol.h"
+-#include "QGLViewer/qglviewer.h"
++#include <QGLViewer/qglviewer.h>
++#include <QGLViewer/manipulatedFrame.h>
+ #include <QFontMetrics>
+ #include <QStandardItemModel>
+ #include <QItemSelectionModel>
diff --git a/IQmol.spec b/IQmol.spec
index 06e58fa..1174083 100644
--- a/IQmol.spec
+++ b/IQmol.spec
@@ -3,7 +3,7 @@
 
 Name:           IQmol
 Version:        2.2.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A free open-source molecular editor and visualization package
 Group:          Applications/Engineering
 License:        BSD and GPLv2+ and GPLv3+
@@ -19,6 +19,8 @@ Patch2:         IQmol-2.2.0-openbabel.patch
 Patch3:         IQmol-2.2.0-qreal.patch
 # Fix build against QsLog in Fedora
 Patch4:         IQmol-2.2.0-qslog.patch
+# Fix build against newer QGLViewer in Fedora
+Patch5:         IQmol-2.2.0-qglviewer.patch
 
 
 BuildRequires:  qt4-devel
@@ -53,6 +55,7 @@ This package contains samples for IQmol.
 %patch2 -p1 -b .openbabel
 %patch3 -p1 -b .qreal
 %patch4 -p1 -b .qslog
+%patch5 -p1 -b .qglviewer
 # Fix executable permissions
 find . -type f -exec chmod 644 {} \;
 # Remove bundled GL2PS
@@ -87,6 +90,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/IQmol.desktop
 %doc samples/*
 
 %changelog
+* Tue Mar 04 2014 Susi Lehtola <jussilehtola at fedoraproject.org> - 2.2.0-7
+- Fix build against newer QGLViewer in rawhide.
+
 * Wed Dec 18 2013 Susi Lehtola <jussilehtola at fedoraproject.org> - 2.2.0-6
 - Review fixes.
 


More information about the scm-commits mailing list