diff options
Diffstat (limited to 'science/avogadro/files')
7 files changed, 0 insertions, 129 deletions
diff --git a/science/avogadro/files/patch-CMakeLists.txt b/science/avogadro/files/patch-CMakeLists.txt deleted file mode 100644 index c64c3b974eee..000000000000 --- a/science/avogadro/files/patch-CMakeLists.txt +++ /dev/null @@ -1,53 +0,0 @@ -Explicitly look for X11 when using it. - -This fixes the build with CMake 3.2, whose FindOpenGL.cmake stopped -calling find_package(X11). - -Instead, do that ourselves when Q_WS_X11 is true, since that is when we -already try to link against libX11. - -Sent upstream: https://github.com/cryos/avogadro/pull/13 ---- CMakeLists.txt.orig 2016-06-08 14:19:45 UTC -+++ CMakeLists.txt -@@ -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 -Wl,-s") - 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}") -@@ -196,8 +196,8 @@ if(${CMAKE_CXX_COMPILER_ID} MATCHES Inte - endif() - endif() - -- set(CMAKE_C_FLAGS_RELEASE "-O3 -ipo1 -DNDEBUG -DQT_NO_DEBUG_OUTPUT -Wl,-s") -- set(CMAKE_CXX_FLAGS_RELEASE "-O3 -ipo1 -DNDEBUG -DQT_NO_DEBUG_OUTPUT -Wl,-s") -+# set(CMAKE_C_FLAGS_RELEASE "-O3 -ipo1 -DNDEBUG -DQT_NO_DEBUG_OUTPUT -Wl,-s") -+# set(CMAKE_CXX_FLAGS_RELEASE "-O3 -ipo1 -DNDEBUG -DQT_NO_DEBUG_OUTPUT -Wl,-s") - - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO - "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${CMAKE_CXX_FLAGS_WARN}") -@@ -231,7 +231,11 @@ if(NOT Linguist_FOUND) - message(WARNING " Qt4 Linguist not found, please install it if you want Avogadro translations") - endif() - --find_package(Eigen3) # find and setup Eigen3 if available -+if(Q_WS_X11) -+ find_package(X11 REQUIRED) # avogadro/src/main.cpp calls XInitThread(). -+endif() -+ -+#find_package(Eigen3) # find and setup Eigen3 if available # not ready for Eigen3, see https://github.com/cryos/avogadro/issues/915 - if(NOT EIGEN3_FOUND) - message(STATUS "Cannot find Eigen3, trying Eigen2") - find_package(Eigen2 REQUIRED) # Some version is required -@@ -521,7 +525,7 @@ if(UNIX) - "${CMAKE_CURRENT_SOURCE_DIR}/avogadro.pc.in" - "${CMAKE_CURRENT_BINARY_DIR}/avogadro.pc" @ONLY) - set(PC_FILES "${CMAKE_CURRENT_BINARY_DIR}/avogadro.pc") -- install(FILES ${PC_FILES} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) -+ install(FILES ${PC_FILES} DESTINATION libdata/pkgconfig) - endif() - - # avopkg diff --git a/science/avogadro/files/patch-libavogadro__src__camera.cpp b/science/avogadro/files/patch-libavogadro__src__camera.cpp deleted file mode 100644 index 6346adf6d6c0..000000000000 --- a/science/avogadro/files/patch-libavogadro__src__camera.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- libavogadro/src/camera.cpp.orig 2016-06-08 14:19:45 UTC -+++ libavogadro/src/camera.cpp -@@ -36,6 +36,8 @@ - # include <GL/glu.h> - #endif - -+#include <GL/glu.h> -+ - using namespace Eigen; - - namespace Avogadro diff --git a/science/avogadro/files/patch-libavogadro__src__glpainter_p.cpp b/science/avogadro/files/patch-libavogadro__src__glpainter_p.cpp deleted file mode 100644 index c6c3c0443306..000000000000 --- a/science/avogadro/files/patch-libavogadro__src__glpainter_p.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- libavogadro/src/glpainter_p.cpp.orig 2016-06-08 14:19:45 UTC -+++ libavogadro/src/glpainter_p.cpp -@@ -53,6 +53,8 @@ - # include <GL/glu.h> - #endif - -+#include <GL/glu.h> -+ - namespace Avogadro - { - diff --git a/science/avogadro/files/patch-libavogadro__src__glwidget.cpp b/science/avogadro/files/patch-libavogadro__src__glwidget.cpp deleted file mode 100644 index 3e3337fc819f..000000000000 --- a/science/avogadro/files/patch-libavogadro__src__glwidget.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- libavogadro/src/glwidget.cpp.orig 2016-06-08 14:19:45 UTC -+++ libavogadro/src/glwidget.cpp -@@ -84,6 +84,8 @@ - #include <GL/glew.h> - #endif - -+#include <GL/glu.h> -+ - #include <cstdio> - #include <vector> - #include <cstdlib> diff --git a/science/avogadro/files/patch-libavogadro__src__tools__selectrotatetool.cpp b/science/avogadro/files/patch-libavogadro__src__tools__selectrotatetool.cpp deleted file mode 100644 index 53e538cf4065..000000000000 --- a/science/avogadro/files/patch-libavogadro__src__tools__selectrotatetool.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- libavogadro/src/tools/selectrotatetool.cpp.orig 2016-06-08 14:19:45 UTC -+++ libavogadro/src/tools/selectrotatetool.cpp -@@ -57,6 +57,8 @@ - # include <GL/glu.h> - #endif - -+#include <GL/glu.h> -+ - using namespace std; - using namespace OpenBabel; - using namespace Eigen; diff --git a/science/avogadro/files/patch-libavogadro_src_extensions_crystallography_crystallographyextension.cpp b/science/avogadro/files/patch-libavogadro_src_extensions_crystallography_crystallographyextension.cpp deleted file mode 100644 index 656e76956d5c..000000000000 --- a/science/avogadro/files/patch-libavogadro_src_extensions_crystallography_crystallographyextension.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- libavogadro/src/extensions/crystallography/crystallographyextension.cpp.orig 2016-06-08 14:19:45 UTC -+++ libavogadro/src/extensions/crystallography/crystallographyextension.cpp -@@ -53,6 +53,11 @@ - #include <openbabel/generic.h> - #include <openbabel/mol.h> - -+// fix for lang/gcc5 -+#if __GNUC__ == 5 && __GNUC_MINOR__ == 4 -+#undef minor -+#endif -+ - #include <Eigen/LU> - - #include <QtGui/QClipboard> diff --git a/science/avogadro/files/patch-libavogadro_src_extensions_symmetry_libmsym_src_orbital.c b/science/avogadro/files/patch-libavogadro_src_extensions_symmetry_libmsym_src_orbital.c deleted file mode 100644 index 2935ccb7a9f4..000000000000 --- a/science/avogadro/files/patch-libavogadro_src_extensions_symmetry_libmsym_src_orbital.c +++ /dev/null @@ -1,18 +0,0 @@ ---- libavogadro/src/extensions/symmetry/libmsym/src/orbital.c.orig 2018-10-16 20:56:21 UTC -+++ libavogadro/src/extensions/symmetry/libmsym/src/orbital.c -@@ -67,13 +67,13 @@ msym_error_t orbitalFromQuantumNumbers(i - } - case 2 : { - //o->v = dpolynomial[m+l]; -- char *d = (signbit(m) == 1 ? "-" : "+"); -+ char *d = (signbit((double)m) == 1 ? "-" : "+"); // signbit is misused, see https://github.com/cryos/avogadro/issues/916 - snprintf(o->name, sizeof(o->name), "%dd%d%s",n,abs(m),d); - break; - } - default : { - char t = 'f' - 3 + l; -- char *d = (signbit(m) == 1 ? "-" : "+"); -+ char *d = (signbit((double)m) == 1 ? "-" : "+"); // signbit is misused, see https://github.com/cryos/avogadro/issues/916 - snprintf(o->name, sizeof(o->name), "%d%c%d%s",n,t,abs(m),d); - } - } |