[IQmol] Try to fix ftbfs in f21 and f22.

Susi Lehtola jussilehtola at fedoraproject.org
Sat Sep 6 04:07:04 UTC 2014


commit 3c33219d7416c1aa15553133ccec731f743383a8
Author: Susi Lehtola <jussilehtola at fedoraproject.org>
Date:   Sat Sep 6 06:10:03 2014 +0200

    Try to fix ftbfs in f21 and f22.

 IQmol-2.3.0-qglviewer.patch |   12 ++++++++++++
 IQmol.spec                  |    3 +++
 2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/IQmol-2.3.0-qglviewer.patch b/IQmol-2.3.0-qglviewer.patch
new file mode 100644
index 0000000..300c689
--- /dev/null
+++ b/IQmol-2.3.0-qglviewer.patch
@@ -0,0 +1,12 @@
+diff -up IQmol-df94cf68b9d9d813e4d781c7edb9ac638724dadf/src/IQmol/ManipulateHandler.C.qglviewer IQmol-df94cf68b9d9d813e4d781c7edb9ac638724dadf/src/IQmol/ManipulateHandler.C
+diff -up IQmol-df94cf68b9d9d813e4d781c7edb9ac638724dadf/src/IQmol/Viewer.h.qglviewer IQmol-df94cf68b9d9d813e4d781c7edb9ac638724dadf/src/IQmol/Viewer.h
+--- IQmol-df94cf68b9d9d813e4d781c7edb9ac638724dadf/src/IQmol/Viewer.h.qglviewer	2014-05-27 09:19:34.000000000 +0200
++++ IQmol-df94cf68b9d9d813e4d781c7edb9ac638724dadf/src/IQmol/Viewer.h	2014-09-06 06:07:23.103300262 +0200
+@@ -36,6 +36,7 @@
+ #include "Snapshot.h"
+ #include "IQmol.h"
+ #include "QGLViewer/qglviewer.h"
++#include "QGLViewer/manipulatedFrame.h"
+ #include <QFontMetrics>
+ #include <QStandardItemModel>
+ #include <QItemSelectionModel>
diff --git a/IQmol.spec b/IQmol.spec
index 03fa484..6975e0b 100644
--- a/IQmol.spec
+++ b/IQmol.spec
@@ -15,6 +15,8 @@ Patch0:         IQmol-2.3.0-fedora.patch
 Patch1:         IQmol-2.3.0-fragdir.patch
 # Disable nmr procedure that fails to link
 Patch2:         IQmol-2.3.0-nmr.patch
+# Add in missing includes
+Patch3:         IQmol-2.3.0-qglviewer.patch
 
 BuildRequires:  qt4-devel
 BuildRequires:  gcc-gfortran
@@ -47,6 +49,7 @@ This package contains samples for IQmol.
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .fragdir
 %patch2 -p1 -b .nmr
+%patch3 -p1 -b .qglviewer
 # Get rid of bundled gl2ps
 rm src/IQmol/gl2ps.{h,C}
 # and of QMsgBox


More information about the scm-commits mailing list