Hello community,
here is the log from the commit of package avogadro for openSUSE:Factory
checked in at 2016-01-10 13:07:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/avogadro (Old)
and /work/SRC/openSUSE:Factory/.avogadro.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "avogadro"
Changes:
--------
--- /work/SRC/openSUSE:Factory/avogadro/avogadro.changes 2015-04-10
09:50:32.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.avogadro.new/avogadro.changes 2016-01-10
13:09:21.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Jan 7 14:06:44 UTC 2016 - idon...@suse.com
+
+- Add avogadro-boost.patch to fix build failures with boost 1.60.0
+
+-------------------------------------------------------------------
New:
----
avogadro-boost.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ avogadro.spec ++++++
--- /var/tmp/diff_new_pack.yvQKJs/_old 2016-01-10 13:09:23.000000000 +0100
+++ /var/tmp/diff_new_pack.yvQKJs/_new 2016-01-10 13:09:23.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package avogadro
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -31,6 +31,7 @@
# PATCH-FIX-UPSTREAM avogadro-cmake-3.2.patch -- sfal...@gmail.com
Patch2: avogadro-cmake-3.2.patch
Patch3: arm-qreal-vs-double.patch
+Patch4: avogadro-boost.patch
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: docbook-utils
@@ -104,6 +105,7 @@
%patch1 -p1
%patch2 -p1
%patch3
+%patch4 -p1
%build
%cmake \
++++++ avogadro-boost.patch ++++++
Index: avogadro-1.1.1/libavogadro/src/pythonengine_p.h
===================================================================
--- avogadro-1.1.1.orig/libavogadro/src/pythonengine_p.h
+++ avogadro-1.1.1/libavogadro/src/pythonengine_p.h
@@ -27,7 +27,9 @@
#include <avogadro/global.h>
#include <avogadro/engine.h>
+#ifndef Q_MOC_RUN
#include <boost/python.hpp>
+#endif
namespace Avogadro {
Index: avogadro-1.1.1/libavogadro/src/pythonextension_p.h
===================================================================
--- avogadro-1.1.1.orig/libavogadro/src/pythonextension_p.h
+++ avogadro-1.1.1/libavogadro/src/pythonextension_p.h
@@ -29,7 +29,9 @@
#include <avogadro/extension.h>
#include <avogadro/primitive.h>
#include <avogadro/glwidget.h>
+#ifndef Q_MOC_RUN
#include <boost/python.hpp>
+#endif
#include <QWidget>
#include <QList>
Index: avogadro-1.1.1/libavogadro/src/pythontool_p.h
===================================================================
--- avogadro-1.1.1.orig/libavogadro/src/pythontool_p.h
+++ avogadro-1.1.1/libavogadro/src/pythontool_p.h
@@ -27,7 +27,9 @@
#include <avogadro/global.h>
#include <avogadro/tool.h>
+#ifndef Q_MOC_RUN
#include <boost/python.hpp>
+#endif
#include <QObject>
#include <QAction>
Index: avogadro-1.1.1/libavogadro/src/pythoninterpreter.h
===================================================================
--- avogadro-1.1.1.orig/libavogadro/src/pythoninterpreter.h
+++ avogadro-1.1.1/libavogadro/src/pythoninterpreter.h
@@ -26,7 +26,9 @@
#define PYTHONINTERPRETER_H
#include <avogadro/global.h>
+#ifndef Q_MOC_RUN
#include <boost/python.hpp>
+#endif
#include <avogadro/primitive.h>
#include <QString>
Index: avogadro-1.1.1/libavogadro/src/pythonscript.h
===================================================================
--- avogadro-1.1.1.orig/libavogadro/src/pythonscript.h
+++ avogadro-1.1.1/libavogadro/src/pythonscript.h
@@ -27,7 +27,9 @@
#define PYTHONSCRIPT_H
#include <avogadro/global.h>
+#ifndef Q_MOC_RUN
#include <boost/python.hpp>
+#endif
#include "pythonerror.h"
