diff options
Diffstat (limited to 'academic/avogadro/patches')
-rw-r--r-- | academic/avogadro/patches/avogadro-1.0.3-mkspecs-dir.patch | 12 | ||||
-rw-r--r-- | academic/avogadro/patches/boost-1.48.patch | 56 | ||||
-rw-r--r-- | academic/avogadro/patches/gcc-4.7.patch | 22 |
3 files changed, 0 insertions, 90 deletions
diff --git a/academic/avogadro/patches/avogadro-1.0.3-mkspecs-dir.patch b/academic/avogadro/patches/avogadro-1.0.3-mkspecs-dir.patch deleted file mode 100644 index a1e9ec92bd..0000000000 --- a/academic/avogadro/patches/avogadro-1.0.3-mkspecs-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur avogadro-1.0.3/CMakeLists.txt avogadro-1.0.3-mkspecs-dir/CMakeLists.txt ---- avogadro-1.0.3/CMakeLists.txt 2011-04-25 07:29:58.000000000 +0200 -+++ avogadro-1.0.3-mkspecs-dir/CMakeLists.txt 2011-04-27 02:42:26.000000000 +0200 -@@ -491,7 +491,7 @@ - if(QT_MKSPECS_DIR AND INSTALL_QMAKE_PRF) - install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/avogadro.prf" -- DESTINATION "${CMAKE_INSTALL_PREFIX}/${QT_MKSPECS_RELATIVE}/features" -+ DESTINATION "${QT_MKSPECS_DIR}/features" - ) - else(QT_MKSPECS_DIR AND INSTALL_QMAKE_PRF) - message(WARNING "Qt mkspecs directory not found. File 'avogadro.prf' will be installed to ${SHARE_INSTALL_PREFIX}/avogadro/qmake.") diff --git a/academic/avogadro/patches/boost-1.48.patch b/academic/avogadro/patches/boost-1.48.patch deleted file mode 100644 index 380af0c938..0000000000 --- a/academic/avogadro/patches/boost-1.48.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -Naur avogadro-1.0.3.orig/libavogadro/src/extensions/pythonterminal.h avogadro-1.0.3/libavogadro/src/extensions/pythonterminal.h ---- avogadro-1.0.3.orig/libavogadro/src/extensions/pythonterminal.h 2011-04-25 05:22:18.000000000 +0000 -+++ avogadro-1.0.3/libavogadro/src/extensions/pythonterminal.h 2012-07-12 02:35:19.324975289 +0000 -@@ -23,6 +23,10 @@ - #ifndef PYTHONTERMINAL_H - #define PYTHONTERMINAL_H - -+#ifdef Q_MOC_RUN -+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED -+#endif -+ - #include <avogadro/extension.h> - #include <avogadro/primitive.h> - #include <avogadro/glwidget.h> -diff -Naur avogadro-1.0.3.orig/libavogadro/src/pythonengine_p.h avogadro-1.0.3/libavogadro/src/pythonengine_p.h ---- avogadro-1.0.3.orig/libavogadro/src/pythonengine_p.h 2011-04-25 05:22:18.000000000 +0000 -+++ avogadro-1.0.3/libavogadro/src/pythonengine_p.h 2012-07-12 02:32:39.429980751 +0000 -@@ -25,6 +25,10 @@ - #ifndef PYTHONENGINE_H - #define PYTHONENGINE_H - -+#ifdef Q_MOC_RUN -+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED -+#endif -+ - #include <avogadro/global.h> - #include <avogadro/engine.h> - #include <boost/python.hpp> -diff -Naur avogadro-1.0.3.orig/libavogadro/src/pythonextension_p.h avogadro-1.0.3/libavogadro/src/pythonextension_p.h ---- avogadro-1.0.3.orig/libavogadro/src/pythonextension_p.h 2011-04-25 05:22:18.000000000 +0000 -+++ avogadro-1.0.3/libavogadro/src/pythonextension_p.h 2012-07-12 02:33:46.838978444 +0000 -@@ -26,6 +26,10 @@ - #ifndef PYTHONEXTENSION_H - #define PYTHONEXTENSION_H - -+#ifdef Q_MOC_RUN -+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED -+#endif -+ - #include <avogadro/extension.h> - #include <avogadro/primitive.h> - #include <avogadro/glwidget.h> -diff -Naur avogadro-1.0.3.orig/libavogadro/src/pythontool_p.h avogadro-1.0.3/libavogadro/src/pythontool_p.h ---- avogadro-1.0.3.orig/libavogadro/src/pythontool_p.h 2011-04-25 05:22:18.000000000 +0000 -+++ avogadro-1.0.3/libavogadro/src/pythontool_p.h 2012-07-12 02:34:14.068977512 +0000 -@@ -25,6 +25,10 @@ - #ifndef PYTHONTOOL_H - #define PYTHONTOOL_H - -+#ifdef Q_MOC_RUN -+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED -+#endif -+ - #include <avogadro/global.h> - #include <avogadro/tool.h> - #include <boost/python.hpp> diff --git a/academic/avogadro/patches/gcc-4.7.patch b/academic/avogadro/patches/gcc-4.7.patch deleted file mode 100644 index ffa4cd9439..0000000000 --- a/academic/avogadro/patches/gcc-4.7.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur avogadro-1.0.3.orig/avogadro/src/mainwindow.h avogadro-1.0.3/avogadro/src/mainwindow.h ---- avogadro-1.0.3.orig/avogadro/src/mainwindow.h 2011-04-25 05:22:18.000000000 +0000 -+++ avogadro-1.0.3/avogadro/src/mainwindow.h 2012-07-11 13:57:36.624006453 +0000 -@@ -24,6 +24,7 @@ - #ifndef MAINWINDOW_H - #define MAINWINDOW_H - -+#include <cstddef> - #include <Eigen/Geometry> - #include "ui_mainwindow.h" - #include "flattabwidget.h" -diff -Naur avogadro-1.0.3.orig/libavogadro/src/tools/eyecandy.h avogadro-1.0.3/libavogadro/src/tools/eyecandy.h ---- avogadro-1.0.3.orig/libavogadro/src/tools/eyecandy.h 2011-04-25 05:22:18.000000000 +0000 -+++ avogadro-1.0.3/libavogadro/src/tools/eyecandy.h 2012-07-11 13:43:22.892050693 +0000 -@@ -25,6 +25,7 @@ - #ifndef EYECANDY_H - #define EYECANDY_H - -+#include <cstddef> - #include <Eigen/Core> - - namespace Avogadro { |