summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-chemistry/apbs/files/apbs-1.4.1-python.patch')
-rw-r--r--sci-chemistry/apbs/files/apbs-1.4.1-python.patch38
1 files changed, 19 insertions, 19 deletions
diff --git a/sci-chemistry/apbs/files/apbs-1.4.1-python.patch b/sci-chemistry/apbs/files/apbs-1.4.1-python.patch
index db9f86ba120a..5ad6613615f2 100644
--- a/sci-chemistry/apbs/files/apbs-1.4.1-python.patch
+++ b/sci-chemistry/apbs/files/apbs-1.4.1-python.patch
@@ -7,10 +7,10 @@
apbs/tools/python/setup.py | 16 ++++++++++++++++
7 files changed, 26 insertions(+), 8 deletions(-)
-diff --git a/apbs/contrib/iapbs/src/apbs_driver.c b/apbs/contrib/iapbs/src/apbs_driver.c
+diff --git a/contrib/iapbs/src/apbs_driver.c b/contrib/iapbs/src/apbs_driver.c
index c9e443b..e1ad67f 100644
---- a/apbs/contrib/iapbs/src/apbs_driver.c
-+++ b/apbs/contrib/iapbs/src/apbs_driver.c
+--- a/contrib/iapbs/src/apbs_driver.c
++++ b/contrib/iapbs/src/apbs_driver.c
@@ -595,7 +595,7 @@ int apbsdrv_(
printPBEPARM(pbeparm);
@@ -38,10 +38,10 @@ index c9e443b..e1ad67f 100644
}
bytesTotal = Vmem_bytesTotal();
highWater = Vmem_highWaterTotal();
-diff --git a/apbs/src/CMakeLists.txt b/apbs/src/CMakeLists.txt
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 44d20fa..2577343 100644
---- a/apbs/src/CMakeLists.txt
-+++ b/apbs/src/CMakeLists.txt
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
@@ -68,6 +68,7 @@ configure_file(
if(ENABLE_iAPBS)
@@ -50,10 +50,10 @@ index 44d20fa..2577343 100644
INSTALL(TARGETS apbs_routines DESTINATION ${LIBRARY_INSTALL_PATH})
INSTALL(FILES apbscfg.h DESTINATION ${HEADER_INSTALL_PATH})
endif()
-diff --git a/apbs/tools/CMakeLists.txt b/apbs/tools/CMakeLists.txt
+diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 1982a3c..4acbe68 100644
---- a/apbs/tools/CMakeLists.txt
-+++ b/apbs/tools/CMakeLists.txt
+--- a/tools/CMakeLists.txt
++++ b/tools/CMakeLists.txt
@@ -4,5 +4,5 @@ add_subdirectory(mesh)
add_subdirectory(manip)
@@ -61,17 +61,17 @@ index 1982a3c..4acbe68 100644
- add_subdirectory(manip)
+ add_subdirectory(python)
endif(ENABLE_PYTHON)
-diff --git a/apbs/tools/python/CMakeLists.txt b/apbs/tools/python/CMakeLists.txt
+diff --git a/tools/python/CMakeLists.txt b/tools/python/CMakeLists.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
-+++ b/apbs/tools/python/CMakeLists.txt
++++ b/tools/python/CMakeLists.txt
@@ -0,0 +1 @@
+
-diff --git a/apbs/tools/python/apbslib.c b/apbs/tools/python/apbslib.c
+diff --git a/tools/python/apbslib.c b/tools/python/apbslib.c
index fef5cc8..feaaa2c 100644
---- a/apbs/tools/python/apbslib.c
-+++ b/apbs/tools/python/apbslib.c
+--- a/tools/python/apbslib.c
++++ b/tools/python/apbslib.c
@@ -2504,8 +2504,8 @@ static swig_module_info swig_module = {swig_types, 24, 0, 0, 0, 0};
#include "maloc/maloc.h"
#include "apbscfg.h"
@@ -83,10 +83,10 @@ index fef5cc8..feaaa2c 100644
#include <limits.h>
-diff --git a/apbs/tools/python/apbslib.i b/apbs/tools/python/apbslib.i
+diff --git a/tools/python/apbslib.i b/tools/python/apbslib.i
index 17fe521..44d05ea 100644
---- a/apbs/tools/python/apbslib.i
-+++ b/apbs/tools/python/apbslib.i
+--- a/tools/python/apbslib.i
++++ b/tools/python/apbslib.i
@@ -15,8 +15,8 @@ Header files:
#include "maloc/maloc.h"
#include "apbscfg.h"
@@ -98,11 +98,11 @@ index 17fe521..44d05ea 100644
%}
/*
-diff --git a/apbs/tools/python/setup.py b/apbs/tools/python/setup.py
+diff --git a/tools/python/setup.py b/tools/python/setup.py
new file mode 100644
index 0000000..4a20198
--- /dev/null
-+++ b/apbs/tools/python/setup.py
++++ b/tools/python/setup.py
@@ -0,0 +1,16 @@
+from distutils.core import setup, Extension
+setup(name='apbs',