summaryrefslogtreecommitdiff
path: root/sci-chemistry/sparky/files
diff options
context:
space:
mode:
Diffstat (limited to 'sci-chemistry/sparky/files')
-rw-r--r--sci-chemistry/sparky/files/3.115-fix-c++14.patch32
-rw-r--r--sci-chemistry/sparky/files/3.115-ldflags.patch61
-rw-r--r--sci-chemistry/sparky/files/3.115-makefile.patch17
-rw-r--r--sci-chemistry/sparky/files/3.115-paths.patch13
-rw-r--r--sci-chemistry/sparky/files/3.115-wrapper-r1.patch41
5 files changed, 0 insertions, 164 deletions
diff --git a/sci-chemistry/sparky/files/3.115-fix-c++14.patch b/sci-chemistry/sparky/files/3.115-fix-c++14.patch
deleted file mode 100644
index 3a05ea7d85ce..000000000000
--- a/sci-chemistry/sparky/files/3.115-fix-c++14.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Fix the custom new/new[] operators in order to account for changed
-noexcept semantics in C++11.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=596012
-
-Patch by Peter Levine
-
---- a/c++/memalloc.cc
-+++ b/c++/memalloc.cc
-@@ -39,7 +39,10 @@
-
- // ----------------------------------------------------------------------------
- //
--void *operator new(size_t size) throw(std::bad_alloc)
-+void *operator new(size_t size)
-+#if __cplusplus < 201103L
-+throw(std::bad_alloc)
-+#endif
- {
- void *value = allocate(size);
- if (tracking_memory)
-@@ -72,7 +75,10 @@
-
- // ----------------------------------------------------------------------------
- //
--void *operator new[](size_t size) throw(std::bad_alloc)
-+void *operator new[](size_t size)
-+#if __cplusplus < 201103L
-+throw(std::bad_alloc)
-+#endif
- {
- void *value = allocate(size);
- if (tracking_memory)
diff --git a/sci-chemistry/sparky/files/3.115-ldflags.patch b/sci-chemistry/sparky/files/3.115-ldflags.patch
deleted file mode 100644
index bd4020387682..000000000000
--- a/sci-chemistry/sparky/files/3.115-ldflags.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/c++/Makefile b/c++/Makefile
-index aeb4daa..5cab356 100644
---- a/c++/Makefile
-+++ b/c++/Makefile
-@@ -131,28 +131,28 @@ $(SPARKY_INSTALL)/python/sparky $(SPARKY_INSTALL)/python/lib-tk:
- chmod 755 $@
-
- sparky-no-python$(EXE_SUFFIX): main.o $(SPARKY_OBJS)
-- $(CXX) -o $@ main.o $(SPARKY_OBJS) $(LDFLAGS) $(LDLIBS)
-+ $(CXX) $(LDFLAGS) -o $@ main.o $(SPARKY_OBJS) $(LDLIBS)
-
- ucsfdata$(EXE_SUFFIX): ucsfdata.o $(NMR_OBJS)
-- $(CXX) -o $@ ucsfdata.o $(NMR_OBJS) $(LDFLAGS) $(SYSLIBS) $(EXTRALIBS)
-+ $(CXX) $(LDFLAGS) -o $@ ucsfdata.o $(NMR_OBJS) $(SYSLIBS) $(EXTRALIBS)
-
- pipe2ucsf$(EXE_SUFFIX): pipe2ucsf.o $(NMR_OBJS)
-- $(CXX) -o $@ pipe2ucsf.o $(NMR_OBJS) $(LDFLAGS) $(SYSLIBS) $(EXTRALIBS)
-+ $(CXX) $(LDFLAGS) -o $@ pipe2ucsf.o $(NMR_OBJS) $(SYSLIBS) $(EXTRALIBS)
-
- vnmr2ucsf$(EXE_SUFFIX): vnmr2ucsf.o $(NMR_OBJS)
-- $(CXX) -o $@ vnmr2ucsf.o $(NMR_OBJS) $(LDFLAGS) $(SYSLIBS) $(EXTRALIBS)
-+ $(CXX) $(LDFLAGS) -o $@ vnmr2ucsf.o $(NMR_OBJS) $(SYSLIBS) $(EXTRALIBS)
-
- bruk2ucsf$(EXE_SUFFIX): bruk2ucsf.o $(NMR_OBJS)
-- $(CXX) -o $@ bruk2ucsf.o $(NMR_OBJS) $(LDFLAGS) $(SYSLIBS) $(EXTRALIBS)
-+ $(CXX) $(LDFLAGS) -o $@ bruk2ucsf.o $(NMR_OBJS) $(SYSLIBS) $(EXTRALIBS)
-
- peaks2ucsf$(EXE_SUFFIX): peaks2ucsf.o $(NMR_OBJS)
-- $(CXX) -o $@ peaks2ucsf.o $(NMR_OBJS) $(LDFLAGS) $(SYSLIBS) $(EXTRALIBS)
-+ $(CXX) $(LDFLAGS) -o $@ peaks2ucsf.o $(NMR_OBJS) $(SYSLIBS) $(EXTRALIBS)
-
- matrix2ucsf$(EXE_SUFFIX): matrix2ucsf.o $(NMR_OBJS)
-- $(CXX) -o $@ matrix2ucsf.o $(NMR_OBJS) $(LDFLAGS) $(SYSLIBS) $(EXTRALIBS)
-+ $(CXX) $(LDFLAGS) -o $@ matrix2ucsf.o $(NMR_OBJS) $(SYSLIBS) $(EXTRALIBS)
-
- spy.so: python.o $(SPARKY_OBJS)
-- $(CXX) $(LDSHARED) -o $@ python.o $(SPARKY_OBJS) $(LDFLAGS) $(LDLIBS)
-+ $(CXX) $(LDSHARED) $(LDFLAGS) -o $@ python.o $(SPARKY_OBJS) $(LDLIBS)
-
- winsystem-$(PLATFORM).o: winsystem-$(PLATFORM).cc
- $(CXX) $(CXXFLAGS) $(TKFLAGS) -c $(SPARKY_SRC)/winsystem-$(PLATFORM).cc
-@@ -161,7 +161,7 @@ python.o: python.cc
- $(CXX) $(CXXFLAGS) $(PYFLAGS) $(TKFLAGS) -c $(SPARKY_SRC)/python.cc
-
- _tkinter.so: _tkinter.o
-- $(CXX) $(LDSHARED) -o $@ _tkinter.o $(LDFLAGS) $(TKLIBS)
-+ $(CXX) $(LDSHARED) $(LDFLAGS) -o $@ _tkinter.o $(TKLIBS)
-
- _tkinter.o: _tkinter.c
- $(CC) $(CFLAGS) $(TKFLAGS) $(PYFLAGS) -c $(SPARKY_SRC)/_tkinter.c
-@@ -188,8 +188,8 @@ PYLDFLAGS = -L$(PYTHON_LIB)/config -lpython$(PYTHON_VERSION)
- PYIFLAGS = -I$(PYTHON_INC)
-
- debug-sparky: main-debug.o python.o _tkinter.o $(SPARKY_OBJS)
-- $(CXX) -o $@ main-debug.o python.o _tkinter.o $(SPARKY_OBJS) \
-- $(LDFLAGS) $(PYLDFLAGS) $(LDLIBS)
-+ $(CXX) $(LDFLAGS) -o $@ main-debug.o python.o _tkinter.o $(SPARKY_OBJS) \
-+ $(PYLDFLAGS) $(LDLIBS)
-
- main-debug.o: main-debug.cc
- $(CXX) $(CXXFLAGS) $(PYIFLAGS) -c $(SPARKY_SRC)/main-debug.cc
diff --git a/sci-chemistry/sparky/files/3.115-makefile.patch b/sci-chemistry/sparky/files/3.115-makefile.patch
deleted file mode 100644
index 7c810dcbd8ae..000000000000
--- a/sci-chemistry/sparky/files/3.115-makefile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Makefile b/Makefile
-index bb27034..30979bd 100644
---- a/Makefile
-+++ b/Makefile
-@@ -48,6 +48,12 @@ TKINTER_PYMOD = _tkinter$(PYMOD_SUFFIX)
- all nopython $(SPY_PYMOD) $(TKINTER_PYMOD) $(EXECUTABLES) debug-sparky clean: force
- cd $(SPARKY_OBJ) && $(MAKE) -f $(SPARKY_SRC)/Makefile -e $@
-
-+libraries:
-+ cd $(SPARKY_OBJ) && $(MAKE) -f $(SPARKY_SRC)/Makefile -e $(SPY_PYMOD) $(TKINTER_PYMOD)
-+
-+binaries:
-+ cd $(SPARKY_OBJ) && $(MAKE) -f $(SPARKY_SRC)/Makefile -e $(EXECUTABLES) debug-sparky
-+
- Makefile.dep TAGS: force
- cd $(SPARKY_SRC) && $(MAKE) -f Makefile -e $@
-
diff --git a/sci-chemistry/sparky/files/3.115-paths.patch b/sci-chemistry/sparky/files/3.115-paths.patch
deleted file mode 100644
index 20d9a801ecd6..000000000000
--- a/sci-chemistry/sparky/files/3.115-paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/c++/paths.h b/c++/paths.h
-index 2a21366..38aff52 100644
---- a/c++/paths.h
-+++ b/c++/paths.h
-@@ -19,7 +19,7 @@
- // Installation subdirectories and files
- //
- #define SPARKY_MANUAL "manual"
--#define SPARKY_LIB "lib"
-+#define SPARKY_LIB "."
- #define SPARKY_PRINT "print-prolog.ps" // under lib directory
- #define SPARKY_RESOURCE "Sparky" // under lib directory
- #define SPARKY_SAMPLE_DATA "example"
diff --git a/sci-chemistry/sparky/files/3.115-wrapper-r1.patch b/sci-chemistry/sparky/files/3.115-wrapper-r1.patch
deleted file mode 100644
index d83b5b8510cc..000000000000
--- a/sci-chemistry/sparky/files/3.115-wrapper-r1.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/bin/sparky b/bin/sparky
-index 8b51212..270723a 100644
---- a/bin/sparky
-+++ b/bin/sparky
-@@ -4,18 +4,6 @@
- #
-
- # -----------------------------------------------------------------------------
--# Figure out Sparky installation directory from $0.
--#
--set sparky_exe = "$0"
--while (-l "$sparky_exe")
-- set ls_sparky_exe = `ls -l "$sparky_exe"`
-- set sparky_exe = `echo "$ls_sparky_exe" | sed 's/.* -> //'`
--end
--set sparky_bin = `dirname "$sparky_exe"`
--set sparky_bin = `cd "$sparky_bin"; pwd`
--set sparky_inst = `dirname "$sparky_bin"`
--
--# -----------------------------------------------------------------------------
- # Sparky uses the SPARKY_INSTALL environment variable to find its
- # application resource file and print prolog file.
- #
-@@ -25,7 +13,7 @@ setenv SPARKY_INSTALL "$sparky_inst"
- # If Python is available start Sparky as a Python extension.
- # Otherwise the standalone version of Sparky is started.
- #
--set PYTHON = "$SPARKY_INSTALL/python2.5/bin/python2.5"
-+set PYTHON = GENTOO_PYTHON
- if (! -e "$PYTHON") then
- set PYTHON = python2.5
- endif
-@@ -79,7 +67,7 @@ if ($status == 0) then
- # ---------------------------------------------------------------------------
- # Add the Sparky package and Tkinter to the Python path
- #
-- set SPARKY_PYTHONPATH = "$SPARKY_INSTALL/python:$SPARKY_INSTALL/python/lib-tk"
-+ set SPARKY_PYTHONPATH = "$SPARKY_INSTALL/python:$SPARKY_INSTALL/python/sparky"
- if ($?PYTHONPATH) then
- setenv PYTHONPATH "${SPARKY_PYTHONPATH}:$PYTHONPATH"
- else
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-18 18:34:51 +0000