diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-08 14:01:34 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-08 14:01:34 +0100 |
commit | 4645b6f17f0da81e9fe84081fb126a37102ba153 (patch) | |
tree | e6c48cf3db2213af38cf528a5364fffd5c74c6d6 /sci-chemistry/avogadro/files | |
parent | ebce8994fe3cc4ca9fbc96ca837cb4c4e98adcbd (diff) |
gentoo resync : 08.05.2018
Diffstat (limited to 'sci-chemistry/avogadro/files')
6 files changed, 0 insertions, 139 deletions
diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-boost-join-moc.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-boost-join-moc.patch deleted file mode 100644 index a464fdac42ca..000000000000 --- a/sci-chemistry/avogadro/files/avogadro-1.1.1-boost-join-moc.patch +++ /dev/null @@ -1,78 +0,0 @@ -Add include guards to all boost includes, as qt's moc trips -over nested BOOST_JOIN macros: -* usr/include/boost/type_traits/detail/has_binary_operator.hp:50: Parse error at "BOOST_JOIN" -* libavogadro/src/CMakeFiles/avogadro.dir/build.make:217: recipe for target 'libavogadro/src/moc_pythonengine_p.cxx' failed -See also: https://bugs.gentoo.org/show_bug.cgi?id=578896 - ---- avogadro-1.1.1/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 { - ---- avogadro-1.1.1/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> ---- avogadro-1.1.1/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> - ---- avogadro-1.1.1/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" - ---- avogadro-1.1.1/libavogadro/src/pythonthread_p.h -+++ avogadro-1.1.1/libavogadro/src/pythonthread_p.h -@@ -26,7 +26,9 @@ - #define PYTHONTHREAD_H - - #include <avogadro/global.h> -+#ifndef Q_MOC_RUN - #include <boost/python.hpp> -+#endif - - namespace Avogadro { - ---- avogadro-1.1.1/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> diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-mkspecs-dir.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-mkspecs-dir.patch deleted file mode 100644 index 45c616422efe..000000000000 --- a/sci-chemistry/avogadro/files/avogadro-1.1.1-mkspecs-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up avogadro-1.1.1/CMakeLists.txt.mkspecs-dir avogadro-1.1.1/CMakeLists.txt ---- avogadro-1.1.1/CMakeLists.txt.mkspecs-dir 2014-01-24 23:43:01.618510517 -0600 -+++ avogadro-1.1.1/CMakeLists.txt 2014-01-24 23:44:03.236844746 -0600 -@@ -547,7 +547,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" - ) - # endif ("${QT_MKSPECS_DIR}" MATCHES ^$"${CMAKE_INSTALL_PREFIX}/") - else() diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-no-strip.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-no-strip.patch deleted file mode 100644 index 490dd58907df..000000000000 --- a/sci-chemistry/avogadro/files/avogadro-1.1.1-no-strip.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up avogadro-1.1.1/CMakeLists.txt.no-strip avogadro-1.1.1/CMakeLists.txt ---- avogadro-1.1.1/CMakeLists.txt.no-strip 2014-01-24 23:14:44.473840038 -0600 -+++ avogadro-1.1.1/CMakeLists.txt 2014-01-24 23:15:46.869166459 -0600 -@@ -114,7 +114,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) - endif() - # Set up additional build flags for particular build types. These will be added to CMAKE_CXX_FLAGS, - # they will not replace them. -- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG_OUTPUT -Wl,-s") -+ set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG_OUTPUT") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO - "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${CMAKE_CXX_FLAGS_WARN}") - set(CMAKE_CXX_FLAGS_DEBUG "-g3 -fno-inline ${CMAKE_CXX_FLAGS_WARN}") diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-openbabel.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-openbabel.patch deleted file mode 100644 index 4bdc6b2e780e..000000000000 --- a/sci-chemistry/avogadro/files/avogadro-1.1.1-openbabel.patch +++ /dev/null @@ -1,16 +0,0 @@ - libavogadro/src/python/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libavogadro/src/python/CMakeLists.txt b/libavogadro/src/python/CMakeLists.txt -index efb518a..1a3d91a 100644 ---- a/libavogadro/src/python/CMakeLists.txt -+++ b/libavogadro/src/python/CMakeLists.txt -@@ -21,7 +21,7 @@ if (WIN32) - target_link_libraries(python-module avogadro ${PYTHON_LIBRARIES}) - else() - target_link_libraries(python-module stdc++ avogadro -- ${QT_LIBRARIES} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES}) -+ ${QT_LIBRARIES} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES} ${OPENBABEL2_LIBRARIES}) - endif() - - # Let's try to use this instead: diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-pkgconfig_eigen.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-pkgconfig_eigen.patch deleted file mode 100644 index 93dbe2ff4ecc..000000000000 --- a/sci-chemistry/avogadro/files/avogadro-1.1.1-pkgconfig_eigen.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff -up avogadro-1.1.1/avogadro.pc.in.eigen avogadro-1.1.1/avogadro.pc.in ---- avogadro-1.1.1/avogadro.pc.in.eigen 2013-12-06 09:50:04.000000000 -0600 -+++ avogadro-1.1.1/avogadro.pc.in 2014-01-25 00:37:45.732007852 -0600 -@@ -9,3 +9,4 @@ Description: Avogadro libraries - Version: @Avogadro_VERSION_FULL@ - Libs: -L${libdir} -lavogadro - Cflags: -I${pkgincludedir} -+Requires.private: eigen3 diff --git a/sci-chemistry/avogadro/files/avogadro-1.2.0-numpy.patch b/sci-chemistry/avogadro/files/avogadro-1.2.0-numpy.patch deleted file mode 100644 index 4869fa4ea79d..000000000000 --- a/sci-chemistry/avogadro/files/avogadro-1.2.0-numpy.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/modules/FindNumpy.cmake b/cmake/modules/FindNumpy.cmake -index b348418..49ba206 100644 ---- a/cmake/modules/FindNumpy.cmake -+++ b/cmake/modules/FindNumpy.cmake -@@ -10,7 +10,7 @@ - #endif (NUMPY_INCLUDE_DIR) - - EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c -- "import numpy; print numpy.get_include()" -+ "import numpy; print (numpy.get_include())" - OUTPUT_VARIABLE NUMPY_INCLUDE_DIR - OUTPUT_STRIP_TRAILING_WHITESPACE) - |