summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-radio/wspr/files')
-rw-r--r--media-radio/wspr/files/wspr-2.00-PIL.patch13
-rw-r--r--media-radio/wspr/files/wspr-2.00-libdir.patch53
-rw-r--r--media-radio/wspr/files/wspr-2.00-script.patch25
-rw-r--r--media-radio/wspr/files/wspr-2.00-verbose.patch12
-rw-r--r--media-radio/wspr/files/wspr-3.01-PIL.patch11
-rw-r--r--media-radio/wspr/files/wspr-3.01-numpy.patch23
-rw-r--r--media-radio/wspr/files/wspr-3.01-script.patch19
-rw-r--r--media-radio/wspr/files/wspr-3.01-verbose.patch12
8 files changed, 0 insertions, 168 deletions
diff --git a/media-radio/wspr/files/wspr-2.00-PIL.patch b/media-radio/wspr/files/wspr-2.00-PIL.patch
deleted file mode 100644
index 69bb853396a..00000000000
--- a/media-radio/wspr/files/wspr-2.00-PIL.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- wspr.py.orig 2013-06-02 18:25:02.000000000 +0200
-+++ wspr.py 2013-06-02 18:25:51.000000000 +0200
-@@ -15,7 +15,9 @@
- from Numeric import zeros
- import array
- import dircache
--import Image, ImageTk, ImageDraw
-+from PIL import Image
-+from PIL import ImageTk
-+from PIL import ImageDraw
- from WsprMod.palettes import colormapblue, colormapgray0, colormapHot, \
- colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette
- from types import *
diff --git a/media-radio/wspr/files/wspr-2.00-libdir.patch b/media-radio/wspr/files/wspr-2.00-libdir.patch
deleted file mode 100644
index e33d7b90871..00000000000
--- a/media-radio/wspr/files/wspr-2.00-libdir.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-# Upstream confused LIBDIRS with LDFLAGS in Makefile. f2py wants only
-# LIBDIRS as parameter and takes LDFLAGS only from environment.
---- Makefile.in.orig 2013-01-31 13:17:23.000000000 +0000
-+++ Makefile.in 2013-01-31 13:19:19.000000000 +0000
-@@ -3,7 +3,7 @@
- INSTALL= install
- CC ?= @CC@
- FFLAGS = @FFLAGS@
--LDFLAGS = @LDFLAGS@
-+LIBDIRS = @LIBDIRS@
- LIBS = @LIBS@ -lfftw3f
- CPPFLAGS = @CPPFLAGS@
- CFLAGS = @CFLAGS@
-@@ -39,7 +39,7 @@
- FCV=@FCV@
- FC_LIB_PATH += @FC_LIB_PATH@
-
--LDFLAGS += -L${FC_LIB_PATH}
-+LIBDIRS += -L${FC_LIB_PATH}
-
- PYTHON ?= @PYTHON@
- RM ?= @RM@
-@@ -78,7 +78,7 @@
- --f77flags="${FFLAGS}" --f90flags="${FFLAGS}" \
- --fcompiler=${FCV} --f77exec=${FC} --f90exec=${FC} \
- --opt="-fbounds-check ${FFLAGS}" \
-- ${CPPFLAGS} ${LDFLAGS} ${LIBS} \
-+ ${CPPFLAGS} ${LIBDIRS} ${LIBS} \
- only: $(F2PYONLY) : \
- $(SRCS2F90) $(SRCS2F77) $(SRCS2C)
- ${MKDIR} -p build/lib/WsprMod
-# drop hardcoded libdir path,
-# switch LDFLAGS naming to LIBDIRS (see above comment).
---- configure.ac.orig 2013-01-31 13:19:01.000000000 +0000
-+++ configure.ac 2013-01-31 13:19:19.000000000 +0000
-@@ -22,7 +22,7 @@
-
- dnl Lets guess at some likely places for extra libs/includes XXX -db
- CPPFLAGS="-I/usr/local/include ${CPPFLAGS}"
--LDFLAGS="-L/usr/local/lib ${LDFLAGS}"
-+LIBDIRS="-L/usr/local/lib ${LIBDIRS}"
- LIBS=" -lpthread ${LIBS}"
- FFLAGS_GFORTRAN="${FFLAGS} -fno-range-check -ffixed-line-length-none\
- -Wall -fbounds-check -fno-second-underscore -fPIC"
-@@ -160,7 +160,7 @@
- dnl
- AC_SUBST(PREFIX, "${prefix}")
- AC_SUBST(CPPFLAGS, "${CPPFLAGS}")
--AC_SUBST(LDFLAGS, "${LDFLAGS}")
-+AC_SUBST(LIBDIRS, "${LIBDIRS}")
- AC_SUBST(LIBS, "${LIBS}")
- AC_SUBST(CFLAGS)
- AC_SUBST(FFLAGS)
diff --git a/media-radio/wspr/files/wspr-2.00-script.patch b/media-radio/wspr/files/wspr-2.00-script.patch
deleted file mode 100644
index e75c1178278..00000000000
--- a/media-radio/wspr/files/wspr-2.00-script.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# make python code into a script
-# and fix shell script
---- wspr.py.orig 2013-02-01 13:24:30.000000000 +0000
-+++ wspr.py 2013-02-01 13:23:30.000000000 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/python
- #------------------------------------------------------------------- WSPR
- # $Date: 2013/02/07 14:35:21 $ $Revision: 1.1 $
- #
---- wspr.orig 2013-02-02 08:10:17.000000000 +0000
-+++ wspr 2013-02-02 08:10:56.000000000 +0000
-@@ -1,12 +1,7 @@
- #!/bin/sh
--if [ -e /usr/local/bin/python ] ; then
-- LOCALBASE=/usr/local/
--else
-- LOCALBASE=/usr/
--fi
- if [ ! -e ~/.wspr ] ; then
- mkdir ~/.wspr
- mkdir ~/.wspr/save
- fi
- cd ~/.wspr
--python ${LOCALBASE}/bin/wspr.py
-+/usr/bin/wspr.py
diff --git a/media-radio/wspr/files/wspr-2.00-verbose.patch b/media-radio/wspr/files/wspr-2.00-verbose.patch
deleted file mode 100644
index 9036e0d868a..00000000000
--- a/media-radio/wspr/files/wspr-2.00-verbose.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# make f2py verbose
---- Makefile.in.orig 2013-02-07 12:22:41.000000000 +0000
-+++ Makefile.in 2013-02-07 12:23:11.000000000 +0000
-@@ -74,7 +74,7 @@
- OBJS2C = ${SRCS2C:.c=.o}
-
- WsprMod/w.so: ${OBJS2C} $(SRCS2F90) $(SRCS2F77) acom1.f90
-- ${F2PY} -c --quiet --noopt --debug -m w \
-+ ${F2PY} -c --noopt --debug -m w \
- --f77flags="${FFLAGS}" --f90flags="${FFLAGS}" \
- --fcompiler=${FCV} --f77exec=${FC} --f90exec=${FC} \
- --opt="-fbounds-check ${FFLAGS}" \
diff --git a/media-radio/wspr/files/wspr-3.01-PIL.patch b/media-radio/wspr/files/wspr-3.01-PIL.patch
deleted file mode 100644
index ce468919514..00000000000
--- a/media-radio/wspr/files/wspr-3.01-PIL.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- wspr.py.orig 2014-06-23 21:25:51.000000000 +0200
-+++ wspr.py 2014-06-23 21:26:03.000000000 +0200
-@@ -35,7 +35,7 @@
- from Numeric import zeros
- import array
- import dircache
--import Image, ImageTk, ImageDraw
-+from PIL import Image, ImageTk, ImageDraw
- from WsprMod.palettes import colormapblue, colormapgray0, colormapHot, \
- colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette
- from types import *
diff --git a/media-radio/wspr/files/wspr-3.01-numpy.patch b/media-radio/wspr/files/wspr-3.01-numpy.patch
deleted file mode 100644
index 2c9174dff58..00000000000
--- a/media-radio/wspr/files/wspr-3.01-numpy.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# Numpy-1.9 dropped oldnumeric and numarray
---- WsprMod/specjt.py.orig 2015-05-18 15:49:37.000000000 +0200
-+++ WsprMod/specjt.py 2015-05-18 15:49:48.000000000 +0200
-@@ -12,7 +12,7 @@
- import w
-
- try:
-- from numpy.oldnumeric import zeros, multiarray
-+ from numpy import zeros, multiarray
- except:
- from Numeric import zeros, multiarray
- import Image, ImageTk, ImageDraw
---- wspr.py.orig 2015-05-18 15:47:13.000000000 +0200
-+++ wspr.py 2015-05-18 15:47:38.000000000 +0200
-@@ -31,7 +31,7 @@
- from WsprMod import palettes
- from math import log10
- try:
-- from numpy.oldnumeric import zeros
-+ from numpy import zeros
- except:
- from Numeric import zeros
- import array
diff --git a/media-radio/wspr/files/wspr-3.01-script.patch b/media-radio/wspr/files/wspr-3.01-script.patch
deleted file mode 100644
index f64a11b68a6..00000000000
--- a/media-radio/wspr/files/wspr-3.01-script.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- wspr.py.orig 2014-06-24 19:13:55.000000000 +0200
-+++ wspr.py 2014-06-24 19:14:43.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/python
- #-------------------------------------------------------------------- WSPR
- # $Date: 2014/06/26 09:15:53 $ $Revision: 1.1 $
- #
---- wspr.orig 2014-06-24 18:57:00.000000000 +0200
-+++ wspr 2014-06-24 19:09:50.000000000 +0200
-@@ -1,2 +1,7 @@
--LD_LIBRARY_PATH=./lib
--python -O wspr.py
-+#!/bin/sh
-+if [ ! -e ~/.wspr ] ; then
-+ mkdir ~/.wspr
-+ mkdir ~/.wspr/save
-+fi
-+cd ~/.wspr
-+/usr/bin/wspr.py
diff --git a/media-radio/wspr/files/wspr-3.01-verbose.patch b/media-radio/wspr/files/wspr-3.01-verbose.patch
deleted file mode 100644
index b697cfe444d..00000000000
--- a/media-radio/wspr/files/wspr-3.01-verbose.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# make f2py verbose
---- Makefile.in.orig 2014-06-23 21:14:51.000000000 +0200
-+++ Makefile.in 2014-06-23 21:15:11.000000000 +0200
-@@ -95,7 +95,7 @@
- OBJS2C = ${SRCS2C:.c=.o}
-
- WsprMod/w.so: ${OBJS2C} $(SRCS2C) $(SRCS2F90) $(SRCS2F77) acom1.f90
-- ${F2PY} -c --quiet --noopt --debug -m w \
-+ ${F2PY} -c --noopt --debug -m w \
- --f77flags="${FFLAGS}" --f90flags="${FFLAGS}" \
- --fcompiler=${FCV} --f77exec=${FC} --f90exec=${FC} \
- --opt="-fbounds-check ${FFLAGS}" \