[Git][debian-gis-team/zoo-project][master] Update cflags patch

[Angelos Tzotsos (@kalxas-guest)]

Angelos Tzotsos pushed to branch master at Debian GIS Project / zoo-project


Commits:
80e00f36 by Angelos Tzotsos at 2022-08-02T15:21:20+03:00
Update cflags patch

- - - - -


1 changed file:

- debian/patches/patch_cflags.patch


Changes:

=====================================
debian/patches/patch_cflags.patch
=====================================
@@ -1,4 +1,5 @@
-Description: Patch to ignore proj_api.h
+Description: Patch to take into account the proj version
+ .
 Author: Angelos Tzotsos <gcpp.kalxas at gmail.com>
 
 ---
@@ -12,16 +13,16 @@ Bug-Debian: https://bugs.debian.org/<bugnumber>
 Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
 Forwarded: <no|not-needed|url proving that it has been forwarded>
 Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: 2021-01-29
+Last-Update: 2022-08-02
 
---- zoo-project-1.8.0+ds.orig/zoo-project/zoo-kernel/ZOOMakefile.opts.in
-+++ zoo-project-1.8.0+ds/zoo-project/zoo-kernel/ZOOMakefile.opts.in
+--- zoo-project-1.9.0+ds.orig/zoo-project/zoo-kernel/ZOOMakefile.opts.in
++++ zoo-project-1.9.0+ds/zoo-project/zoo-kernel/ZOOMakefile.opts.in
 @@ -120,7 +120,7 @@ MONO_LDFLAGS=@MONO_LDFLAGS@
  MONO_ENABLED=@MONO_ENABLED@
  MONO_FILE=@MONO_FILE@
  
--CFLAGS=@CALLBACK_USE@ @SSH2_CPPFLAGS@ @PROJ_CPPFLAGS@ @RELY_ON_DB@ @DEB_DEF@ -fpic @OPENSSL_CFLAGS@ @UUID_CFLAGS@ ${FCGI_CFLAGS} ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
-+CFLAGS=@CALLBACK_USE@ @SSH2_CPPFLAGS@ @PROJ_CPPFLAGS@ @RELY_ON_DB@ @DEB_DEF@ -fpic @OPENSSL_CFLAGS@ @UUID_CFLAGS@ ${FCGI_CFLAGS} ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H #-DDEBUG #-DDEBUG_SERVICE_CONF
+-CFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H @CALLBACK_USE@ @SSH2_CPPFLAGS@ @PROJ_CPPFLAGS@ @RELY_ON_DB@ @DEB_DEF@ -fpic @OPENSSL_CFLAGS@ @UUID_CFLAGS@ ${FCGI_CFLAGS} ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
++CFLAGS=-DPROJ_VERSION_MAJOR @CALLBACK_USE@ @SSH2_CPPFLAGS@ @PROJ_CPPFLAGS@ @RELY_ON_DB@ @DEB_DEF@ -fpic @OPENSSL_CFLAGS@ @UUID_CFLAGS@ ${FCGI_CFLAGS} ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
  LDFLAGS=-lzoo_service @SSH2_LDFLAGS@ @PROJ_LDFLAGS@ @DEFAULT_LIBS@ -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS} ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS}  ${FCGI_LDFLAGS} @OPENSSL_LDFLAGS@ @UUID_LDFLAGS@ ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${MACOS_LD_NET_FLAGS} ${YAML_LDFLAGS} ${OTBLDFLAGS} ${SAGA_LDFLAGS} ${MONO_LDFLAGS} ${RLDFLAGS} @JSON_LDFLAGS@ @XSLT_LDFLAGS@
  
  DATAROOTDIR=@datarootdir@/zoo-project



View it on GitLab: https://salsa.debian.org/debian-gis-team/zoo-project/-/commit/80e00f369fcf4089cfc94b8b02d33b2049a4ccb7

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/zoo-project/-/commit/80e00f369fcf4089cfc94b8b02d33b2049a4ccb7
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/pkg-grass-devel/attachments/20220802/0363581f/attachment-0001.htm>