Source: octave-octproj Version: 1.1.5-4 Severity: important Tags: upstream patch User: debian-...@lists.debian.org Usertags: proj-6
Dear Maintainer, Your package FTBFS with PROJ 6 from experimental. The attached patch fixes the issue by defining ACCEPT_USE_OF_DEPRECATED_PROJ_API_H. Note that this is only a temporary workaround, proj_api.h will be removed in PROJ 7 scheduled for March 2020. Upstream is aware of the issue, see: https://savannah.gnu.org/bugs/index.php?56039 Kind Regards, Bas
diff -Nru octave-octproj-1.1.5/debian/patches/proj6.patch octave-octproj-1.1.5/debian/patches/proj6.patch --- octave-octproj-1.1.5/debian/patches/proj6.patch 1970-01-01 01:00:00.000000000 +0100 +++ octave-octproj-1.1.5/debian/patches/proj6.patch 2019-03-08 15:16:34.000000000 +0100 @@ -0,0 +1,24 @@ +Description: Define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H for PROJ 6.0.0 compatibility +Author: Bas Couwenberg <sebas...@debian.org> +Bug: https://savannah.gnu.org/bugs/index.php?56039 + +--- a/src/Makefile ++++ b/src/Makefile +@@ -11,7 +11,7 @@ CFLAGS+=-Wstrict-prototypes -Wnested-ext + #Flags for C++ + CXXFLAGS=$(FLAGSCOMW) $(FLAGSCOMO) + #Flags for the linker +-LDFLAGS=-lproj ++LDFLAGS=-lproj -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H + #Export flags for compilers and linker + export CFLAGS CXXFLAGS + +@@ -20,7 +20,7 @@ all: compile + + .PHONY: compile + compile: +- $(MKOCTFILE) -c projwrap.c -o projwrap.o ++ $(MKOCTFILE) -c projwrap.c -o projwrap.o -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H + $(MKOCTFILE) -g _op_transform.cc projwrap.o $(LDFLAGS) + $(MKOCTFILE) -g _op_fwd.cc projwrap.o $(LDFLAGS) + $(MKOCTFILE) -g _op_inv.cc projwrap.o $(LDFLAGS) diff -Nru octave-octproj-1.1.5/debian/patches/series octave-octproj-1.1.5/debian/patches/series --- octave-octproj-1.1.5/debian/patches/series 2018-12-30 22:01:14.000000000 +0100 +++ octave-octproj-1.1.5/debian/patches/series 2019-03-08 15:16:34.000000000 +0100 @@ -1 +1,2 @@ do-not-strip-debugging-symbols.patch +proj6.patch
