[hamradio-commits] [wsjtx] 02/09: Updates to patches

[Iain R. Learmonth]

This is an automated email from the git hooks/post-receive script.

irl pushed a commit to branch master
in repository wsjtx.

commit b607c5fb710c446322f2bbacf215bca9c6f11b5e
Author: Iain R. Learmonth <irl at debian.org>
Date:   Sun Oct 18 19:13:45 2015 +0100

    Updates to patches
    
     * Patches renamed to follow quilt series
     * 0003-no-escape-buildroot.patch:
      - Updated for new upstream build scripts
     * 0004-inherit-cflags-fflags.patch:
      - New patch
     * mno-stack-arg-probe.patch:
      - Removed as no longer relevant
---
 ...tx_script.patch => 0001-add-start-script.patch} |  0
 .../{man_page.patch => 0002-add-manpage.patch}     |  0
 debian/patches/0003-no-escape-buildroot.patch      | 25 +++++++++++++++
 debian/patches/0004-inherit-cflags-fflags.patch    | 17 ++++++++++
 debian/patches/mno-stack-arg-probe.patch           | 17 ----------
 debian/patches/series                              |  8 ++---
 debian/patches/wsjtx_install.patch                 | 36 ----------------------
 7 files changed, 46 insertions(+), 57 deletions(-)

diff --git a/debian/patches/wsjtx_script.patch b/debian/patches/0001-add-start-script.patch
similarity index 100%
rename from debian/patches/wsjtx_script.patch
rename to debian/patches/0001-add-start-script.patch
diff --git a/debian/patches/man_page.patch b/debian/patches/0002-add-manpage.patch
similarity index 100%
rename from debian/patches/man_page.patch
rename to debian/patches/0002-add-manpage.patch
diff --git a/debian/patches/0003-no-escape-buildroot.patch b/debian/patches/0003-no-escape-buildroot.patch
new file mode 100644
index 0000000..d28bba0
--- /dev/null
+++ b/debian/patches/0003-no-escape-buildroot.patch
@@ -0,0 +1,25 @@
+Description: avoid path outside of build dir
+ Use ./wsjtx_install vs. ../wsjtx_install
+Author: Iain R. Learmonth <irl at debian.org>
+Last-Update: 2015-10-18
+
+--- a/wsjtx.pro
++++ b/wsjtx.pro
+@@ -17,7 +17,7 @@
+ DEFINES += PROJECT_MANUAL="'\"http://www.physics.princeton.edu/pulsar/K1JT/wsjtx-doc/wsjtx-main.html\"'"
+ 
+ isEmpty (DESTDIR) {
+-DESTDIR = ../wsjtx_install
++DESTDIR = ./wsjtx_install
+ }
+ 
+ isEmpty (HAMLIB_DIR) {
+--- a/lib/Makefile.linux
++++ b/lib/Makefile.linux
+@@ -1,5 +1,5 @@
+ # Set paths
+-EXE_DIR = ../../wsjtx_install
++EXE_DIR = ../wsjtx_install
+ QT_DIR = /usr/include/qt5
+ INCPATH = -I${QT_DIR} -I${QT_DIR}/QtCore
+ 
diff --git a/debian/patches/0004-inherit-cflags-fflags.patch b/debian/patches/0004-inherit-cflags-fflags.patch
new file mode 100644
index 0000000..4b4ad22
--- /dev/null
+++ b/debian/patches/0004-inherit-cflags-fflags.patch
@@ -0,0 +1,17 @@
+Description: inherit cflags and fflags from dpkg-buildflags
+Author: Iain R. Learmonth <irl at debian.org>
+Last-Update: 2015-10-18
+
+--- a/lib/Makefile.linux
++++ b/lib/Makefile.linux
+@@ -12,8 +12,8 @@
+ RANLIB = ranlib
+ RM = rm -f
+ 
+-FFLAGS = -O3 -funroll-loops -Wall -Wno-conversion -fno-second-underscore -DUNIX
+-CFLAGS = -I. -fbounds-check -fPIE
++FFLAGS += -O3 -funroll-loops -Wall -Wno-conversion -fno-second-underscore -DUNIX
++CFLAGS += -I. -fbounds-check -fPIE
+ 
+ # Default rules
+ %.o: %.c
diff --git a/debian/patches/mno-stack-arg-probe.patch b/debian/patches/mno-stack-arg-probe.patch
deleted file mode 100644
index a561078..0000000
--- a/debian/patches/mno-stack-arg-probe.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: remove mno-stack-arg-probe from CFLAGS
- lib/Makefile.linux CFLAGS option -mno-stack-arg-probe is unrecognized on
- many platforms, & alloca() is not used anyway, so probably not needed.
- .
-Author: John T. Nogatch <jnogatch at gmail.com>
-
---- wsjtx-1.1.r3496.orig/lib/Makefile.linux
-+++ wsjtx-1.1.r3496/lib/Makefile.linux
-@@ -2,7 +2,7 @@ CC = gcc
- FC = gfortran
- 
- FFLAGS = -O2 -fbounds-check -Wall -Wno-conversion -fno-second-underscore
--CFLAGS = -I. -fbounds-check -mno-stack-arg-probe
-+CFLAGS = -I. -fbounds-check
- 
- # Default rules
- %.o: %.c
diff --git a/debian/patches/series b/debian/patches/series
index 423b92e..af8cb02 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-wsjtx_script.patch
-man_page.patch
-wsjtx_install.patch
-mno-stack-arg-probe.patch
+0001-add-start-script.patch
+0002-add-manpage.patch
+0003-no-escape-buildroot.patch
+0004-inherit-cflags-fflags.patch
diff --git a/debian/patches/wsjtx_install.patch b/debian/patches/wsjtx_install.patch
deleted file mode 100644
index 19ced49..0000000
--- a/debian/patches/wsjtx_install.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: avoid path outside of build dir
- Use ./wsjtx_install vs. ../wsjtx_install
- Use ./lib vs ../wsjtx/lib
-
-
---- wsjtx-1.1.r3496.orig/wsjtx.pro
-+++ wsjtx-1.1.r3496/wsjtx.pro
-@@ -10,7 +10,7 @@ CONFIG   += thread
- #CONFIG   += console
- 
- TARGET = wsjtx
--DESTDIR = ../wsjtx_install
-+DESTDIR = ./wsjtx_install
- VERSION = 1.1
- TEMPLATE = app
- DEFINES = QT4
-@@ -60,7 +60,7 @@ FORMS    += mainwindow.ui about.ui devse
- RC_FILE = wsjtx.rc
- 
- unix {
--LIBS += ../wsjtx/lib/libjt9.a
-+LIBS += ./lib/libjt9.a
- LIBS += -lhamlib
- LIBS += -lportaudio -lgfortran -lfftw3f
- }
---- wsjtx-1.1.r3496.orig/lib/Makefile.linux
-+++ wsjtx-1.1.r3496/lib/Makefile.linux
-@@ -45,7 +45,7 @@ OBJS2 = jt9.o jt9a.o jt9b.o jt9c.o
- 
- jt9: 	$(OBJS2) libjt9.a 
- 	g++ -o jt9 $(OBJS2) libjt9.a -lfftw3f -lgfortran -lQtCore
--	cp jt9 ../../wsjtx_install
-+	cp jt9 ../wsjtx_install
- 
- OBJS3 = jt9sim.o 
- jt9sim: $(OBJS3) libjt9.a

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/wsjtx.git