[med-svn] [Git][med-team/praat][master] d/p/cross-build.patch: New patch

[Rafael Laboissiere]

Rafael Laboissiere pushed to branch master at Debian Med / praat


Commits:
87d05d77 by Rafael Laboissière at 2020-05-06T07:54:20-03:00
d/p/cross-build.patch: New patch

- - - - -


2 changed files:

- + debian/patches/cross-build.patch
- debian/patches/series


Changes:

=====================================
debian/patches/cross-build.patch
=====================================
@@ -0,0 +1,109 @@
+Description: Fix cross-build issues
+Author: Helmut Grohne <helmut at subdivi.de>
+Bug-Debian: https://bugs.debian.org/919490
+Forwarded: no
+Reviewed-By: Rafael Laboissière <rafael at debian.org>
+Last-Update: 2020-05-06
+
+--- praat-6.1.14.orig/makefiles/makefile.defs.chrome64
++++ praat-6.1.14/makefiles/makefile.defs.chrome64
+@@ -7,17 +7,19 @@ CC = gcc
+ 
+ CXX = g++
+ 
+-COMMONFLAGS = -DUNIX -Dlinux -Dchrome -DALSA -DHAVE_PULSEAUDIO -D_FILE_OFFSET_BITS=64 `pkg-config --cflags gtk+-2.0` -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O3 -g1 -pthread
++PKG_CONFIG ?= pkg-config
++
++COMMONFLAGS = -DUNIX -Dlinux -Dchrome -DALSA -DHAVE_PULSEAUDIO -D_FILE_OFFSET_BITS=64 `$(PKG_CONFIG) --cflags gtk+-2.0` -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O3 -g1 -pthread
+ 
+ CFLAGS = -std=gnu99 $(COMMONFLAGS) -Werror=missing-prototypes -Werror=implicit
+ 
+ CXXFLAGS = -std=c++17 $(COMMONFLAGS) -Wshadow
+ 
+-LINK = g++
++LINK = $(CXX)
+ 
+ EXECUTABLE = praat
+ 
+-LIBS = `pkg-config --libs gtk+-2.0` -lm -lpulse -lasound -lpthread
++LIBS = `$(PKG_CONFIG) --libs gtk+-2.0` -lm -lpulse -lasound -lpthread
+ 
+ AR = ar
+ RANLIB = ls
+--- praat-6.1.14.orig/makefiles/makefile.defs.cygwin64
++++ praat-6.1.14/makefiles/makefile.defs.cygwin64
+@@ -14,7 +14,7 @@ CFLAGS = -std=gnu99 $(COMMONFLAGS)
+ 
+ CXXFLAGS = -std=gnu++17 $(COMMONFLAGS) -Wshadow
+ 
+-LINK = g++
++LINK = $(CXX)
+ 
+ EXECUTABLE = Praat.exe
+ 
+--- praat-6.1.14.orig/makefiles/makefile.defs.linux.alsa
++++ praat-6.1.14/makefiles/makefile.defs.linux.alsa
+@@ -15,7 +15,7 @@ CFLAGS = -std=gnu99 $(COMMONFLAGS) -Werr
+ 
+ CXXFLAGS = -std=c++17 $(COMMONFLAGS) -Wshadow
+ 
+-LINK = g++
++LINK = $(CXX)
+ 
+ EXECUTABLE = praat
+ 
+--- praat-6.1.14.orig/makefiles/makefile.defs.linux.barren
++++ praat-6.1.14/makefiles/makefile.defs.linux.barren
+@@ -13,7 +13,7 @@ CFLAGS = -std=gnu99 $(COMMONFLAGS) -Werr
+ 
+ CXXFLAGS = -std=c++17 $(COMMONFLAGS) -Wshadow
+ 
+-LINK = g++
++LINK = $(CXX)
+ 
+ EXECUTABLE = praat_barren
+ 
+--- praat-6.1.14.orig/makefiles/makefile.defs.linux.jack
++++ praat-6.1.14/makefiles/makefile.defs.linux.jack
+@@ -15,7 +15,7 @@ CFLAGS = -std=gnu99 $(COMMONFLAGS) -Werr
+ 
+ CXXFLAGS = -std=c++17 $(COMMONFLAGS) -Wshadow
+ 
+-LINK = g++
++LINK = $(CXX)
+ 
+ EXECUTABLE = praat
+ 
+--- praat-6.1.14.orig/makefiles/makefile.defs.linux.nogui
++++ praat-6.1.14/makefiles/makefile.defs.linux.nogui
+@@ -15,7 +15,7 @@ CFLAGS = -std=gnu99 $(COMMONFLAGS) -Werr
+ 
+ CXXFLAGS = -std=c++17 $(COMMONFLAGS) -Wshadow
+ 
+-LINK = g++
++LINK = $(CXX)
+ 
+ EXECUTABLE = praat_nogui
+ 
+--- praat-6.1.14.orig/makefiles/makefile.defs.linux.rpi
++++ praat-6.1.14/makefiles/makefile.defs.linux.rpi
+@@ -15,7 +15,7 @@ CFLAGS = -std=gnu99 $(COMMONFLAGS) -Werr
+ 
+ CXXFLAGS = -std=c++17 $(COMMONFLAGS) -Wshadow
+ 
+-LINK = g++
++LINK = $(CXX)
+ 
+ EXECUTABLE = praat
+ 
+--- praat-6.1.14.orig/makefiles/makefile.defs.linux.silent
++++ praat-6.1.14/makefiles/makefile.defs.linux.silent
+@@ -15,7 +15,7 @@ CFLAGS = -std=gnu99 $(COMMONFLAGS) -Werr
+ 
+ CXXFLAGS = -std=c++17 $(COMMONFLAGS) -Wshadow
+ 
+-LINK = g++
++LINK = $(CXX)
+ 
+ EXECUTABLE = praat
+ 


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ use-ldflags.patch
 remove-time-date-macros.patch
 fix-procrustes-unit-test.patch
 fix-ftbfs-gcc-10.patch
+cross-build.patch



View it on GitLab: https://salsa.debian.org/med-team/praat/-/commit/87d05d77255ead01453385640e176216007746c9

-- 
View it on GitLab: https://salsa.debian.org/med-team/praat/-/commit/87d05d77255ead01453385640e176216007746c9
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200506/d87d1b4d/attachment-0001.html>