[Git][debian-gis-team/zoo-project][master] Fixed cflags patch and added geos-clibs patch

[Angelos Tzotsos (@kalxas-guest)]

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


Commits:
24a21eca by Angelos Tzotsos at 2022-08-02T16:07:17+03:00
Fixed cflags patch and added geos-clibs patch

- - - - -


3 changed files:

- + debian/patches/geos-clibs.patch
- debian/patches/patch_cflags.patch
- debian/patches/series


Changes:

=====================================
debian/patches/geos-clibs.patch
=====================================
@@ -0,0 +1,28 @@
+Description: Patch configure.ac to use geos clibs
+ .
+Author: Angelos Tzotsos <gcpp.kalxas at gmail.com>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+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: 2022-08-02
+
+--- zoo-project-1.9.0+ds.orig/zoo-project/zoo-kernel/configure.ac
++++ zoo-project-1.9.0+ds/zoo-project/zoo-kernel/configure.ac
+@@ -447,7 +447,7 @@ else
+ 	fi
+ fi
+ 
+-GEOS_LDFLAGS=`$GEOSCONFIG --libs`
++GEOS_LDFLAGS=`$GEOSCONFIG --clibs`
+ GEOS_CPPFLAGS=`$GEOSCONFIG --cflags`
+ 
+ # Check headers file


=====================================
debian/patches/patch_cflags.patch
=====================================
@@ -22,7 +22,7 @@ Last-Update: 2022-08-02
  MONO_FILE=@MONO_FILE@
  
 -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=8 @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=$(shell dpkg-query -W -f='$${Version}' libproj-dev | awk -F. '{ print $$1 }') @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


=====================================
debian/patches/series
=====================================
@@ -8,3 +8,4 @@ cgic-multiarch.patch
 #proj_api.patch
 #otb-type-fix.patch
 patch_cflags.patch
+geos-clibs.patch



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

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/zoo-project/-/commit/24a21eca6c36f3fc1e588b76f7084734f2915fb8
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/7de96dc8/attachment-0001.htm>