diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-16 17:34:21 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-16 17:34:21 +0000 |
| commit | 02e2208f46f4e2c00fb9743cbc47350bdd233bfa (patch) | |
| tree | 132dd60828854db4f65f30f9230f43d9602507ff /sci-visualization/gle/files | |
| parent | 8be70107efbb417f839292165ee39d07a062046f (diff) | |
gentoo resync : 16.01.2018
Diffstat (limited to 'sci-visualization/gle/files')
| -rw-r--r-- | sci-visualization/gle/files/gle-4.2.5-c++14.patch | 27 | ||||
| -rw-r--r-- | sci-visualization/gle/files/gle-4.2.5-parallel.patch (renamed from sci-visualization/gle/files/gle-4.2.4b-parallel.patch) | 9 |
2 files changed, 31 insertions, 5 deletions
diff --git a/sci-visualization/gle/files/gle-4.2.5-c++14.patch b/sci-visualization/gle/files/gle-4.2.5-c++14.patch new file mode 100644 index 000000000000..b548816ae065 --- /dev/null +++ b/sci-visualization/gle/files/gle-4.2.5-c++14.patch @@ -0,0 +1,27 @@ +diff -r -U2 gle-graphics-4.2.5.orig/src/gle/fitcf.h gle-graphics-4.2.5/src/gle/fitcf.h +--- gle-graphics-4.2.5.orig/src/gle/fitcf.h 2015-08-16 13:51:24.000000000 +0600 ++++ gle-graphics-4.2.5/src/gle/fitcf.h 2018-01-13 13:57:23.140749391 +0700 +@@ -182,8 +182,8 @@ + typedef struct Namelist Namelist; + +-#define abs(x) ((x) >= 0 ? (x) : -(x)) ++/*#define abs(x) ((x) >= 0 ? (x) : -(x))*/ + #define dabs(x) (doublereal)abs(x) +-#define min(a,b) ((a) <= (b) ? (a) : (b)) +-#define max(a,b) ((a) >= (b) ? (a) : (b)) ++/*#define min(a,b) ((a) <= (b) ? (a) : (b))*/ ++/*#define max(a,b) ((a) >= (b) ? (a) : (b))*/ + #define dmin(a,b) (doublereal)min(a,b) + #define dmax(a,b) (doublereal)max(a,b) +diff -r -U2 gle-graphics-4.2.5.orig/src/gle/surface/ffitcontour.cpp gle-graphics-4.2.5/src/gle/surface/ffitcontour.cpp +--- gle-graphics-4.2.5.orig/src/gle/surface/ffitcontour.cpp 2015-08-16 13:51:24.000000000 +0600 ++++ gle-graphics-4.2.5/src/gle/surface/ffitcontour.cpp 2018-01-13 14:08:08.169722265 +0700 +@@ -49,7 +49,7 @@ + #include "f2c.h" + #else +-#include "f2c.h" + #include <stdio.h> + #include <math.h> ++#include "f2c.h" + #endif + diff --git a/sci-visualization/gle/files/gle-4.2.4b-parallel.patch b/sci-visualization/gle/files/gle-4.2.5-parallel.patch index 1eff8c067102..eeca1f5946ba 100644 --- a/sci-visualization/gle/files/gle-4.2.4b-parallel.patch +++ b/sci-visualization/gle/files/gle-4.2.5-parallel.patch @@ -1,7 +1,7 @@ ---- src/gui/MakefileAC.in.orig 2010-01-06 20:10:04.000000000 +0000 -+++ src/gui/MakefileAC.in 2010-01-06 20:21:15.000000000 +0000 -@@ -84,14 +84,14 @@ - qmake: +diff -r -U2 gle-graphics-4.2.5.orig/src/gui/MakefileAC.in gle-graphics-4.2.5/src/gui/MakefileAC.in +--- gle-graphics-4.2.5.orig/src/gui/MakefileAC.in 2015-08-16 13:51:24.000000000 +0600 ++++ gle-graphics-4.2.5/src/gui/MakefileAC.in 2018-01-13 14:23:09.066684378 +0700 +@@ -83,12 +83,12 @@ $(QMAKE_PROG) $(QMAKE_OPTS) -domake: @@ -18,4 +18,3 @@ + -$(MAKE) clean -@$(RM) qgle install_qgle_name_mac Makefile -@$(RMDIR) moc - -@$(RMDIR) objects |